diff --git a/ChangeLog b/ChangeLog index 47e21248..6f48a2f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17321,3 +17321,7 @@ 2018-08-03 Fred Gleason * Fixed bugs in 'RDWaveFile' that caused corruption of UTF-8 strings in RDXL chunks. +2018-08-07 Fred Gleason + * Removed the 'pam_rd' plug-in. + * Removed rdchunk(1). + * Upgraded Qt3 to Qt4. diff --git a/Makefile.am b/Makefile.am index a0e80f43..be094259 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,9 +20,6 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -if PAM_RD_AM - PAM_RD_OPT = pam_rd -endif if HPI_RD_AM HPI_RD_OPT = rdhpi endif @@ -33,12 +30,11 @@ endif SUBDIRS = icons\ helpers\ lib\ - $(HPI_RD_OPT) $(PAM_RD_OPT) rlm\ + $(HPI_RD_OPT) rlm\ scripts\ conf\ debian\ docs\ - drivers\ xdg\ cae\ importers\ diff --git a/acinclude.m4 b/acinclude.m4 index 2744f0e5..1787290c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -59,444 +59,3 @@ AC_DEFUN([AR_GET_DISTRO],[] AC_MSG_RESULT([$ar_distro_name $ar_distro_version]) ] ) - -dnl BNV_HAVE_QT [--with-Qt-dir=DIR] [--with-Qt-lib-dir=DIR] [with-Qt-lib=LIB] -dnl BNV_HAVE_QT [--with-Qt-include-dir=DIR] [--with-Qt-bin-dir=DIR] -dnl [--with-Qt-lib-dir=DIR] [--with-Qt-lib=LIB] -dnl -dnl THANKS! This code includes bug fixes and contributions made by: -dnl Tim McClarren, -dnl Dennis R. Weilert, -dnl Qingning Huo, -dnl Brian Mingus, -dnl Jens Hannemann, -dnl Pavel Roskin, -dnl Scott J. Bertin. - -dnl ChangeLog -dnl 2006-03-12 * Hide output of ls and fix an m4 quoting problem (due to Scott J. Bertin). -dnl 2006-02-13 * Check compiler return value instead of parsing the error stream, -dnl which detected warnings as false negatives (due to Jens Hannemann). -dnl 2006-02-02 * Spelling of "Success". -dnl * Fixed unsave test for $bnv_qt_lib without quotes. -dnl * Put dnl in front of all comments. -dnl * Changed -l$bnv_qt_lib_dir into -L$bnv_qt_lib_dir (all due to Pavel Roskin). -dnl 2006-01-19 * Support for 64bit architectures. -dnl * Updated documentation. -dnl 2006-01-18: * Fix "cat: bnv_qt_test.c: No such file or directory" (due to Jens Hannemann). -dnl * Hide output of failing ls. -dnl 2006-01-11: * Check in /Developer on Mac OS X; Check in $QTDIR (due to Brian Mingus). - -dnl Calls BNV_PATH_QT_DIRECT (contained in this file) as a subroutine. -AC_DEFUN([BNV_HAVE_QT], -[ - AC_REQUIRE([AC_PROG_CXX]) - AC_REQUIRE([AC_PATH_X]) - AC_REQUIRE([AC_PATH_XTRA]) - - AC_MSG_CHECKING(for Qt) - - AC_ARG_WITH([Qt-dir], - [ --with-Qt-dir=DIR DIR is equal to $QTDIR if you have followed the - installation instructions of Trolltech. Header - files are in DIR/include, binary utilities are - in DIR/bin. The library is in DIR/lib, unless - --with-Qt-lib-dir is also set.]) - AC_ARG_WITH([Qt-include-dir], - [ --with-Qt-include-dir=DIR - Qt header files are in DIR]) - AC_ARG_WITH([Qt-bin-dir], - [ --with-Qt-bin-dir=DIR Qt utilities such as moc and uic are in DIR]) - AC_ARG_WITH([Qt-lib-dir], - [ --with-Qt-lib-dir=DIR The Qt library is in DIR]) - AC_ARG_WITH([Qt-lib], - [ --with-Qt-lib=LIB Use -lLIB to link with the Qt library]) - if test x"$with_Qt_dir" = x"no" || - test x"$with_Qt_include-dir" = x"no" || - test x"$with_Qt_bin_dir" = x"no" || - test x"$with_Qt_lib_dir" = x"no" || - test x"$with_Qt_lib" = x"no"; then - # user disabled Qt. Leave cache alone. - have_qt="User disabled Qt." - else - # "yes" is a bogus option - if test x"$with_Qt_dir" = xyes; then - with_Qt_dir= - fi - if test x"$with_Qt_include_dir" = xyes; then - with_Qt_include_dir= - fi - if test x"$with_Qt_bin_dir" = xyes; then - with_Qt_bin_dir= - fi - if test x"$with_Qt_lib_dir" = xyes; then - with_Qt_lib_dir= - fi - if test x"$with_Qt_lib" = xyes; then - with_Qt_lib= - fi - # No Qt unless we discover otherwise - have_qt=no - # Check whether we are requested to link with a specific version - if test x"$with_Qt_lib" != x; then - bnv_qt_lib="$with_Qt_lib" - fi - # Check whether we were supplied with an answer already - if test x"$with_Qt_dir" != x; then - have_qt=yes - bnv_qt_dir="$with_Qt_dir" - bnv_qt_include_dir="$with_Qt_dir/include" - bnv_qt_bin_dir="$with_Qt_dir/bin" - bnv_qt_lib_dir="$with_Qt_dir/lib" - # Only search for the lib if the user did not define one already - if test x"$bnv_qt_lib" = x; then - bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | - sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" - fi - bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS" - else - # Use cached value or do search, starting with suggestions from - # the command line - AC_CACHE_VAL(bnv_cv_have_qt, - [ - # We are not given a solution and there is no cached value. - bnv_qt_dir=NO - bnv_qt_include_dir=NO - bnv_qt_lib_dir=NO - if test x"$bnv_qt_lib" = x; then - bnv_qt_lib=NO - fi - BNV_PATH_QT_DIRECT - if test "$bnv_qt_dir" = NO || - test "$bnv_qt_include_dir" = NO || - test "$bnv_qt_lib_dir" = NO || - test "$bnv_qt_lib" = NO; then - # Problem with finding complete Qt. Cache the known absence of Qt. - bnv_cv_have_qt="have_qt=no" - else - # Record where we found Qt for the cache. - bnv_cv_have_qt="have_qt=yes \ - bnv_qt_dir=$bnv_qt_dir \ - bnv_qt_include_dir=$bnv_qt_include_dir \ - bnv_qt_bin_dir=$bnv_qt_bin_dir \ - bnv_qt_LIBS=\"$bnv_qt_LIBS\"" - fi - ])dnl - eval "$bnv_cv_have_qt" - fi # all $bnv_qt_* are set - fi # $have_qt reflects the system status - if test x"$have_qt" = xyes; then - QT_CXXFLAGS="-I$bnv_qt_include_dir" - if test x"$bnv_qt_lib" = xqt-mt; then - QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT" - fi - QT_DIR="$bnv_qt_dir" - QT_LIBS="$bnv_qt_LIBS" - # If bnv_qt_dir is defined, utilities are expected to be in the - # bin subdirectory - if test x"$bnv_qt_dir" != x; then - QT_BIN="$bnv_qt_dir/bin" - if test -x "$bnv_qt_dir/bin/uic"; then - QT_UIC="$bnv_qt_dir/bin/uic" - else - # Old versions of Qt don't have uic - QT_UIC= - fi - QT_MOC="$bnv_qt_dir/bin/moc" - else - # Or maybe we are told where to look for the utilities - if test x"$bnv_qt_bin_dir" != x; then - QT_BIN="$bnv_qt_bin_dir" - if test -x "$bnv_qt_bin_dir/uic"; then - QT_UIC="$bnv_qt_bin_dir/uic" - else - # Old versions of Qt don't have uic - QT_UIC= - fi - QT_MOC="$bnv_qt_bin_dir/moc" - else - # Last possibility is that they are in $PATH - QT_UIC="`which uic`" - QT_MOC="`which moc`" - QT_BIN="`dirname $QT_MOC`" - fi - fi - # All variables are defined, report the result - AC_MSG_RESULT([$have_qt: - QT_CXXFLAGS=$QT_CXXFLAGS - QT_DIR=$QT_DIR - QT_LIBS=$QT_LIBS - QT_BIN=$QT_BIN - QT_UIC=$QT_UIC - QT_MOC=$QT_MOC]) - else - # Qt was not found - QT_CXXFLAGS= - QT_DIR= - QT_LIBS= - QT_BIN= - QT_UIC= - QT_MOC= - AC_MSG_RESULT($have_qt) - fi - AC_SUBST(QT_CXXFLAGS) - AC_SUBST(QT_DIR) - AC_SUBST(QT_LIBS) - AC_SUBST(QT_BIN) - AC_SUBST(QT_UIC) - AC_SUBST(QT_MOC) - - #### Being paranoid: - if test x"$have_qt" = xyes; then - AC_MSG_CHECKING(correct functioning of Qt installation) - AC_CACHE_VAL(bnv_cv_qt_test_result, - [ - cat > bnv_qt_test.h << EOF -#include -class Test : public QObject -{ -Q_OBJECT -public: - Test() {} - ~Test() {} -public slots: - void receive() {} -signals: - void send(); -}; -EOF - - cat > bnv_qt_main.$ac_ext << EOF -#include "bnv_qt_test.h" -#include -int main( int argc, char **argv ) -{ - QApplication app( argc, argv ); - Test t; - QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) ); -} -EOF - - bnv_cv_qt_test_result="failure" - bnv_try_1="$QT_MOC bnv_qt_test.h -o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null" - AC_TRY_EVAL(bnv_try_1) - if test x"$ac_status" != x0; then - echo "$bnv_err_1" >&AC_FD_CC - echo "configure: could not run $QT_MOC on:" >&AC_FD_CC - cat bnv_qt_test.h >&AC_FD_CC - else - bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_bnv_qt_test.o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null" - AC_TRY_EVAL(bnv_try_2) - if test x"$ac_status" != x0; then - echo "$bnv_err_2" >&AC_FD_CC - echo "configure: could not compile:" >&AC_FD_CC - cat moc_bnv_qt_test.$ac_ext >&AC_FD_CC - else - bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o bnv_qt_main.o bnv_qt_main.$ac_ext >/dev/null 2>/dev/null" - AC_TRY_EVAL(bnv_try_3) - if test x"$ac_status" != x0; then - echo "$bnv_err_3" >&AC_FD_CC - echo "configure: could not compile:" >&AC_FD_CC - cat bnv_qt_main.$ac_ext >&AC_FD_CC - else - bnv_try_4="$CXX -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o $QT_LIBS $LIBS >/dev/null 2>/dev/null" - AC_TRY_EVAL(bnv_try_4) - if test x"$ac_status" != x0; then - echo "$bnv_err_4" >&AC_FD_CC - else - bnv_cv_qt_test_result="success" - fi - fi - fi - fi - ])dnl AC_CACHE_VAL bnv_cv_qt_test_result - AC_MSG_RESULT([$bnv_cv_qt_test_result]); - if test x"$bnv_cv_qt_test_result" = "xfailure"; then - AC_MSG_ERROR([Failed to find matching components of a complete - Qt installation. Try using more options, - see ./configure --help.]) - fi - - rm -f bnv_qt_test.h moc_bnv_qt_test.$ac_ext moc_bnv_qt_test.o \ - bnv_qt_main.$ac_ext bnv_qt_main.o bnv_qt_main - fi -]) - -dnl Internal subroutine of BNV_HAVE_QT -dnl Set bnv_qt_dir bnv_qt_include_dir bnv_qt_bin_dir bnv_qt_lib_dir bnv_qt_lib -AC_DEFUN([BNV_PATH_QT_DIRECT], -[ - ## Binary utilities ## - if test x"$with_Qt_bin_dir" != x; then - bnv_qt_bin_dir=$with_Qt_bin_dir - fi - ## Look for header files ## - if test x"$with_Qt_include_dir" != x; then - bnv_qt_include_dir="$with_Qt_include_dir" - else - # The following header file is expected to define QT_VERSION. - qt_direct_test_header=qglobal.h - # Look for the header file in a standard set of common directories. - bnv_include_path_list=" - /usr/include - `ls -dr ${QTDIR}/include 2>/dev/null` - `ls -dr /usr/include/qt* 2>/dev/null` - `ls -dr /usr/lib/qt*/include 2>/dev/null` - `ls -dr /usr/local/qt*/include 2>/dev/null` - `ls -dr /opt/qt*/include 2>/dev/null` - `ls -dr /Developer/qt*/include 2>/dev/null` - " - for bnv_dir in $bnv_include_path_list; do - if test -r "$bnv_dir/$qt_direct_test_header"; then - bnv_dirs="$bnv_dirs $bnv_dir" - fi - done - # Now look for the newest in this list - bnv_prev_ver=0 - for bnv_dir in $bnv_dirs; do - bnv_this_ver=`egrep -w '#define QT_VERSION' $bnv_dir/$qt_direct_test_header | sed s/'#define QT_VERSION'//` - if expr $bnv_this_ver '>' $bnv_prev_ver > /dev/null; then - bnv_qt_include_dir=$bnv_dir - bnv_prev_ver=$bnv_this_ver - fi - done - fi dnl Found header files. - - # Are these headers located in a traditional Trolltech installation? - # That would be $bnv_qt_include_dir stripped from its last element: - bnv_possible_qt_dir=`dirname $bnv_qt_include_dir` - if (test -x $bnv_possible_qt_dir/bin/moc) && - ((ls $bnv_possible_qt_dir/lib/libqt* > /dev/null 2>/dev/null) || - (ls $bnv_possible_qt_dir/lib64/libqt* > /dev/null 2>/dev/null)); then - # Then the rest is a piece of cake - bnv_qt_dir=$bnv_possible_qt_dir - bnv_qt_bin_dir="$bnv_qt_dir/bin" - if test x"$with_Qt_lib_dir" != x; then - bnv_qt_lib_dir="$with_Qt_lib_dir" - else - if (test -d $bnv_qt_dir/lib64); then - bnv_qt_lib_dir="$bnv_qt_dir/lib64" - else - bnv_qt_lib_dir="$bnv_qt_dir/lib" - fi - fi - # Only look for lib if the user did not supply it already - if test x"$bnv_qt_lib" = xNO; then - bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | - sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" - fi - bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS" - else - # There is no valid definition for $QTDIR as Trolltech likes to see it - bnv_qt_dir= - ## Look for Qt library ## - if test x"$with_Qt_lib_dir" != x; then - bnv_qt_lib_dir="$with_Qt_lib_dir" - # Only look for lib if the user did not supply it already - if test x"$bnv_qt_lib" = xNO; then - bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p | - sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`" - fi - bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS" - else - # Normally, when there is no traditional Trolltech installation, - # the library is installed in a place where the linker finds it - # automatically. - # If the user did not define the library name, try with qt - if test x"$bnv_qt_lib" = xNO; then - bnv_qt_lib=qt - fi - qt_direct_test_header=qapplication.h - qt_direct_test_main=" - int argc; - char ** argv; - QApplication app(argc,argv); - " - # See if we find the library without any special options. - # Don't add top $LIBS permanently yet - bnv_save_LIBS="$LIBS" - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS" - bnv_qt_LIBS="$LIBS" - bnv_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="-I$bnv_qt_include_dir" - AC_TRY_LINK([#include <$qt_direct_test_header>], - $qt_direct_test_main, - [ - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - ], [ - # That did not work. Try the multi-threaded version - echo "Non-critical error, please neglect the above." >&AC_FD_CC - bnv_qt_lib=qt-mt - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS" - AC_TRY_LINK([#include <$qt_direct_test_header>], - $qt_direct_test_main, - [ - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - ], [ - # That did not work. Try the OpenGL version - echo "Non-critical error, please neglect the above." >&AC_FD_CC - bnv_qt_lib=qt-gl - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS" - AC_TRY_LINK([#include <$qt_direct_test_header>], - $qt_direct_test_main, - [ - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - ], [ - # That did not work. Maybe a library version I don't know about? - echo "Non-critical error, please neglect the above." >&AC_FD_CC - # Look for some Qt lib in a standard set of common directories. - bnv_dir_list=" - `echo $bnv_qt_includes | sed ss/includess` - /lib - /usr/lib64 - /usr/lib - /usr/local/lib64 - /usr/local/lib - /opt/lib64 - /opt/lib - `ls -dr /usr/lib64/qt* 2>/dev/null` - `ls -dr /usr/lib64/qt*/lib64 2>/dev/null` - `ls -dr /usr/lib/qt* 2>/dev/null` - `ls -dr /usr/local/qt* 2>/dev/null` - `ls -dr /opt/qt* 2>/dev/null` - " - for bnv_dir in $bnv_dir_list; do - if ls $bnv_dir/libqt* >/dev/null 2>/dev/null; then - # Gamble that it's the first one... - bnv_qt_lib="`ls $bnv_dir/libqt* | sed -n 1p | - sed s@$bnv_dir/lib@@ | sed s/[[.]].*//`" - bnv_qt_lib_dir="$bnv_dir" - break - fi - done - # Try with that one - LIBS="-l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXt $X_EXTRA_LIBS" - AC_TRY_LINK([#include <$qt_direct_test_header>], - $qt_direct_test_main, - [ - # Success. - # We can link with no special library directory. - bnv_qt_lib_dir= - ], [ - # Leave bnv_qt_lib_dir defined - bnv_qt_lib_dir=bnv_qt_lib_dir - ]) - ]) - ]) - ]) - if test x"$bnv_qt_lib_dir" != x; then - bnv_qt_LIBS="-L$bnv_qt_lib_dir $LIBS" - else - bnv_qt_LIBS="$LIBS" - fi - LIBS="$bnv_save_LIBS" - CXXFLAGS="$bnv_save_CXXFLAGS" - fi dnl $with_Qt_lib_dir was not given - fi dnl Done setting up for non-traditional Trolltech installation -]) diff --git a/cae/Makefile.am b/cae/Makefile.am index dcd54112..de6e1d10 100644 --- a/cae/Makefile.am +++ b/cae/Makefile.am @@ -19,8 +19,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall @QT_CXXFLAGS@ -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi -Wno-strict-aliasing -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi -Wno-strict-aliasing @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -43,7 +43,9 @@ caed_LDADD = @LIB_RDLIBS@\ @LIBHPI@\ @LIBJACK@\ @LIBSRC@\ - @LIBVORBIS@ + @LIBVORBIS@\ + @QT4_LIBS@\ + -lQt3Support CLEANFILES = *~\ moc_* diff --git a/cae/cae.cpp b/cae/cae.cpp index 8901d557..37df67af 100644 --- a/cae/cae.cpp +++ b/cae/cae.cpp @@ -196,25 +196,19 @@ MainObject::MainObject(QObject *parent,const char *name) // // Allowcate Meter Socket // - meter_socket=new QSocketDevice(QSocketDevice::Datagram); + meter_socket=new Q3SocketDevice(Q3SocketDevice::Datagram); // // Open Database // - QSqlDatabase *db=QSqlDatabase::addDatabase(rd_config->mysqlDriver()); - if(!db) { - rd_config->log("caed",RDConfig::LogErr,"can't open mySQL database"); - fprintf(stderr,"caed: can't open mySQL database"); - exit(1); - } - db->setDatabaseName(rd_config->mysqlDbname()); - db->setUserName(rd_config->mysqlUsername()); - db->setPassword(rd_config->mysqlPassword()); - db->setHostName(rd_config->mysqlHostname()); - if(!db->open()) { + QSqlDatabase db=QSqlDatabase::addDatabase(rd_config->mysqlDriver()); + db.setDatabaseName(rd_config->mysqlDbname()); + db.setUserName(rd_config->mysqlUsername()); + db.setPassword(rd_config->mysqlPassword()); + db.setHostName(rd_config->mysqlHostname()); + if(!db.open()) { rd_config->log("caed",RDConfig::LogErr,"unable to connect to mySQL Server"); printf("caed: unable to connect to mySQL Server"); - db->removeDatabase(rd_config->mysqlDbname()); exit(1); } @@ -1944,7 +1938,7 @@ void MainObject::BroadcastCommand(const char *command) void MainObject::EchoCommand(int ch,const char *command) { - if(socket[ch]->state()==QSocket::Connection) { + if(socket[ch]->state()==Q3Socket::Connection) { #ifdef PRINT_COMMANDS printf("CAE: Connection %d sending %s\n",ch,command); #endif // PRINT_COMMANDS diff --git a/cae/cae.h b/cae/cae.h index 0f6c24dd..7ed7678a 100644 --- a/cae/cae.h +++ b/cae/cae.h @@ -30,11 +30,11 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include @@ -145,8 +145,8 @@ class MainObject : public QObject bool debug; unsigned system_sample_rate; Q_INT16 tcp_port; - QServerSocket *server; - QSocketDevice *meter_socket; + Q3ServerSocket *server; + Q3SocketDevice *meter_socket; RDSocket *socket[CAE_MAX_CONNECTIONS]; Q_UINT16 meter_port[CAE_MAX_CONNECTIONS]; char args[CAE_MAX_CONNECTIONS][CAE_MAX_ARGS][CAE_MAX_LENGTH]; @@ -269,7 +269,7 @@ class MainObject : public QObject bool jack_activated; #ifdef JACK int jack_card; - std::vector jack_clients; + std::vector jack_clients; RDWaveFile *jack_record_wave[RD_MAX_STREAMS]; RDWaveFile *jack_play_wave[RD_MAX_STREAMS]; short *jack_wave_buffer; diff --git a/cae/cae_jack.cpp b/cae/cae_jack.cpp index 7b18cb94..6434f17f 100644 --- a/cae/cae_jack.cpp +++ b/cae/cae_jack.cpp @@ -441,7 +441,7 @@ void MainObject::jackClientStartData() cae_station,rd_config, rd_config->provisioningServiceName(rd_config->stationName())); QStringList fields=QStringList().split(" ",cmd); - jack_clients.push_back(new QProcess(fields,this)); + jack_clients.push_back(new Q3Process(fields,this)); if(jack_clients.back()->start()) { rd_config->log("caed",RDConfig::LogDebug,"started JACK Client \""+ q->value(0).toString()+"\""); @@ -487,7 +487,7 @@ void MainObject::jackInit(RDStation *station) // if(station->startJack()) { QStringList fields=QStringList().split(" ",station->jackCommandLine()); - QProcess *proc=new QProcess(fields,this); + Q3Process *proc=new Q3Process(fields,this); if(proc->start()) { rd_config->log("caed",RDConfig::LogDebug,"JACK server started"); } diff --git a/cae/cae_socket.cpp b/cae/cae_socket.cpp index b35dd2e9..d402fb7c 100644 --- a/cae/cae_socket.cpp +++ b/cae/cae_socket.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -35,14 +35,14 @@ CaeSocket::CaeSocket(Q_UINT16 port,int backlog,QObject *parent, const char *name) - : QServerSocket(port,0,parent,name) + : Q3ServerSocket(port,0,parent,name) { } CaeSocket::CaeSocket(const QHostAddress &address,Q_UINT16 port,int backlog, QObject *parent,const char *name) - : QServerSocket(address,port,0,parent,name) + : Q3ServerSocket(address,port,0,parent,name) { } diff --git a/cae/cae_socket.h b/cae/cae_socket.h index 6a88a0f1..1bf1cf61 100644 --- a/cae/cae_socket.h +++ b/cae/cae_socket.h @@ -23,11 +23,11 @@ #include #include -#include +#include #include -class CaeSocket : public QServerSocket +class CaeSocket : public Q3ServerSocket { Q_OBJECT public: @@ -41,7 +41,7 @@ class CaeSocket : public QServerSocket void connection(int); private: - QServerSocket *socket; + Q3ServerSocket *socket; }; diff --git a/configure.ac b/configure.ac index 6deb1c15..c63437b6 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,6 @@ AM_INIT_AUTOMAKE AC_SUBST(RPM_RELEASE,1) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_CONFIG_MACRO_DIR([m4]) -PKG_VERSION=m4_esyscmd(cat PACKAGE_VERSION) # # Some Fully Resolved Install Paths @@ -71,8 +70,6 @@ AC_ARG_ENABLE(docbook,[ --disable-docbook disable building of documentati AC_ARG_ENABLE(gpio,[ --disable-gpio disable General Purpose Input/Output GPIO support], [GPIO_DISABLED=yes],[]) -AC_ARG_ENABLE(pam,[ --disable-pam disable Rivendell PAM pam_rd.so support], - [PAM_DISABLED=yes],[]) AC_ARG_ENABLE(mad,[ --disable-mad disable MPEG decode support], [MAD_DISABLED=yes],[]) AC_ARG_ENABLE(twolame,[ --disable-twolame disable MPEG Layer 2 encode support], @@ -86,13 +83,14 @@ AC_ARG_ENABLE(mp4v2,[ --disable-mp4 disable M4A decode support], AC_ARG_ENABLE(rdxport-debug,[ --enable-rdxport-debug enable DEBUG support for RDXport services], [RDXPORT_DEBUG_ENABLED=yes],[]) + # -# Check for Qt +# Check for Qt4 (Mandatory) # -BNV_HAVE_QT -if test $have_qt = "no" ; then - AC_MSG_ERROR([*** Qt toolkit not found, unable to continue ***]) -fi +PKG_CHECK_MODULES(QT4,QtCore QtGui QtNetwork QtSql QtXml Qt3Support,,[AC_MSG_ERROR([*** Qt4 not found ***])]) +AC_CHECK_PROG(MOC_NAME,moc-qt4,[moc-qt4],[moc]) +AC_SUBST(QT_MOC,$MOC_NAME) + # # Determine the target architecture @@ -125,8 +123,7 @@ if test $ar_gcc_distro = suse ; then else AC_SUBST(APACHE_PKG,"httpd") AC_SUBST(APACHE_CONFIG_DIR,"/etc/httpd/conf.d") -# AC_SUBST(CONSOLEHELPER_RDALSACONFIG,"/usr/bin/rdalsaconfig-root") - AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell-$PKG_VERSION") + AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell-$PACKAGE_VERSION") if test $ar_distro_major -ge 7 ; then AC_SUBST(USERMODE_PKG,"usermode usermode-gtk") AC_SUBST(MYSQL_PKG,"mariadb") @@ -269,7 +266,7 @@ fi # # Set Hard Library Dependencies # -AC_SUBST(LIB_RDLIBS,"-lm -lpthread -lqui -lrd -lcurl -lid3 $FLAC_LIBS -lsndfile -lsamplerate -lcdda_interface -lcdda_paranoia -lcrypt -ldl -lpam -lSoundTouch -lcrypto") +AC_SUBST(LIB_RDLIBS,"-lm -lpthread -lrd -lcurl -lid3 $FLAC_LIBS -lsndfile -lsamplerate -lcdda_interface -lcdda_paranoia -lcrypt -ldl -lpam -lSoundTouch -lcrypto") # # Setup MPEG Dependencies @@ -411,17 +408,6 @@ else AC_DEFINE(HAVE_FLAC_METADATA,yes) fi -# -# pam_rd hooks -# -if test -z $PAM_DISABLED ; then - AC_CHECK_HEADERS([security/pam_modules.h security/_pam_macros.h],[PAM_FOUND=yes],[PAM_FOUND=no;break]) - if test $PAM_FOUND = yes ; then - USING_PAM=yes - fi -fi -AM_CONDITIONAL([PAM_RD_AM], [test "$USING_PAM" = yes]) - # # Distro-Specific Stuff # @@ -500,8 +486,6 @@ AC_CONFIG_FILES([rivendell.spec \ rivendell-suse \ rdrepld-suse \ conf/rd-bin.conf \ - drivers/Makefile \ - drivers/qt3-mysql-utf/Makefile \ icons/Makefile \ helpers/Makefile \ lib/rdpaths.h \ @@ -512,7 +496,6 @@ AC_CONFIG_FILES([rivendell.spec \ utils/Makefile \ utils/rdalsaconfig/Makefile \ utils/rdcheckcuts/Makefile \ - utils/rdchunk/Makefile \ utils/rdcleandirs/Makefile \ utils/rdclilogedit/Makefile \ utils/rdcollect/Makefile \ @@ -577,7 +560,7 @@ AC_CONFIG_FILES([rivendell.spec \ ios/rmlsend/Makefile \ ios/rmlsend/Classes/Makefile \ ios/rmlsend/RMLSend.xcodeproj/Makefile \ - pam_rd/Makefile ]) + ]) AC_OUTPUT() chmod 755 make_slack chmod 755 rivendell-suse @@ -638,13 +621,6 @@ AC_MSG_NOTICE("| M4A Decoding Support ... No |") else AC_MSG_NOTICE("| M4A Decoding Support ... Yes |") fi -AC_MSG_NOTICE("| |") -AC_MSG_NOTICE("| Optional Components: |") -if test -z $USING_PAM ; then -AC_MSG_NOTICE("| Rivendell PAM pam_rd.so Support ... No |") -else -AC_MSG_NOTICE("| Rivendell PAM pam_rd.so Support ... Yes |") -fi AC_MSG_NOTICE("|-----------------------------------------------------|") AC_MSG_NOTICE() if test $WIN32_SOURCE ; then diff --git a/docs/misc/Makefile.am b/docs/misc/Makefile.am index 35f8d588..9380cc38 100644 --- a/docs/misc/Makefile.am +++ b/docs/misc/Makefile.am @@ -22,7 +22,6 @@ EXTRA_DIST = ALSA.txt\ ando_interface.odt\ colors\ - pam_rd.txt\ PODCASTING.txt\ RDMONITOR.txt\ reports.txt\ diff --git a/docs/misc/pam_rd.txt b/docs/misc/pam_rd.txt deleted file mode 100644 index fa779292..00000000 --- a/docs/misc/pam_rd.txt +++ /dev/null @@ -1,62 +0,0 @@ - PAM and multi-user support in Rivendell - -In order to support a multi-user environment, the PAM (Pluggable -Authentication Module) infrastructure is used to activate a Rivendell -user. - -First of all, a distinction should be made between *nix user accounts -and Rivendell user accounts. The former are accounts used by the -operating system; they may be local accounts in the /etc/passwd file -or they may be centraly administered accounts such as in an LDAP -server. The Rivendell user accounts are used only within the -Rivendell system and are stored within the Rivendell SQL database. -Rivendell users can be used to distinguish what groups of audio a user -can create or delete within Rivendell. - -For the multi-user Rivendell environment, users should each have a -unique *nix system account and a matching Rivendell account. The *nix -user accounts should be members of a "rivendell" *nix system group and -also any group required to access audio hardware devices (ex: the -"audio" group on a debian system). The files in the Rivendell system -(/var/snd, PID files, log files) will be owned by "foouser.rivendell" -with appropiate group writable permissions. Commands to create the -*nix accounts are: - adduser foouser # create a new *nix user called foouser - adduser foouser rivendell # add foouser to the rivendll *nix group - adduser foouser audio # add foouser to the audio *nix group -Rivendell user accounts can be added with the "rdadmin" utility. - -Instead of requiring users to log in multiple times (once for their -*nix account and again for their Rivendell account), the pam_rd module -allows for the Rivendell user to be set during the authentication -process of PAM. - -Options the pam_rd module recognizes include: - - debug - to increase logging to syslog - use_first_pass - to use only the first password entered by the - try_first_pass - to try the first password, and if that is not - found succeed prompt the user to enter their - password. - kill_rd_daemons - kill any previously running rivendell daemons - (caed, ripcd, rdcatchd) - destroy_shm - destroy and release the rivendell shared memory - segment, id "0x5005 - ignore_pass - log a valid Rivendell user account into Rivendell, - ignoring any password check. the idea is to "trust" - the network logon credentials and ignore the - rivendell credentials - fail_default_user - if a corresponding Rivendell user account is not found - or if the entered password does not authenticate a - Rivendell user, the Rivendell user account is set to - the the user specified by this option (defaults to - "user"). - - -We have had success tying the pam_rd module into the "kdm" PAM module. -The following entry was added as the last "auth" entry for "kdm" in -/etc/pam.d/kdm: - - auth required pam_rd.so debug kill_rd_daemons destroy_shm ignore_pass fail_default_user=user - - diff --git a/drivers/Makefile.am b/drivers/Makefile.am deleted file mode 100644 index 8f61892f..00000000 --- a/drivers/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## automake.am -## -## Makefile.am for rivendell/drivers -## -## (C) Copyright 2018 Fred Gleason -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as -## published by the Free Software Foundation; either version 2 of -## the License, or (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public -## License along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -## -## Use automake to process this into a Makefile.in - -SUBDIRS = qt3-mysql-utf - -EXTRA_DIST = drivers.pro - -CLEANFILES = *~\ - *.idb\ - *ilk\ - *.obj\ - *.pdb\ - *.qm\ - moc_* - -MAINTAINERCLEANFILES = *~\ - *.tar.gz\ - aclocal.m4\ - configure\ - Makefile.in\ - moc_* diff --git a/drivers/drivers.pro b/drivers/drivers.pro deleted file mode 100644 index ee080a41..00000000 --- a/drivers/drivers.pro +++ /dev/null @@ -1,22 +0,0 @@ -# drivers.pro -# -# The drivers/ QMake project file for Rivendell -# -# (C) Copyright 2018 Fred Gleason -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -TEMPLATE = subdirs - -SUBDIRS += qt3-mysql-utf diff --git a/drivers/qt3-mysql-utf/LICENSE.QPL b/drivers/qt3-mysql-utf/LICENSE.QPL deleted file mode 100644 index ecdad6ef..00000000 --- a/drivers/qt3-mysql-utf/LICENSE.QPL +++ /dev/null @@ -1,103 +0,0 @@ - THE Q PUBLIC LICENSE - version 1.0 - - Copyright (C) 1999-2000 Trolltech AS, Norway. - Everyone is permitted to copy and - distribute this license document. - -The intent of this license is to establish freedom to share and change the -software regulated by this license under the open source model. - -This license applies to any software containing a notice placed by the -copyright holder saying that it may be distributed under the terms of -the Q Public License version 1.0. Such software is herein referred to as -the Software. This license covers modification and distribution of the -Software, use of third-party application programs based on the Software, -and development of free software which uses the Software. - - Granted Rights - -1. You are granted the non-exclusive rights set forth in this license - provided you agree to and comply with any and all conditions in this - license. Whole or partial distribution of the Software, or software - items that link with the Software, in any form signifies acceptance of - this license. - -2. You may copy and distribute the Software in unmodified form provided - that the entire package, including - but not restricted to - copyright, - trademark notices and disclaimers, as released by the initial developer - of the Software, is distributed. - -3. You may make modifications to the Software and distribute your - modifications, in a form that is separate from the Software, such as - patches. The following restrictions apply to modifications: - - a. Modifications must not alter or remove any copyright notices in - the Software. - - b. When modifications to the Software are released under this - license, a non-exclusive royalty-free right is granted to the - initial developer of the Software to distribute your modification - in future versions of the Software provided such versions remain - available under these terms in addition to any other license(s) of - the initial developer. - -4. You may distribute machine-executable forms of the Software or - machine-executable forms of modified versions of the Software, provided - that you meet these restrictions: - - a. You must include this license document in the distribution. - - b. You must ensure that all recipients of the machine-executable forms - are also able to receive the complete machine-readable source code - to the distributed Software, including all modifications, without - any charge beyond the costs of data transfer, and place prominent - notices in the distribution explaining this. - - c. You must ensure that all modifications included in the - machine-executable forms are available under the terms of this - license. - -5. You may use the original or modified versions of the Software to - compile, link and run application programs legally developed by you - or by others. - -6. You may develop application programs, reusable components and other - software items that link with the original or modified versions of the - Software. These items, when distributed, are subject to the following - requirements: - - a. You must ensure that all recipients of machine-executable forms of - these items are also able to receive and use the complete - machine-readable source code to the items without any charge - beyond the costs of data transfer. - - b. You must explicitly license all recipients of your items to use - and re-distribute original and modified versions of the items in - both machine-executable and source code forms. The recipients must - be able to do so without any charges whatsoever, and they must be - able to re-distribute to anyone they choose. - - - c. If the items are not available to the general public, and the - initial developer of the Software requests a copy of the items, - then you must supply one. - - Limitations of Liability - -In no event shall the initial developers or copyright holders be liable -for any damages whatsoever, including - but not restricted to - lost -revenue or profits or other direct, indirect, special, incidental or -consequential damages, even if they have been advised of the possibility -of such damages, except to the extent invariable law, if any, provides -otherwise. - - No Warranty - -The Software and this license document are provided AS IS with NO WARRANTY -OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE. - Choice of Law - -This license is governed by the Laws of Norway. Disputes shall be settled -by Oslo City Court. diff --git a/drivers/qt3-mysql-utf/Makefile.am b/drivers/qt3-mysql-utf/Makefile.am deleted file mode 100644 index 5d8537d2..00000000 --- a/drivers/qt3-mysql-utf/Makefile.am +++ /dev/null @@ -1,63 +0,0 @@ -## automake.am -## -## Makefile.am for rivendell/drivers/qt3-mysql-utf -## -## by Fred Gleason -## (C) Copyright 2002-2007,2016 Fred Gleason -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License version 2 as -## published by the Free Software Foundation. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public -## License along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -## -## Use automake to process this into a Makefile.in -## - -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ @MYSQL_CLIENT_CFLAGS@ -LIBS = @QT_LIBS@ -MOC = @QT_MOC@ - -# The dependency for qt's Meta Object Compiler (moc) -moc_%.cpp: %.h - $(MOC) $< -o $@ - -install-exec-local: - mkdir -p $(DESTDIR)$(QTDIR)/plugins/sqldrivers - cp .libs/libqmysqlutf.so.0.0.0 $(DESTDIR)$(QTDIR)/plugins/sqldrivers/libqmysqlutf.so - -uninstall-exec: - rm -f $(DESTDIR)$(QTDIR)/plugins/sqldrivers/libqmysqlutf.so - -lib_LTLIBRARIES = libqmysqlutf.la -dist_libqmysqlutf_la_SOURCES = qsqlextension.cpp qsqlextension.h\ - qt3-mysql-utf.cpp qt3-mysql-utf.h - -libqmysqlutf_la_LIBADD = @MYSQL_CLIENT_LIBS@ -libqmysqlutf_la_LDFLAGS = -rpath `pwd` - -EXTRA_DIST = LICENSE.QPL\ - qt3-mysql-utf.pro - -CLEANFILES = *~\ - *.idb\ - *.ilk\ - *.lib\ - *.obj\ - *.pdb\ - *.qm\ - moc_* - -DISTCLEAN = Makefile - -MAINTAINERCLEANFILES = *~\ - Makefile\ - Makefile.in\ - moc_* diff --git a/drivers/qt3-mysql-utf/qsqlextension.cpp b/drivers/qt3-mysql-utf/qsqlextension.cpp deleted file mode 100644 index 666a0879..00000000 --- a/drivers/qt3-mysql-utf/qsqlextension.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/**************************************************************************** -** -** Implementation of the QSqlExtension class -** -** Created : 2002-06-03 -** -** Copyright (C) 2005-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the sql module of the Qt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free Qt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.QPL -** included in the packaging of this file. Licensees holding valid Qt -** Commercial licenses may use this file in accordance with the Qt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#include "qsqlextension.h" - -#ifndef QT_NO_SQL -QSqlExtension::QSqlExtension() - : bindm( BindByPosition ), bindCount( 0 ) -{ -} - -QSqlExtension::~QSqlExtension() -{ -} - -bool QSqlExtension::prepare( const QString& /*query*/ ) -{ - return FALSE; -} - -bool QSqlExtension::exec() -{ - return FALSE; -} - -void QSqlExtension::bindValue( const QString& placeholder, const QVariant& val, QSql::ParameterType tp ) -{ - bindm = BindByName; - // if the index has already been set when doing emulated named - // bindings - don't reset it - if ( index.contains( (int)values.count() ) ) { - index[ (int)values.count() ] = placeholder; - } - values[ placeholder ] = Param( val, tp ); -} - -void QSqlExtension::bindValue( int pos, const QVariant& val, QSql::ParameterType tp ) -{ - bindm = BindByPosition; - index[ pos ] = QString::number( pos ); - QString nm = QString::number( pos ); - values[ nm ] = Param( val, tp ); -} - -void QSqlExtension::addBindValue( const QVariant& val, QSql::ParameterType tp ) -{ - bindm = BindByPosition; - bindValue( bindCount++, val, tp ); -} - -void QSqlExtension::clearValues() -{ - values.clear(); - bindCount = 0; -} - -void QSqlExtension::resetBindCount() -{ - bindCount = 0; -} - -void QSqlExtension::clearIndex() -{ - index.clear(); - holders.clear(); -} - -void QSqlExtension::clear() -{ - clearValues(); - clearIndex(); -} - -QVariant QSqlExtension::parameterValue( const QString& holder ) -{ - return values[ holder ].value; -} - -QVariant QSqlExtension::parameterValue( int pos ) -{ - return values[ index[ pos ] ].value; -} - -QVariant QSqlExtension::boundValue( const QString& holder ) const -{ - return values[ holder ].value; -} - -QVariant QSqlExtension::boundValue( int pos ) const -{ - return values[ index[ pos ] ].value; -} - -QMap QSqlExtension::boundValues() const -{ - QMap::ConstIterator it; - QMap m; - if ( bindm == BindByName ) { - for ( it = values.begin(); it != values.end(); ++it ) - m.insert( it.key(), it.data().value ); - } else { - QString key, tmp, fmt; - fmt.sprintf( "%%0%dd", QString::number( values.count()-1 ).length() ); - for ( it = values.begin(); it != values.end(); ++it ) { - tmp.sprintf( fmt.ascii(), it.key().toInt() ); - m.insert( tmp, it.data().value ); - } - } - return m; -} - -QSqlExtension::BindMethod QSqlExtension::bindMethod() -{ - return bindm; -} - -QSqlDriverExtension::QSqlDriverExtension() -{ -} - -QSqlDriverExtension::~QSqlDriverExtension() -{ -} - -QSqlOpenExtension::QSqlOpenExtension() -{ -} - -QSqlOpenExtension::~QSqlOpenExtension() -{ -} -#endif diff --git a/drivers/qt3-mysql-utf/qsqlextension.h b/drivers/qt3-mysql-utf/qsqlextension.h deleted file mode 100644 index 8f48da3c..00000000 --- a/drivers/qt3-mysql-utf/qsqlextension.h +++ /dev/null @@ -1,148 +0,0 @@ -/**************************************************************************** -** -** Definition of the QSqlExtension class -** -** Created : 2002-06-03 -** -** Copyright (C) 2005-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the sql module of the Qt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the file COPYING -** included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free Qt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.QPL -** included in the packaging of this file. Licensees holding valid Qt -** Commercial licenses may use this file in accordance with the Qt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef QSQLEXTENSION_H -#define QSQLEXTENSION_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// -// - -#ifndef QT_H -#include "qmap.h" -#include "qvaluevector.h" -#include "qstring.h" -#include "qvariant.h" -#include "qsql.h" -#endif // QT_H - -#ifndef QT_NO_SQL - -#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) -#define QM_EXPORT_SQL -#define QM_TEMPLATE_EXTERN_SQL -#else -#define QM_EXPORT_SQL Q_EXPORT -#define QM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN -#endif - -struct Param { - Param( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {} - QVariant value; - QSql::ParameterType typ; - Q_DUMMY_COMPARISON_OPERATOR(Param) -}; - -struct Holder { - Holder( const QString& hldr = QString::null, int pos = -1 ): holderName( hldr ), holderPos( pos ) {} - bool operator==( const Holder& h ) const { return h.holderPos == holderPos && h.holderName == holderName; } - bool operator!=( const Holder& h ) const { return h.holderPos != holderPos || h.holderName != holderName; } - QString holderName; - int holderPos; -}; - -#define Q_DEFINED_QSQLEXTENSION -#include "qwinexport.h" - -class QM_EXPORT_SQL QSqlExtension { -public: - QSqlExtension(); - virtual ~QSqlExtension(); - virtual bool prepare( const QString& query ); - virtual bool exec(); - virtual void bindValue( const QString& holder, const QVariant& value, QSql::ParameterType = QSql::In ); - virtual void bindValue( int pos, const QVariant& value, QSql::ParameterType = QSql::In ); - virtual void addBindValue( const QVariant& value, QSql::ParameterType = QSql::In ); - virtual QVariant parameterValue( const QString& holder ); - virtual QVariant parameterValue( int pos ); - QVariant boundValue( const QString& holder ) const; - QVariant boundValue( int pos ) const; - QMap boundValues() const; - void clear(); - void clearValues(); - void clearIndex(); - void resetBindCount(); - - enum BindMethod { BindByPosition, BindByName }; - BindMethod bindMethod(); // ### 4.0: make this const - BindMethod bindm; - int bindCount; - - QMap index; - typedef QMap ValueMap; - ValueMap values; - - // convenience container for QSqlQuery - // to map holders <-> positions - typedef QValueVector HolderVector; - HolderVector holders; -}; - -class QM_EXPORT_SQL QSqlDriverExtension -{ -public: - QSqlDriverExtension(); - virtual ~QSqlDriverExtension(); - virtual bool isOpen() const = 0; -}; - -class QM_EXPORT_SQL QSqlOpenExtension -{ -public: - QSqlOpenExtension(); - virtual ~QSqlOpenExtension(); - virtual bool open( const QString& db, - const QString& user, - const QString& password, - const QString& host, - int port, - const QString& connOpts ) = 0; -}; -#endif - -#endif diff --git a/drivers/qt3-mysql-utf/qt3-mysql-utf.cpp b/drivers/qt3-mysql-utf/qt3-mysql-utf.cpp deleted file mode 100644 index a39216c5..00000000 --- a/drivers/qt3-mysql-utf/qt3-mysql-utf.cpp +++ /dev/null @@ -1,781 +0,0 @@ -// qt3-mysql-utf.cpp -// -// Qt3 SQL plug-in for MySQL with Unicode UTF-8 support -// (C) Copyright 2018 Fred Gleason -// -// Based on the stock Qt3 MySQL driver -// Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -// -// This file may be used under the terms of the Q Public License as -// defined by Trolltech ASA and appearing in the file LICENSE.QPL -// included in the packaging of this file. Licensees holding valid Qt -// Commercial licenses may use this file in accordance with the Qt -// Commercial License Agreement provided with the Software. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#include "qt3-mysql-utf.h" -#include "qsqlextension.h" - -#include -#include -#include - -#define QMYSQLUTF_DRIVER_NAME "QMYSQLUTF8" - -QPtrDict *qSqlOpenExtDict(); - -static int qMySqlConnectionCount = 0; -static bool qMySqlInitHandledByUser = FALSE; - -class QMYSQLUTFOpenExtension : public QSqlOpenExtension -{ -public: - QMYSQLUTFOpenExtension( QMYSQLUTFDriver *dri ) - : QSqlOpenExtension(), driver(dri) {} - ~QMYSQLUTFOpenExtension() {} - - bool open( const QString& db, - const QString& user, - const QString& password, - const QString& host, - int port, - const QString& connOpts ); - -private: - QMYSQLUTFDriver *driver; -}; - -bool QMYSQLUTFOpenExtension::open( const QString& db, - const QString& user, - const QString& password, - const QString& host, - int port, - const QString& connOpts ) -{ - return driver->open( db, user, password, host, port, connOpts ); -} - -class QMYSQLUTFDriverPrivate -{ -public: - QMYSQLUTFDriverPrivate() : mysql(0) {} - MYSQL* mysql; -}; - -class QMYSQLUTFResultPrivate : public QMYSQLUTFDriverPrivate -{ -public: - QMYSQLUTFResultPrivate() : QMYSQLUTFDriverPrivate(), result(0) {} - MYSQL_RES* result; - MYSQL_ROW row; - QValueVector fieldTypes; -}; - -QSqlError qMakeError( const QString& err, int type, const QMYSQLUTFDriverPrivate* p ) -{ - return QSqlError(QMYSQLUTF_DRIVER_NAME ": " + err, QString(mysql_error( p->mysql )), type, mysql_errno( p->mysql )); -} - -QVariant::Type qDecodeMYSQLType( int mysqltype, uint flags ) -{ - QVariant::Type type; - switch ( mysqltype ) { - case FIELD_TYPE_TINY : - case FIELD_TYPE_SHORT : - case FIELD_TYPE_LONG : - case FIELD_TYPE_INT24 : - type = (flags & UNSIGNED_FLAG) ? QVariant::UInt : QVariant::Int; - break; - case FIELD_TYPE_YEAR : - type = QVariant::Int; - break; - case FIELD_TYPE_LONGLONG : - type = (flags & UNSIGNED_FLAG) ? QVariant::ULongLong : QVariant::LongLong; - break; - case FIELD_TYPE_DECIMAL : - case FIELD_TYPE_FLOAT : - case FIELD_TYPE_DOUBLE : - type = QVariant::Double; - break; - case FIELD_TYPE_DATE : - type = QVariant::Date; - break; - case FIELD_TYPE_TIME : - type = QVariant::Time; - break; - case FIELD_TYPE_DATETIME : - case FIELD_TYPE_TIMESTAMP : - type = QVariant::DateTime; - break; - case FIELD_TYPE_BLOB : - case FIELD_TYPE_TINY_BLOB : - case FIELD_TYPE_MEDIUM_BLOB : - case FIELD_TYPE_LONG_BLOB : - type = (flags & BINARY_FLAG) ? QVariant::ByteArray : QVariant::CString; - break; - default: - case FIELD_TYPE_ENUM : - case FIELD_TYPE_SET : - case FIELD_TYPE_STRING : - case FIELD_TYPE_VAR_STRING : - type = QVariant::String; - break; - } - return type; -} - -QMYSQLUTFResult::QMYSQLUTFResult( const QMYSQLUTFDriver* db ) -: QSqlResult( db ) -{ - d = new QMYSQLUTFResultPrivate(); - d->mysql = db->d->mysql; -} - -QMYSQLUTFResult::~QMYSQLUTFResult() -{ - cleanup(); - delete d; -} - -MYSQL_RES* QMYSQLUTFResult::result() -{ - return d->result; -} - -void QMYSQLUTFResult::cleanup() -{ - if ( d->result ) { - mysql_free_result( d->result ); - } - d->result = NULL; - d->row = NULL; - setAt( -1 ); - setActive( FALSE ); -} - -bool QMYSQLUTFResult::fetch( int i ) -{ - if ( isForwardOnly() ) { // fake a forward seek - if ( at() < i ) { - int x = i - at(); - while ( --x && fetchNext() ); - return fetchNext(); - } else { - return FALSE; - } - } - if ( at() == i ) - return TRUE; - mysql_data_seek( d->result, i ); - d->row = mysql_fetch_row( d->result ); - if ( !d->row ) - return FALSE; - setAt( i ); - return TRUE; -} - -bool QMYSQLUTFResult::fetchNext() -{ - d->row = mysql_fetch_row( d->result ); - if ( !d->row ) - return FALSE; - setAt( at() + 1 ); - return TRUE; -} - -bool QMYSQLUTFResult::fetchLast() -{ - if ( isForwardOnly() ) { // fake this since MySQL can't seek on forward only queries - bool success = fetchNext(); // did we move at all? - while ( fetchNext() ); - return success; - } - my_ulonglong numRows = mysql_num_rows( d->result ); - if ( !numRows ) - return FALSE; - return fetch( numRows - 1 ); -} - -bool QMYSQLUTFResult::fetchFirst() -{ - if ( isForwardOnly() ) // again, fake it - return fetchNext(); - return fetch( 0 ); -} - -QVariant QMYSQLUTFResult::data( int field ) -{ - if ( !isSelect() || field >= (int) d->fieldTypes.count() ) { - qWarning( "QMYSQLUTFResult::data: column %d out of range", field ); - return QVariant(); - } - - QString val( d->row[field] ); - switch ( d->fieldTypes.at( field ) ) { - case QVariant::LongLong: - return QVariant( val.toLongLong() ); - case QVariant::ULongLong: - return QVariant( val.toULongLong() ); - case QVariant::Int: - return QVariant( val.toInt() ); - case QVariant::UInt: - return QVariant( val.toUInt() ); - case QVariant::Double: - return QVariant( val.toDouble() ); - case QVariant::Date: - if ( val.isEmpty() ) { - return QVariant( QDate() ); - } else { - return QVariant( QDate::fromString( val, Qt::ISODate ) ); - } - case QVariant::Time: - if ( val.isEmpty() ) { - return QVariant( QTime() ); - } else { - return QVariant( QTime::fromString( val, Qt::ISODate ) ); - } - case QVariant::DateTime: - if ( val.isEmpty() ) - return QVariant( QDateTime() ); - if ( val.length() == 14u ) - // TIMESTAMPS have the format yyyyMMddhhmmss - val.insert(4, "-").insert(7, "-").insert(10, 'T').insert(13, ':').insert(16, ':'); - return QVariant( QDateTime::fromString( val, Qt::ISODate ) ); - case QVariant::ByteArray: { - unsigned long* fl = mysql_fetch_lengths( d->result ); - QByteArray ba; - ba.duplicate( d->row[field], fl[field] ); - return QVariant( ba ); - } - default: - case QVariant::String: - case QVariant::CString: - return QVariant(QString::fromUtf8(d->row[field] )); - } -#ifdef QT_CHECK_RANGE - qWarning("QMYSQLUTFResult::data: unknown data type"); -#endif - return QVariant(); -} - -bool QMYSQLUTFResult::isNull( int field ) -{ - if ( d->row[field] == NULL ) - return TRUE; - return FALSE; -} - -bool QMYSQLUTFResult::reset ( const QString& query ) -{ - if ( !driver() ) - return FALSE; - if ( !driver()-> isOpen() || driver()->isOpenError() ) - return FALSE; - cleanup(); - - QCString encQuery = query.utf8(); - if ( mysql_real_query( d->mysql, encQuery, encQuery.length() ) ) { - setLastError( qMakeError("Unable to execute query", QSqlError::Statement, d ) ); - return FALSE; - } - if ( isForwardOnly() ) { - if ( isActive() || isValid() ) // have to empty the results from previous query - fetchLast(); - d->result = mysql_use_result( d->mysql ); - } else { - d->result = mysql_store_result( d->mysql ); - } - if ( !d->result && mysql_field_count( d->mysql ) > 0 ) { - setLastError( qMakeError( "Unable to store result", QSqlError::Statement, d ) ); - return FALSE; - } - int numFields = mysql_field_count( d->mysql ); - setSelect( !( numFields == 0) ); - d->fieldTypes.resize( numFields ); - if ( isSelect() ) { - for( int i = 0; i < numFields; i++) { - MYSQL_FIELD* field = mysql_fetch_field_direct( d->result, i ); - if ( field->type == FIELD_TYPE_DECIMAL ) - d->fieldTypes[i] = QVariant::String; - else - d->fieldTypes[i] = qDecodeMYSQLType( field->type, field->flags ); - } - } - setActive( TRUE ); - return TRUE; -} - -int QMYSQLUTFResult::size() -{ - return isSelect() ? (int)mysql_num_rows( d->result ) : -1; -} - -int QMYSQLUTFResult::numRowsAffected() -{ - return (int)mysql_affected_rows( d->mysql ); -} - -///////////////////////////////////////////////////////// -static void qServerEnd() -{ -#ifndef Q_NO_MYSQL_EMBEDDED -# if MYSQL_VERSION_ID >= 40000 - mysql_server_end(); -# endif // MYSQL_VERSION_ID -#endif // Q_NO_MYSQL_EMBEDDED -} - -static void qServerInit() -{ -#ifndef Q_NO_MYSQL_EMBEDDED -# if MYSQL_VERSION_ID >= 40000 - if ( qMySqlInitHandledByUser || qMySqlConnectionCount > 1 ) - return; - - // this should only be called once - // has no effect on client/server library - // but is vital for the embedded lib - if ( mysql_server_init( 0, 0, 0 ) ) { -# ifdef QT_CHECK_RANGE - qWarning( "QMYSQLUTFDriver::qServerInit: unable to start server." ); -# endif - } - -# endif // MYSQL_VERSION_ID -#endif // Q_NO_MYSQL_EMBEDDED -} - -QMYSQLUTFDriver::QMYSQLUTFDriver( QObject * parent, const char * name ) - : QSqlDriver( parent, name ? name : QMYSQLUTF_DRIVER_NAME ) -{ - init(); - qServerInit(); -} - -/*! - Create a driver instance with an already open connection handle. -*/ - -QMYSQLUTFDriver::QMYSQLUTFDriver( MYSQL * con, QObject * parent, const char * name ) - : QSqlDriver( parent, name ? name : QMYSQLUTF_DRIVER_NAME ) -{ - init(); - if ( con ) { - d->mysql = (MYSQL *) con; - setOpen( TRUE ); - setOpenError( FALSE ); - if (qMySqlConnectionCount == 1) - qMySqlInitHandledByUser = TRUE; - } else { - qServerInit(); - } -} - -void QMYSQLUTFDriver::init() -{ - // qSqlOpenExtDict()->insert( this, new QMYSQLUTFOpenExtension(this) ); - d = new QMYSQLUTFDriverPrivate(); - d->mysql = 0; - qMySqlConnectionCount++; -} - -QMYSQLUTFDriver::~QMYSQLUTFDriver() -{ - qMySqlConnectionCount--; - if (qMySqlConnectionCount == 0 && !qMySqlInitHandledByUser) - qServerEnd(); - - delete d; - - if ( !qSqlOpenExtDict()->isEmpty() ) { - QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); - delete ext; - } -} - -bool QMYSQLUTFDriver::hasFeature( DriverFeature f ) const -{ - switch ( f ) { - case Transactions: -// CLIENT_TRANSACTION should be defined in all recent mysql client libs > 3.23.34 -#ifdef CLIENT_TRANSACTIONS - if ( d->mysql ) { - if ( ( d->mysql->server_capabilities & CLIENT_TRANSACTIONS ) == CLIENT_TRANSACTIONS ) - return TRUE; - } -#endif - return FALSE; - case QuerySize: - return TRUE; - case BLOB: - return TRUE; - case Unicode: - return TRUE; - default: - return FALSE; - } -} - -bool QMYSQLUTFDriver::open( const QString& db, - const QString& user, - const QString& password, - const QString& host, - int port) -{ - return open(db,user,password,host,port,""); -} - -bool QMYSQLUTFDriver::open( const QString& db, - const QString& user, - const QString& password, - const QString& host, - int port, - const QString& connOpts ) -{ - if ( isOpen() ) - close(); - - unsigned int optionFlags = 0; - - QStringList raw = QStringList::split( ';', connOpts ); - QStringList opts; - QStringList::ConstIterator it; - - // extract the real options from the string - for ( it = raw.begin(); it != raw.end(); ++it ) { - QString tmp( *it ); - int idx; - if ( (idx = tmp.find( '=' )) != -1 ) { - QString val( tmp.mid( idx + 1 ) ); - val.simplifyWhiteSpace(); - if ( val == "TRUE" || val == "1" ) - opts << tmp.left( idx ); - else - qWarning( "QMYSQLUTFDriver::open: Illegal connect option value '%s'", tmp.latin1() ); - } else { - opts << tmp; - } - } - - for ( it = opts.begin(); it != opts.end(); ++it ) { - QString opt( (*it).upper() ); - if ( opt == "CLIENT_COMPRESS" ) - optionFlags |= CLIENT_COMPRESS; - else if ( opt == "CLIENT_FOUND_ROWS" ) - optionFlags |= CLIENT_FOUND_ROWS; - else if ( opt == "CLIENT_IGNORE_SPACE" ) - optionFlags |= CLIENT_IGNORE_SPACE; - else if ( opt == "CLIENT_INTERACTIVE" ) - optionFlags |= CLIENT_INTERACTIVE; - else if ( opt == "CLIENT_NO_SCHEMA" ) - optionFlags |= CLIENT_NO_SCHEMA; - else if ( opt == "CLIENT_ODBC" ) - optionFlags |= CLIENT_ODBC; - else if ( opt == "CLIENT_SSL" ) - optionFlags |= CLIENT_SSL; - else - qWarning( "QMYSQLUTFDriver::open: Unknown connect option '%s'", (*it).latin1() ); - } - - if ( (d->mysql = mysql_init((MYSQL*) 0)) && - mysql_real_connect( d->mysql, - host, - user, - password, - db.isNull() ? QString("") : db, - (port > -1) ? port : 0, - NULL, - optionFlags ) ) - { - if ( !db.isEmpty() && mysql_select_db( d->mysql, db )) { - setLastError( qMakeError("Unable open database '" + db + "'", QSqlError::Connection, d ) ); - mysql_close( d->mysql ); - setOpenError( TRUE ); - return FALSE; - } - } else { - setLastError( qMakeError( "Unable to connect", QSqlError::Connection, d ) ); - mysql_close( d->mysql ); - setOpenError( TRUE ); - return FALSE; - } - setOpen( TRUE ); - setOpenError( FALSE ); - return TRUE; -} - -void QMYSQLUTFDriver::close() -{ - if ( isOpen() ) { - mysql_close( d->mysql ); - setOpen( FALSE ); - setOpenError( FALSE ); - } -} - -QSqlQuery QMYSQLUTFDriver::createQuery() const -{ - return QSqlQuery( new QMYSQLUTFResult( this ) ); -} - -QStringList QMYSQLUTFDriver::tables( const QString& typeName ) const -{ - QStringList tl; - if ( !isOpen() ) - return tl; - if ( !typeName.isEmpty() && !(typeName.toInt() & (int)QSql::Tables) ) - return tl; - - MYSQL_RES* tableRes = mysql_list_tables( d->mysql, NULL ); - MYSQL_ROW row; - int i = 0; - while ( tableRes && TRUE ) { - mysql_data_seek( tableRes, i ); - row = mysql_fetch_row( tableRes ); - if ( !row ) - break; - tl.append( QString(row[0]) ); - i++; - } - mysql_free_result( tableRes ); - return tl; -} - -QSqlIndex QMYSQLUTFDriver::primaryIndex( const QString& tablename ) const -{ - QSqlIndex idx; - if ( !isOpen() ) - return idx; - QSqlQuery i = createQuery(); - QString stmt( "show index from %1;" ); - QSqlRecord fil = record( tablename ); - i.exec( stmt.arg( tablename ) ); - while ( i.isActive() && i.next() ) { - if ( i.value(2).toString() == "PRIMARY" ) { - idx.append( *fil.field( i.value(4).toString() ) ); - idx.setCursorName( i.value(0).toString() ); - idx.setName( i.value(2).toString() ); - } - } - return idx; -} - -QSqlRecord QMYSQLUTFDriver::record( const QString& tablename ) const -{ - QSqlRecord fil; - if ( !isOpen() ) - return fil; - MYSQL_RES* r = mysql_list_fields( d->mysql, tablename.local8Bit().data(), 0); - if ( !r ) { - return fil; - } - MYSQL_FIELD* field; - while ( (field = mysql_fetch_field( r ))) { - QSqlField f ( QString( field->name ) , qDecodeMYSQLType( (int)field->type, field->flags ) ); - fil.append ( f ); - } - mysql_free_result( r ); - return fil; -} - -QSqlRecord QMYSQLUTFDriver::record( const QSqlQuery& query ) const -{ - QSqlRecord fil; - if ( !isOpen() ) - return fil; - if ( query.isActive() && query.isSelect() && query.driver() == this ) { - QMYSQLUTFResult* result = (QMYSQLUTFResult*)query.result(); - QMYSQLUTFResultPrivate* p = result->d; - if ( !mysql_errno( p->mysql ) ) { - for ( ;; ) { - MYSQL_FIELD* f = mysql_fetch_field( p->result ); - if ( f ) { - QSqlField fi( QString((const char*)f->name), qDecodeMYSQLType( f->type, f->flags ) ); - fil.append( fi ); - } else - break; - } - } - mysql_field_seek( p->result, 0 ); - } - return fil; -} - -QSqlRecordInfo QMYSQLUTFDriver::recordInfo( const QString& tablename ) const -{ - QSqlRecordInfo info; - if ( !isOpen() ) - return info; - MYSQL_RES* r = mysql_list_fields( d->mysql, tablename.local8Bit().data(), 0); - if ( !r ) { - return info; - } - MYSQL_FIELD* field; - while ( (field = mysql_fetch_field( r ))) { - info.append ( QSqlFieldInfo( QString( field->name ), - qDecodeMYSQLType( (int)field->type, field->flags ), - IS_NOT_NULL( field->flags ), - (int)field->length, - (int)field->decimals, - QString( field->def ), - (int)field->type ) ); - } - mysql_free_result( r ); - return info; -} - -QSqlRecordInfo QMYSQLUTFDriver::recordInfo( const QSqlQuery& query ) const -{ - QSqlRecordInfo info; - if ( !isOpen() ) - return info; - if ( query.isActive() && query.isSelect() && query.driver() == this ) { - QMYSQLUTFResult* result = (QMYSQLUTFResult*)query.result(); - QMYSQLUTFResultPrivate* p = result->d; - if ( !mysql_errno( p->mysql ) ) { - for ( ;; ) { - MYSQL_FIELD* field = mysql_fetch_field( p->result ); - if ( field ) { - info.append ( QSqlFieldInfo( QString( field->name ), - qDecodeMYSQLType( (int)field->type, field->flags ), - IS_NOT_NULL( field->flags ), - (int)field->length, - (int)field->decimals, - QVariant(), - (int)field->type ) ); - - } else - break; - } - } - mysql_field_seek( p->result, 0 ); - } - return info; -} - -MYSQL* QMYSQLUTFDriver::mysql() -{ - return d->mysql; -} - -bool QMYSQLUTFDriver::beginTransaction() -{ -#ifndef CLIENT_TRANSACTIONS - return FALSE; -#endif - if ( !isOpen() ) { -#ifdef QT_CHECK_RANGE - qWarning( "QMYSQLUTFDriver::beginTransaction: Database not open" ); -#endif - return FALSE; - } - if ( mysql_query( d->mysql, "BEGIN WORK" ) ) { - setLastError( qMakeError("Unable to begin transaction", QSqlError::Statement, d ) ); - return FALSE; - } - return TRUE; -} - -bool QMYSQLUTFDriver::commitTransaction() -{ -#ifndef CLIENT_TRANSACTIONS - return FALSE; -#endif - if ( !isOpen() ) { -#ifdef QT_CHECK_RANGE - qWarning( "QMYSQLUTFDriver::commitTransaction: Database not open" ); -#endif - return FALSE; - } - if ( mysql_query( d->mysql, "COMMIT" ) ) { - setLastError( qMakeError("Unable to commit transaction", QSqlError::Statement, d ) ); - return FALSE; - } - return TRUE; -} - -bool QMYSQLUTFDriver::rollbackTransaction() -{ -#ifndef CLIENT_TRANSACTIONS - return FALSE; -#endif - if ( !isOpen() ) { -#ifdef QT_CHECK_RANGE - qWarning( "QMYSQLUTFDriver::rollbackTransaction: Database not open" ); -#endif - return FALSE; - } - if ( mysql_query( d->mysql, "ROLLBACK" ) ) { - setLastError( qMakeError("Unable to rollback transaction", QSqlError::Statement, d ) ); - return FALSE; - } - return TRUE; -} - -QString QMYSQLUTFDriver::formatValue( const QSqlField* field, bool trimStrings ) const -{ - QString r; - if ( field->isNull() ) { - r = nullText(); - } else { - switch( field->type() ) { - case QVariant::ByteArray: { - - const QByteArray ba = field->value().toByteArray(); - // buffer has to be at least length*2+1 bytes - char* buffer = new char[ ba.size() * 2 + 1 ]; - /*uint escapedSize =*/ mysql_escape_string( buffer, ba.data(), ba.size() ); - r.append("'").append(buffer).append("'"); - delete[] buffer; - } - break; - case QVariant::String: - case QVariant::CString: { - // Escape '\' characters - r = QSqlDriver::formatValue( field ); - r.replace( "\\", "\\\\" ); - break; - } - default: - r = QSqlDriver::formatValue( field, trimStrings ); - } - } - return r; -} - - -QMYSQLUTFDriverPlugin::QMYSQLUTFDriverPlugin() - : QSqlDriverPlugin() -{ -} - -QSqlDriver* QMYSQLUTFDriverPlugin::create( const QString &name ) -{ - if ( name == "QMYSQLUTF8" ) { - QMYSQLUTFDriver* driver = new QMYSQLUTFDriver(); - return driver; - } - return 0; -} - -QStringList QMYSQLUTFDriverPlugin::keys() const -{ - QStringList l; - l << "QMYSQLUTF8"; - return l; -} - -Q_EXPORT_PLUGIN( QMYSQLUTFDriverPlugin ) diff --git a/drivers/qt3-mysql-utf/qt3-mysql-utf.h b/drivers/qt3-mysql-utf/qt3-mysql-utf.h deleted file mode 100644 index 1dba0af1..00000000 --- a/drivers/qt3-mysql-utf/qt3-mysql-utf.h +++ /dev/null @@ -1,115 +0,0 @@ -// qt3-mysql-utf.h -// -// Qt3 SQL plug-in for MySQL with Unicode UTF-8 support -// (C) Copyright 2018 Fred Gleason -// -// Based on the stock Qt3 MySQL driver -// Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#ifndef QT3_MYSQL_UTF_H -#define QT3_MYSQL_UTF_H - -#include -#include -#include -#include -#include - -#include - -#define Q_EXPORT_SQLDRIVER_MYSQL - -class QMYSQLUTFDriverPlugin : public QSqlDriverPlugin -{ -public: - QMYSQLUTFDriverPlugin(); - - QSqlDriver* create( const QString & ); - QStringList keys() const; -}; - -class QMYSQLUTFDriverPrivate; -class QMYSQLUTFResultPrivate; -class QMYSQLUTFDriver; -class QSqlRecordInfo; - -class QMYSQLUTFResult : public QSqlResult -{ - friend class QMYSQLUTFDriver; -public: - QMYSQLUTFResult( const QMYSQLUTFDriver* db ); - ~QMYSQLUTFResult(); - - MYSQL_RES* result(); -protected: - void cleanup(); - bool fetch( int i ); - bool fetchNext(); - bool fetchLast(); - bool fetchFirst(); - QVariant data( int field ); - bool isNull( int field ); - bool reset ( const QString& query ); - int size(); - int numRowsAffected(); -private: - QMYSQLUTFResultPrivate* d; -}; - -class Q_EXPORT_SQLDRIVER_MYSQL QMYSQLUTFDriver : public QSqlDriver -{ - friend class QMYSQLUTFResult; -public: - QMYSQLUTFDriver( QObject * parent=0, const char * name=0 ); - QMYSQLUTFDriver( MYSQL * con, QObject * parent=0, const char * name=0 ); - ~QMYSQLUTFDriver(); - bool hasFeature( DriverFeature f ) const; - bool open( const QString & db, - const QString & user = QString::null, - const QString & password = QString::null, - const QString & host = QString::null, - int port = -1 ); - void close(); - QSqlQuery createQuery() const; - QStringList tables( const QString& user ) const; - QSqlIndex primaryIndex( const QString& tablename ) const; - QSqlRecord record( const QString& tablename ) const; - QSqlRecord record( const QSqlQuery& query ) const; - QSqlRecordInfo recordInfo( const QString& tablename ) const; - QSqlRecordInfo recordInfo( const QSqlQuery& query ) const; - QString formatValue( const QSqlField* field, - bool trimStrings ) const; - MYSQL* mysql(); - // ### remove me for 4.0 - bool open( const QString& db, - const QString& user, - const QString& password, - const QString& host, - int port, - const QString& connOpts ); - -protected: - bool beginTransaction(); - bool commitTransaction(); - bool rollbackTransaction(); -private: - void init(); - QMYSQLUTFDriverPrivate* d; -}; - - -#endif // QT3_MYSQL_UTF_H diff --git a/drivers/qt3-mysql-utf/qt3-mysql-utf.pro b/drivers/qt3-mysql-utf/qt3-mysql-utf.pro deleted file mode 100644 index 97b83213..00000000 --- a/drivers/qt3-mysql-utf/qt3-mysql-utf.pro +++ /dev/null @@ -1,26 +0,0 @@ -# qt3-mysql-utf.pro -# -# The QMake project file for qt3-mysql-utf -# -# (C) Copyright 2018 Fred Gleason -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -TEMPLATE = plugin - -SOURCES += qsqlextension.cpp -SOURCES += qt3-mysql-utf.cpp - -HEADERS += qsqlextension.h -HEADERS += qt3-mysql-utf.h diff --git a/importers/Makefile.am b/importers/Makefile.am index 9da4f88a..0010de4e 100644 --- a/importers/Makefile.am +++ b/importers/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/importers ## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +20,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,27 +37,27 @@ bin_PROGRAMS = nexgen_filter\ dist_nexgen_filter_SOURCES = nexgen_filter.cpp nexgen_filter.h nodist_nexgen_filter_SOURCES = moc_nexgen_filter.cpp -nexgen_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +nexgen_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_panel_copy_SOURCES = panel_copy.cpp panel_copy.h nodist_panel_copy_SOURCES = moc_panel_copy.cpp -panel_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +panel_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_rdcatch_copy_SOURCES = rdcatch_copy.cpp rdcatch_copy.h nodist_rdcatch_copy_SOURCES = moc_rdcatch_copy.cpp -rdcatch_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdcatch_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_rivendell_filter_SOURCES = rivendell_filter.cpp rivendell_filter.h nodist_rivendell_filter_SOURCES = moc_rivendell_filter.cpp -rivendell_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rivendell_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_sas_filter_SOURCES = sas_filter.cpp sas_filter.h nodist_sas_filter_SOURCES = moc_sas_filter.cpp -sas_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +sas_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_wings_filter_SOURCES = wings_filter.cpp wings_filter.h nodist_wings_filter_SOURCES = moc_wings_filter.cpp -wings_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +wings_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = export_slax diff --git a/importers/nexgen_filter.cpp b/importers/nexgen_filter.cpp index 0c97008b..94f591da 100644 --- a/importers/nexgen_filter.cpp +++ b/importers/nexgen_filter.cpp @@ -187,7 +187,7 @@ MainObject::MainObject(QObject *parent) // // Main Loop // - for(unsigned i=0;iname()+" "+ - filter_temp_audiofile)!=0) { + QString cmd=QString("rdimport ")+ + "--autotrim-level=0 "+ + QString().sprintf("--normalization-level=%d ",filter_normalization_level)+ + QString().sprintf("--to-cart=%d ",cartnum)+ + delete_cuts_switch+ + filter_group->name()+" "+ + filter_temp_audiofile; + if(system(cmd.toUtf8())!=0) { Print(QString().sprintf(" aborted.\n")); fprintf(stderr,"import of \"%s\" failed\n",(const char *)filename); WriteReject(xml); diff --git a/importers/panel_copy.cpp b/importers/panel_copy.cpp index a60b0b81..4c0c629c 100644 --- a/importers/panel_copy.cpp +++ b/importers/panel_copy.cpp @@ -41,8 +41,8 @@ MainObject::MainObject(QObject *parent) QString src_station; QString dest_station; QString sql; - RDSqlQuery *q; - RDSqlQuery *q1; + QSqlQuery *q; + QSqlQuery *q1; // // Read Command Options @@ -100,41 +100,31 @@ MainObject::MainObject(QObject *parent) // Open Databases // src_db=QSqlDatabase::addDatabase("QMYSQL3","SRCDB"); - if(!src_db) { - fprintf(stderr,"panel_copy: can't open source mySQL database\n"); - exit(1); - } - src_db->setDatabaseName(rd_config->mysqlDbname()); - src_db->setUserName(rd_config->mysqlUsername()); - src_db->setPassword(rd_config->mysqlPassword()); - src_db->setHostName(src_hostname); - if(!src_db->open()) { + src_db.setDatabaseName(rd_config->mysqlDbname()); + src_db.setUserName(rd_config->mysqlUsername()); + src_db.setPassword(rd_config->mysqlPassword()); + src_db.setHostName(src_hostname); + if(!src_db.open()) { fprintf(stderr,"panel_copy: unable to connect to source mySQL server\n"); - src_db->removeDatabase(rd_config->mysqlDbname()); - exit(256); + exit(1); } dest_db=QSqlDatabase::addDatabase("QMYSQL3","DESTDB"); - if(!dest_db) { - fprintf(stderr,"panel_copy: can't open destination mySQL database\n"); - exit(1); - } - dest_db->setDatabaseName(rd_config->mysqlDbname()); - dest_db->setUserName(rd_config->mysqlUsername()); - dest_db->setPassword(rd_config->mysqlPassword()); - dest_db->setHostName(dest_hostname); - if(!dest_db->open()) { + dest_db.setDatabaseName(rd_config->mysqlDbname()); + dest_db.setUserName(rd_config->mysqlUsername()); + dest_db.setPassword(rd_config->mysqlPassword()); + dest_db.setHostName(dest_hostname); + if(!dest_db.open()) { fprintf(stderr, "panel_copy: unable to connect to destination mySQL server\n"); - dest_db->removeDatabase(rd_config->mysqlDbname()); - exit(256); + exit(1); } // // Check Database Versions // sql=QString("select DB from VERSION"); - q=new RDSqlQuery(sql,src_db); + q=new QSqlQuery(sql,src_db); if(!q->first()) { fprintf(stderr,"panel_copy: unable to read source database version\n"); exit(256); @@ -145,7 +135,7 @@ MainObject::MainObject(QObject *parent) } delete q; - q=new RDSqlQuery(sql,dest_db); + q=new QSqlQuery(sql,dest_db); if(!q->first()) { fprintf(stderr, "panel_copy: unable to read destination database version\n"); @@ -173,7 +163,7 @@ MainObject::MainObject(QObject *parent) // Delete current destination entries // sql="delete from PANELS"; - q=new RDSqlQuery(sql,dest_db); + q=new QSqlQuery(sql,dest_db); delete q; // @@ -189,7 +179,7 @@ MainObject::MainObject(QObject *parent) "CART,"+ // 06 "DEFAULT_COLOR "+ // 07 "from PANELS"; - q=new RDSqlQuery(sql,src_db); + q=new QSqlQuery(sql,src_db); while(q->next()) { sql=QString("insert into PANELS set ")+ QString().sprintf("TYPE=%d,",q->value(0).toInt())+ @@ -200,7 +190,7 @@ MainObject::MainObject(QObject *parent) "LABEL=\""+RDEscapeString(q->value(5).toString())+"\","+ QString().sprintf("CART=%d,",q->value(6).toInt())+ "DEFAULT_COLOR=\""+RDEscapeString(q->value(7).toString())+"\""; - q1=new RDSqlQuery(sql,dest_db); + q1=new QSqlQuery(sql,dest_db); delete q1; } delete q; diff --git a/importers/panel_copy.h b/importers/panel_copy.h index 6c13949f..042000d3 100644 --- a/importers/panel_copy.h +++ b/importers/panel_copy.h @@ -36,8 +36,8 @@ class MainObject : public QObject MainObject(QObject *parent=0); private: - QSqlDatabase *src_db; - QSqlDatabase *dest_db; + QSqlDatabase src_db; + QSqlDatabase dest_db; RDConfig *rd_config; }; diff --git a/importers/rdcatch_copy.cpp b/importers/rdcatch_copy.cpp index 197ae400..515f0185 100644 --- a/importers/rdcatch_copy.cpp +++ b/importers/rdcatch_copy.cpp @@ -41,8 +41,8 @@ MainObject::MainObject(QObject *parent) QString src_station; QString dest_station; QString sql; - RDSqlQuery *q; - RDSqlQuery *q1; + QSqlQuery *q; + QSqlQuery *q1; // // Read Command Options @@ -120,17 +120,13 @@ MainObject::MainObject(QObject *parent) // Open Databases // src_db=QSqlDatabase::addDatabase("QMYSQL3"); - if(!src_db) { - fprintf(stderr,"rdcatch_copy: can't open source mySQL database\n"); - exit(1); - } - src_db->setDatabaseName(rd_config->mysqlDbname()); - src_db->setUserName(rd_config->mysqlUsername()); - src_db->setPassword(rd_config->mysqlPassword()); - src_db->setHostName(src_hostname); - if(!src_db->open()) { + src_db.setDatabaseName(rd_config->mysqlDbname()); + src_db.setUserName(rd_config->mysqlUsername()); + src_db.setPassword(rd_config->mysqlPassword()); + src_db.setHostName(src_hostname); + if(!src_db.open()) { fprintf(stderr,"rdcatch_copy: unable to connect to source mySQL server\n"); - src_db->removeDatabase(rd_config->mysqlDbname()); + src_db.removeDatabase(rd_config->mysqlDbname()); exit(256); } @@ -145,18 +141,13 @@ MainObject::MainObject(QObject *parent) } else { dest_db=QSqlDatabase::addDatabase("QMYSQL3"); - if(!dest_db) { - fprintf(stderr,"rdcatch_copy: can't open destination mySQL database\n"); - exit(1); - } - dest_db->setDatabaseName(rd_config->mysqlDbname()); - dest_db->setUserName(rd_config->mysqlUsername()); - dest_db->setPassword(rd_config->mysqlPassword()); - dest_db->setHostName(dest_hostname); - if(!dest_db->open()) { + dest_db.setDatabaseName(rd_config->mysqlDbname()); + dest_db.setUserName(rd_config->mysqlUsername()); + dest_db.setPassword(rd_config->mysqlPassword()); + dest_db.setHostName(dest_hostname); + if(!dest_db.open()) { fprintf(stderr, "rdcatch_copy: unable to connect to destination mySQL server\n"); - dest_db->removeDatabase(rd_config->mysqlDbname()); exit(256); } } @@ -165,7 +156,7 @@ MainObject::MainObject(QObject *parent) // Check Database Versions // sql=QString("select DB from VERSION"); - q=new RDSqlQuery(sql,src_db); + q=new QSqlQuery(sql,src_db); if(!q->first()) { fprintf(stderr, "rdcatch_copy: unable to read source database version\n"); @@ -177,7 +168,7 @@ MainObject::MainObject(QObject *parent) } delete q; - q=new RDSqlQuery(sql,dest_db); + q=new QSqlQuery(sql,dest_db); if(!q->first()) { fprintf(stderr, "rdcatch_copy: unable to read destination database version\n"); @@ -194,7 +185,7 @@ MainObject::MainObject(QObject *parent) // sql=QString("select NAME from STATIONS where ")+ "NAME=\""+RDEscapeString(src_station)+"\""; - q=new RDSqlQuery(sql,src_db); + q=new QSqlQuery(sql,src_db); if(!q->first()) { fprintf(stderr, "rdcatch_copy: source Rivendell host doesn't exist\n"); @@ -204,7 +195,7 @@ MainObject::MainObject(QObject *parent) sql=QString("select NAME from STATIONS where ")+ "NAME=\""+RDEscapeString(dest_station)+"\""; - q=new RDSqlQuery(sql,dest_db); + q=new QSqlQuery(sql,dest_db); if(!q->first()) { fprintf(stderr, "rdcatch_copy: destination Rivendell host doesn't exist\n"); @@ -229,7 +220,7 @@ MainObject::MainObject(QObject *parent) // sql=QString("delete from RECORDINGS where ")+ "STATION_NAME\""+RDEscapeString(dest_station)+"\""; - q=new RDSqlQuery(sql,dest_db); + q=new QSqlQuery(sql,dest_db); delete q; // @@ -279,7 +270,7 @@ MainObject::MainObject(QObject *parent) "URL_PASSWORD "+ // 40 "from RECORDINGS where "+ "STATION_NAME=\""+RDEscapeString(src_station)+"\""; - q=new RDSqlQuery(sql,src_db); + q=new QSqlQuery(sql,src_db); while(q->next()) { sql=QString("insert into RECORDINGS set ")+ ":IS_ACTIVE=\""+RDEscapeString(q->value(0).toString())+"\","+ @@ -324,7 +315,7 @@ MainObject::MainObject(QObject *parent) "URL_USERNAME=\""+RDEscapeString(q->value(39).toString())+"\","+ "URL_PASSWORD=\""+RDEscapeString(q->value(40).toString())+"\","+ "STATION_NAME=\""+RDEscapeString(dest_station)+"\""; - q1=new RDSqlQuery(sql,dest_db); + q1=new QSqlQuery(sql,dest_db); delete q1; } delete q; diff --git a/importers/rdcatch_copy.h b/importers/rdcatch_copy.h index c6e89afa..79ace574 100644 --- a/importers/rdcatch_copy.h +++ b/importers/rdcatch_copy.h @@ -40,8 +40,8 @@ class MainObject : public QObject MainObject(QObject *parent=0); private: - QSqlDatabase *src_db; - QSqlDatabase *dest_db; + QSqlDatabase src_db; + QSqlDatabase dest_db; RDConfig *rd_config; }; diff --git a/importers/rivendell_filter.cpp b/importers/rivendell_filter.cpp index 4977853e..ff871e59 100644 --- a/importers/rivendell_filter.cpp +++ b/importers/rivendell_filter.cpp @@ -26,6 +26,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -54,8 +56,8 @@ MainObject::MainObject(QObject *parent) QString default_group; unsigned start_cartnum=0; unsigned end_cartnum=0; - QSqlDatabase *filter_db; - QSqlDatabase *ext_db; + QSqlDatabase filter_db; + QSqlDatabase ext_db; bool ok=false; bool found; QString start_datetime; @@ -85,18 +87,13 @@ MainObject::MainObject(QObject *parent) // Open Local Database // filter_db=QSqlDatabase::addDatabase(rdconfig->mysqlDriver(),"LOCAL_DB"); - if(!filter_db) { - fprintf(stderr,"rivendell_filter: can't open local mySQL database\n"); - exit(1); - } - filter_db->setDatabaseName(rdconfig->mysqlDbname()); - filter_db->setUserName(rdconfig->mysqlUsername()); - filter_db->setPassword(rdconfig->mysqlPassword()); - filter_db->setHostName(rdconfig->mysqlHostname()); - if(!filter_db->open()) { + filter_db.setDatabaseName(rdconfig->mysqlDbname()); + filter_db.setUserName(rdconfig->mysqlUsername()); + filter_db.setPassword(rdconfig->mysqlPassword()); + filter_db.setHostName(rdconfig->mysqlHostname()); + if(!filter_db.open()) { fprintf(stderr, "rivendell_filter: unable to connect to local mySQL Server\n"); - filter_db->removeDatabase(rdconfig->mysqlDbname()); exit(1); } @@ -180,18 +177,13 @@ MainObject::MainObject(QObject *parent) // Open Remote Database // ext_db=QSqlDatabase::addDatabase(rdconfig->mysqlDriver(),"REMOTE_DB"); - if(!ext_db) { - fprintf(stderr,"rivendell_filter: can't open remote mySQL database\n"); - exit(1); - } - ext_db->setDatabaseName(rdconfig->mysqlDbname()); - ext_db->setUserName(ext_username); - ext_db->setPassword(ext_password); - ext_db->setHostName(ext_hostname); - if(!ext_db->open()) { + ext_db.setDatabaseName(rdconfig->mysqlDbname()); + ext_db.setUserName(ext_username); + ext_db.setPassword(ext_password); + ext_db.setHostName(ext_hostname); + if(!ext_db.open()) { fprintf(stderr, "rivendell_filter: unable to connect to remote mySQL Server\n"); - ext_db->removeDatabase(rdconfig->mysqlDbname()); exit(1); } diff --git a/lib/Makefile.am b/lib/Makefile.am index df31a873..f422499c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -## automake.am +## Makefile.am ## ## Automake.am for rivendell/lib ## @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT_CXXFLAGS@ -Wno-strict-aliasing +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT4_CFLAGS@ -Wno-strict-aliasing -DQT3_SUPPORT -I/usr/include/Qt3Support MOC = @QT_MOC@ CWRAP = ../helpers/cwrap @@ -43,8 +43,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/librd_*.qm all: - @QT_BIN@/lupdate lib.pro - @QT_BIN@/lrelease lib.pro + lupdate-qt4 lib.pro + lrelease-qt4 lib.pro lib_LTLIBRARIES = librd.la dist_librd_la_SOURCES = dbversion.h\ @@ -275,7 +275,6 @@ nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\ moc_rdcut_dialog.cpp\ moc_rddatedialog.cpp\ moc_rddatepicker.cpp\ - moc_rddb.cpp\ moc_rddbheartbeat.cpp\ moc_rddelete.cpp\ moc_rddownload.cpp\ @@ -318,13 +317,13 @@ nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\ moc_rdplay_deck.cpp\ moc_rdplaymeter.cpp\ moc_rdpushbutton.cpp\ - moc_rdripc.cpp\ - moc_rdrlmhost.cpp\ - moc_rdschedcodes_dialog.cpp\ - moc_rdsegmeter.cpp\ - moc_rdsimpleplayer.cpp\ moc_rdrehash.cpp\ moc_rdrenderer.cpp\ + moc_rdripc.cpp\ + moc_rdrlmhost.cpp\ + moc_rdschedcodes_dialog.cpp\ + moc_rdsegmeter.cpp\ + moc_rdsimpleplayer.cpp\ moc_rdslider.cpp\ moc_rdsocket.cpp\ moc_rdsound_panel.cpp\ @@ -336,6 +335,7 @@ nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\ moc_rdtimeengine.cpp\ moc_rdtransportbutton.cpp\ moc_rdtrimaudio.cpp\ + moc_rdttydevice.cpp\ moc_rdupload.cpp\ moc_rdwavedata_dialog.cpp\ moc_schedcartlist.cpp diff --git a/lib/export_bmiemr.cpp b/lib/export_bmiemr.cpp index 3d48b3ab..d2aaa640 100644 --- a/lib/export_bmiemr.cpp +++ b/lib/export_bmiemr.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -42,13 +42,13 @@ bool RDReport::ExportBmiEmr(const QString &filename,const QDate &startdate, QString station_format=stationFormat(); QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); // // Station Type diff --git a/lib/export_cutlog.cpp b/lib/export_cutlog.cpp index a12b32d5..3f9e4691 100644 --- a/lib/export_cutlog.cpp +++ b/lib/export_cutlog.cpp @@ -22,6 +22,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -42,13 +44,13 @@ bool RDReport::ExportCutLog(const QString &filename,const QDate &startdate, QString cart_num; QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/export_deltaflex.cpp b/lib/export_deltaflex.cpp index d9fd1dba..6fcca111 100644 --- a/lib/export_deltaflex.cpp +++ b/lib/export_deltaflex.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include "rddatedecode.h" #include "rddb.h" @@ -42,13 +42,13 @@ bool RDReport::ExportDeltaflex(const QString &filename,const QDate &startdate, QString air_fmt; QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); if(useLeadingZeros()) { air_fmt=QString().sprintf("%%0%uu",cartDigits()); } @@ -115,7 +115,7 @@ bool RDReport::ExportDeltaflex(const QString &filename,const QDate &startdate, ext_data=""; if(q->value(6).toString().length()>0) { if(q->value(6).toString().length()<=8) { - for(unsigned i=0;i<(8-q->value(6).toString().stripWhiteSpace().length()); + for(int i=0;i<(8-q->value(6).toString().stripWhiteSpace().length()); i++) { ext_data+="0"; } diff --git a/lib/export_musicclassical.cpp b/lib/export_musicclassical.cpp index 469ea5bc..a76e61a7 100644 --- a/lib/export_musicclassical.cpp +++ b/lib/export_musicclassical.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -42,13 +42,13 @@ bool RDReport::ExportMusicClassical(const QString &filename, QString cart_fmt; QString cart_num; QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/export_musicplayout.cpp b/lib/export_musicplayout.cpp index 808c7a2d..f3d3f1dd 100644 --- a/lib/export_musicplayout.cpp +++ b/lib/export_musicplayout.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -42,13 +42,13 @@ bool RDReport::ExportMusicPlayout(const QString &filename, QString cart_num; QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/export_musicsummary.cpp b/lib/export_musicsummary.cpp index 2864549f..d6cc6387 100644 --- a/lib/export_musicsummary.cpp +++ b/lib/export_musicsummary.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -40,13 +40,13 @@ bool RDReport::ExportMusicSummary(const QString &filename, QString str; QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); sql=QString("select ")+ "ELR_LINES.ARTIST,"+ // 00 "ELR_LINES.TITLE,"+ // 01 diff --git a/lib/export_nprsoundex.cpp b/lib/export_nprsoundex.cpp index 80fa6a7b..c55902a5 100644 --- a/lib/export_nprsoundex.cpp +++ b/lib/export_nprsoundex.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "rdairplay_conf.h" #include "rddatedecode.h" @@ -50,13 +50,13 @@ bool RDReport::ExportNprSoundEx(const QString &filename,const QDate &startdate, QString channel_name=stationId(); QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); // // Generate Header diff --git a/lib/export_radiotraffic.cpp b/lib/export_radiotraffic.cpp index d3499e18..945840b8 100644 --- a/lib/export_radiotraffic.cpp +++ b/lib/export_radiotraffic.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "rddb.h" #include "rdconf.h" @@ -37,13 +37,13 @@ bool RDReport::ExportRadioTraffic(const QString &filename, QString air_fmt; QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); if(useLeadingZeros()) { air_fmt=QString().sprintf("%%0%uu ",cartDigits()); } diff --git a/lib/export_soundex.cpp b/lib/export_soundex.cpp index c337691e..ba6f8449 100644 --- a/lib/export_soundex.cpp +++ b/lib/export_soundex.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "rdairplay_conf.h" #include "rddatedecode.h" @@ -57,13 +57,13 @@ bool RDReport::ExportSoundEx(const QString &filename,const QDate &startdate, } QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); // // Generate Header diff --git a/lib/export_spincount.cpp b/lib/export_spincount.cpp index ed2cafd4..d2a3669e 100644 --- a/lib/export_spincount.cpp +++ b/lib/export_spincount.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -48,13 +48,13 @@ bool RDReport::ExportSpinCount(const QString &filename,const QDate &startdate, std::map albums; QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/export_technical.cpp b/lib/export_technical.cpp index 05bdc781..31075e05 100644 --- a/lib/export_technical.cpp +++ b/lib/export_technical.cpp @@ -19,7 +19,7 @@ // #include -#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -45,13 +45,13 @@ bool RDReport::ExportTechnical(const QString &filename,const QDate &startdate, } QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } @@ -86,15 +86,19 @@ bool RDReport::ExportTechnical(const QString &filename,const QDate &startdate, if(incl_hdr) { if(startdate==enddate) { *strm << RDReport::center("Rivendell RDAirPlay Technical Playout Report for "+ - startdate.toString("MM/dd/yyyy"),96)+eol; + startdate.toString("MM/dd/yyyy"),96); + *strm << eol; } else { *strm << RDReport::center("Rivendell RDAirPlay Technical Playout Report for "+ startdate.toString("MM/dd/yyyy")+" - "+ - enddate.toString("MM/dd/yyyy"),96)+eol; + enddate.toString("MM/dd/yyyy"),96); + *strm << eol; } - *strm << RDReport::center(name()+" -- "+description(),96)+eol; - *strm << QString("--Time-- -Cart- Cut --Title---------------- A-Len N-Len --Host---- Srce StartedBy OnAir")+eol; + *strm << RDReport::center(name()+" -- "+description(),96); + *strm << eol; + *strm << "--Time-- -Cart- Cut --Title---------------- A-Len N-Len --Host---- Srce StartedBy OnAir"; + *strm << eol; } // diff --git a/lib/export_textlog.cpp b/lib/export_textlog.cpp index b3d3fdc8..24e4a827 100644 --- a/lib/export_textlog.cpp +++ b/lib/export_textlog.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include "rdairplay_conf.h" #include "rdconf.h" @@ -41,13 +41,13 @@ bool RDReport::ExportTextLog(const QString &filename,const QDate &startdate, QString cart_num; QFile *file=new QFile(filename); - if(!file->open(IO_WriteOnly|IO_Truncate)) { + if(!file->open(QIODevice::WriteOnly|QIODevice::Truncate)) { report_error_code=RDReport::ErrorCantOpen; delete file; return false; } - QTextStream *strm=new QTextStream(file); - strm->setEncoding(QTextStream::UnicodeUTF8); + Q3TextStream *strm=new Q3TextStream(file); + strm->setEncoding(Q3TextStream::UnicodeUTF8); if(useLeadingZeros()) { cart_fmt=QString().sprintf("%%0%uu",cartDigits()); } diff --git a/lib/librd_cs.ts b/lib/librd_cs.ts index 4fa65593..646f7cbc 100644 --- a/lib/librd_cs.ts +++ b/lib/librd_cs.ts @@ -1,4 +1,6 @@ - + + + @@ -17,11 +19,11 @@ QObject Couldn't initialize QSql driver! - Nepodařilo se inicializovat ovladač QSql! + Nepodařilo se inicializovat ovladač QSql! Couldn't open mySQL connection! - Nepodařilo se vytvořit žádné spojení se serverem mySQL-Server! + Nepodařilo se vytvořit žádné spojení se serverem mySQL-Server! Sequentially @@ -595,6 +597,14 @@ is not playable + + Couldn't initialize MySql driver! + + + + Couldn't open MySQL connection on + + RDAddCart @@ -2472,11 +2482,11 @@ Zkuste to, prosím, znovu! RDSqlDatabaseStatus Database connection restored. - Databázové spojení obnoveno. + Databázové spojení obnoveno. Database connection failed : - Databázové spojení se nezdařilo: + Databázové spojení se nezdařilo: diff --git a/lib/librd_de.ts b/lib/librd_de.ts index 4daee998..d2320e5c 100644 --- a/lib/librd_de.ts +++ b/lib/librd_de.ts @@ -1,4 +1,6 @@ - + + + @@ -17,11 +19,11 @@ QObject Couldn't initialize QSql driver! - Qsql-Treiber konnte nicht initialisiert werden! + Qsql-Treiber konnte nicht initialisiert werden! Couldn't open mySQL connection! - Konnte keine Verbindung zum mySQL-Server herstellen! + Konnte keine Verbindung zum mySQL-Server herstellen! Sequentially @@ -591,6 +593,14 @@ is not playable + + Couldn't initialize MySql driver! + + + + Couldn't open MySQL connection on + + RDAddCart @@ -2463,11 +2473,11 @@ bitte erneut versuchen! RDSqlDatabaseStatus Database connection restored. - Datenbankverbindung wiederhergestellt. + Datenbankverbindung wiederhergestellt. Database connection failed : - Datenbankverbindung fehlgeschlagen: + Datenbankverbindung fehlgeschlagen: diff --git a/lib/librd_es.ts b/lib/librd_es.ts index 91e60ef4..5873be68 100644 --- a/lib/librd_es.ts +++ b/lib/librd_es.ts @@ -1,4 +1,6 @@ - + + + @@ -17,11 +19,11 @@ QObject Couldn't initialize QSql driver! - ¡No pude inicializar el driver QSql! + ¡No pude inicializar el driver QSql! Couldn't open mySQL connection! - ¡No pude abrir la conexión mySQL! + ¡No pude abrir la conexión mySQL! Sequentially @@ -591,6 +593,14 @@ is not playable + + Couldn't initialize MySql driver! + + + + Couldn't open MySQL connection on + + RDAddCart @@ -882,7 +892,7 @@ Color ARTIST - ARTISTA + ARTISTA CLIENT @@ -2453,11 +2463,11 @@ please try again! RDSqlDatabaseStatus Database connection restored. - Se recuperó la conexión a la base de datos. + Se recuperó la conexión a la base de datos. Database connection failed : - Falló la conexión a la base de datos : + Falló la conexión a la base de datos : diff --git a/lib/librd_fr.ts b/lib/librd_fr.ts index f1dd06dc..8571667f 100644 --- a/lib/librd_fr.ts +++ b/lib/librd_fr.ts @@ -1,14 +1,8 @@ - + + + QObject - - Couldn't initialize QSql driver! - - - - Couldn't open mySQL connection! - - Sequentially @@ -569,6 +563,14 @@ is not playable + + Couldn't initialize MySql driver! + + + + Couldn't open MySQL connection on + + RDAddCart @@ -2045,17 +2047,6 @@ please try again! Panneau - - RDSqlDatabaseStatus - - Database connection restored. - - - - Database connection failed : - - - RDStereoMeter diff --git a/lib/librd_nb.ts b/lib/librd_nb.ts index 21e9bea3..42c08002 100644 --- a/lib/librd_nb.ts +++ b/lib/librd_nb.ts @@ -1,4 +1,6 @@ - + + + @@ -17,11 +19,11 @@ QObject Couldn't initialize QSql driver! - Greidde ikkje setja opp QSql-drivaren! + Greidde ikkje setja opp QSql-drivaren! Couldn't open mySQL connection! - Greidde ikkje kopla til mySQL-databasen! + Greidde ikkje kopla til mySQL-databasen! Sequentially @@ -591,6 +593,14 @@ is not playable + + Couldn't initialize MySql driver! + + + + Couldn't open MySQL connection on + + RDAddCart @@ -2393,11 +2403,11 @@ prøv ein gong til! RDSqlDatabaseStatus Database connection restored. - Databasetilkoplinga er gjenoppretta. + Databasetilkoplinga er gjenoppretta. Database connection failed : - Feil med databasetilkoplinga: + Feil med databasetilkoplinga: diff --git a/lib/librd_nn.ts b/lib/librd_nn.ts index 21e9bea3..42c08002 100644 --- a/lib/librd_nn.ts +++ b/lib/librd_nn.ts @@ -1,4 +1,6 @@ - + + + @@ -17,11 +19,11 @@ QObject Couldn't initialize QSql driver! - Greidde ikkje setja opp QSql-drivaren! + Greidde ikkje setja opp QSql-drivaren! Couldn't open mySQL connection! - Greidde ikkje kopla til mySQL-databasen! + Greidde ikkje kopla til mySQL-databasen! Sequentially @@ -591,6 +593,14 @@ is not playable + + Couldn't initialize MySql driver! + + + + Couldn't open MySQL connection on + + RDAddCart @@ -2393,11 +2403,11 @@ prøv ein gong til! RDSqlDatabaseStatus Database connection restored. - Databasetilkoplinga er gjenoppretta. + Databasetilkoplinga er gjenoppretta. Database connection failed : - Feil med databasetilkoplinga: + Feil med databasetilkoplinga: diff --git a/lib/librd_pt_BR.ts b/lib/librd_pt_BR.ts index fb6a2c9b..222ab36a 100644 --- a/lib/librd_pt_BR.ts +++ b/lib/librd_pt_BR.ts @@ -1,4 +1,6 @@ - + + + @@ -17,11 +19,11 @@ QObject Couldn't initialize QSql driver! - Não foi possível inicializar driver QSql ! + Não foi possível inicializar driver QSql ! Couldn't open mySQL connection! - Não foi possível conetar ao mySQL ! + Não foi possível conetar ao mySQL ! Sequentially @@ -89,7 +91,7 @@ PLAY - SIMPLES + SIMPLES SEGUE @@ -591,6 +593,14 @@ is not playable + + Couldn't initialize MySql driver! + + + + Couldn't open MySQL connection on + + RDAddCart @@ -2066,7 +2076,7 @@ Por Favor, cheque suas configurações e tenbte outra vez. PLAY - SIMPLES + SIMPLES SEGUE @@ -2412,11 +2422,11 @@ por favor, tente novamente! RDSqlDatabaseStatus Database connection restored. - Conexão à Base de Daods reestabelecido. + Conexão à Base de Daods reestabelecido. Database connection failed : - Conexão à Base de Daods falhou: + Conexão à Base de Daods falhou: diff --git a/lib/rd.h b/lib/rd.h index 57286752..edcca898 100644 --- a/lib/rd.h +++ b/lib/rd.h @@ -420,9 +420,9 @@ /* * Cue Editor Colors */ -#define RD_CUEEDITOR_KNOB_COLOR blue -#define RD_CUEEDITOR_PLAY_MARKER black -#define RD_CUEEDITOR_START_MARKER red +#define RD_CUEEDITOR_KNOB_COLOR Qt::blue +#define RD_CUEEDITOR_PLAY_MARKER Qt::black +#define RD_CUEEDITOR_START_MARKER Qt::red #define RD_CUEEDITOR_BUTTON_FLASH_PERIOD 200 #define RD_CUEEDITOR_AUDITION_PREROLL 5000 diff --git a/lib/rdadd_cart.cpp b/lib/rdadd_cart.cpp index d87261d4..cc04cf2e 100644 --- a/lib/rdadd_cart.cpp +++ b/lib/rdadd_cart.cpp @@ -23,14 +23,16 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -77,7 +79,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title, new QLabel(cart_group_box,tr("&Group:"),this, "cart_group_label"); cart_group_label->setGeometry(10,11,130,19); - cart_group_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cart_group_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); cart_group_label->setFont(label_font); sql=QString("select GROUP_NAME from USER_PERMS where ")+ "USER_NAME=\""+RDEscapeString(username)+"\" order by GROUP_NAME"; @@ -106,7 +108,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title, "cart_number_label"); cart_number_label->setGeometry(10,32,130,19); cart_number_label->setFont(label_font); - cart_number_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cart_number_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart Type @@ -118,7 +120,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title, "cart_type_label"); cart_type_label->setGeometry(10,53,130,19); cart_type_label->setFont(label_font); - cart_type_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cart_type_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); if((*cart_type==RDCart::All)||(*cart_type==RDCart::Audio)) { cart_type_box->insertItem(tr("Audio")); } @@ -148,7 +150,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title, "cart_title_label"); cart_title_label->setGeometry(10,73,130,19); cart_title_label->setFont(label_font); - cart_title_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cart_title_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/lib/rdadd_cart.h b/lib/rdadd_cart.h index 60730289..0bd9005f 100644 --- a/lib/rdadd_cart.h +++ b/lib/rdadd_cart.h @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/lib/rdadd_log.cpp b/lib/rdadd_log.cpp index f10b297f..91590c10 100644 --- a/lib/rdadd_log.cpp +++ b/lib/rdadd_log.cpp @@ -21,6 +21,9 @@ #include #include +//Added by qt3to4: +#include +#include #include "rdapplication.h" #include "rddb.h" @@ -71,7 +74,7 @@ RDAddLog::RDAddLog(QString *logname,QString *svcname, QLabel *label=new QLabel(add_name_edit,tr("&New Log Name:"),this); label->setGeometry(10,13,100,19); label->setFont(button_font); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); connect(add_name_edit,SIGNAL(textChanged(const QString &)), this,SLOT(nameChangedData(const QString &))); @@ -83,7 +86,7 @@ RDAddLog::RDAddLog(QString *logname,QString *svcname, label=new QLabel(add_name_edit,tr("&Service:"),this); label->setGeometry(10,33,100,19); label->setFont(button_font); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); // // Ok Button diff --git a/lib/rdadd_log.h b/lib/rdadd_log.h index fdca7f13..62dc22bc 100644 --- a/lib/rdadd_log.h +++ b/lib/rdadd_log.h @@ -28,6 +28,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/lib/rdapplication.cpp b/lib/rdapplication.cpp index de0e12ea..5e1fc636 100644 --- a/lib/rdapplication.cpp +++ b/lib/rdapplication.cpp @@ -95,7 +95,7 @@ RDApplication::~RDApplication() bool RDApplication::open(QString *err_msg) { - unsigned schema=0; + int schema=0; QString db_err; bool skip_db_check=false; @@ -121,8 +121,7 @@ bool RDApplication::open(QString *err_msg) // // Open Database // - QSqlDatabase *db=RDInitDb(&schema,&db_err); - if(!db) { + if(!RDOpenDb(&schema,&db_err,app_config)) { *err_msg=QObject::tr("Unable to open database")+" ["+db_err+"]"; return false; } diff --git a/lib/rdaudioconvert.cpp b/lib/rdaudioconvert.cpp index d7f185cf..437d62c8 100644 --- a/lib/rdaudioconvert.cpp +++ b/lib/rdaudioconvert.cpp @@ -1878,54 +1878,54 @@ void RDAudioConvert::ApplyId3Tag(const QString &filename,RDWaveData *wavedata) { ID3_Tag *tag=new ID3_Tag(filename); ID3_Frame *frame=new ID3_Frame(ID3FID_TITLE); - frame->GetField(ID3FN_TEXT)->Set(wavedata->title()); + frame->GetField(ID3FN_TEXT)->Set((const char *)wavedata->title().toUtf8()); tag->AddNewFrame(frame); if(wavedata->beatsPerMinute()>0) { frame=new ID3_Frame(ID3FID_BPM); frame->GetField(ID3FN_TEXT)-> - Set(QString().sprintf("%d",wavedata->beatsPerMinute())); + Set((const char *)QString().sprintf("%d",wavedata->beatsPerMinute()).toUtf8()); tag->AddNewFrame(frame); } if(!wavedata->album().isEmpty()) { frame=new ID3_Frame(ID3FID_ALBUM); - frame->GetField(ID3FN_TEXT)->Set(wavedata->album()); + frame->GetField(ID3FN_TEXT)->Set((const char *)wavedata->album().toUtf8()); tag->AddNewFrame(frame); } if(!wavedata->composer().isEmpty()) { frame=new ID3_Frame(ID3FID_COMPOSER); - frame->GetField(ID3FN_TEXT)->Set(wavedata->composer()); + frame->GetField(ID3FN_TEXT)->Set((const char *)wavedata->composer().toUtf8()); tag->AddNewFrame(frame); } if(!wavedata->copyrightNotice().isEmpty()) { frame=new ID3_Frame(ID3FID_COPYRIGHT); - frame->GetField(ID3FN_TEXT)->Set(wavedata->copyrightNotice()); + frame->GetField(ID3FN_TEXT)->Set((const char *)wavedata->copyrightNotice().toUtf8()); tag->AddNewFrame(frame); } if(!wavedata->artist().isEmpty()) { frame=new ID3_Frame(ID3FID_LEADARTIST); - frame->GetField(ID3FN_TEXT)->Set(wavedata->artist()); + frame->GetField(ID3FN_TEXT)->Set((const char *)wavedata->artist().toUtf8()); tag->AddNewFrame(frame); } if(!wavedata->publisher().isEmpty()) { frame=new ID3_Frame(ID3FID_PUBLISHER); - frame->GetField(ID3FN_TEXT)->Set(wavedata->publisher()); + frame->GetField(ID3FN_TEXT)->Set((const char *)wavedata->publisher().toUtf8()); tag->AddNewFrame(frame); } if(!wavedata->conductor().isEmpty()) { frame=new ID3_Frame(ID3FID_CONDUCTOR); - frame->GetField(ID3FN_TEXT)->Set(wavedata->conductor()); + frame->GetField(ID3FN_TEXT)->Set((const char *)wavedata->conductor().toUtf8()); tag->AddNewFrame(frame); } if(!wavedata->isrc().isEmpty()) { frame=new ID3_Frame(ID3FID_ISRC); - frame->GetField(ID3FN_TEXT)->Set(wavedata->isrc()); + frame->GetField(ID3FN_TEXT)->Set((const char *)wavedata->isrc().toUtf8()); tag->AddNewFrame(frame); } if(wavedata->releaseYear()>0) { frame=new ID3_Frame(ID3FID_YEAR); frame->GetField(ID3FN_TEXT)-> - Set(QString().sprintf("%d",wavedata->releaseYear())); + Set((const char *)QString().sprintf("%d",wavedata->releaseYear()).toUtf8()); tag->AddNewFrame(frame); } RDCart *cart=new RDCart(wavedata->cartNumber()); @@ -1935,7 +1935,7 @@ void RDAudioConvert::ApplyId3Tag(const QString &filename,RDWaveData *wavedata) frame=new ID3_Frame(ID3FID_USERTEXT); frame->GetField(ID3FN_DESCRIPTION)->Set("rdxl"); frame->GetField(ID3FN_TEXTENC)->Set(ID3TE_NONE); - frame->GetField(ID3FN_TEXT)->Set(xml); + frame->GetField(ID3FN_TEXT)->Set((const char *)xml.toUtf8()); tag->AddNewFrame(frame); delete cart; } diff --git a/lib/rdaudioinfo.cpp b/lib/rdaudioinfo.cpp index 4b48b29d..3b738672 100644 --- a/lib/rdaudioinfo.cpp +++ b/lib/rdaudioinfo.cpp @@ -251,7 +251,7 @@ int RDAudioInfo::ParseInt(const QString &tag,const QString &xml) // a proper XML parser. // QStringList list=list.split("\n",xml); - for(unsigned i=0;i=2) { diff --git a/lib/rdaudiosettings_dialog.cpp b/lib/rdaudiosettings_dialog.cpp index 54bb4607..0f37841f 100644 --- a/lib/rdaudiosettings_dialog.cpp +++ b/lib/rdaudiosettings_dialog.cpp @@ -21,13 +21,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -72,7 +72,7 @@ RDAudioSettingsDialog::RDAudioSettingsDialog(RDAudioSettings *settings, this,"lib_format_label"); lib_format_label->setGeometry(25,10,120,20); lib_format_label->setFont(font); - lib_format_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_format_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Default Channels @@ -85,7 +85,7 @@ RDAudioSettingsDialog::RDAudioSettingsDialog(RDAudioSettings *settings, this,"lib_channels_label"); lib_channels_label->setGeometry(25,32,120,20); lib_channels_label->setFont(font); - lib_channels_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Default Sample Rate @@ -98,7 +98,7 @@ RDAudioSettingsDialog::RDAudioSettingsDialog(RDAudioSettings *settings, "lib_samprate_label"); lib_samprate_label->setGeometry(20,54,125,20); lib_samprate_label->setFont(font); - lib_samprate_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_samprate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Default Bitrate @@ -111,7 +111,7 @@ RDAudioSettingsDialog::RDAudioSettingsDialog(RDAudioSettings *settings, "lib_bitrate_label"); lib_bitrate_label->setGeometry(25,76,120,20); lib_bitrate_label->setFont(font); - lib_bitrate_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/lib/rdaudiostore.cpp b/lib/rdaudiostore.cpp index 50df775a..7e39cb19 100644 --- a/lib/rdaudiostore.cpp +++ b/lib/rdaudiostore.cpp @@ -199,7 +199,7 @@ uint64_t RDAudioStore::ParseInt(const QString &tag,const QString &xml) // a proper XML parser. // QStringList list=list.split("\n",xml); - for(unsigned i=0;i=2) { diff --git a/lib/rdbusybar.cpp b/lib/rdbusybar.cpp index 1a078e5c..f4a4bc51 100644 --- a/lib/rdbusybar.cpp +++ b/lib/rdbusybar.cpp @@ -19,12 +19,15 @@ // #include +//Added by qt3to4: +#include +#include -RDBusyBar::RDBusyBar(QWidget *parent,WFlags f) - : QFrame(parent,"",f) +RDBusyBar::RDBusyBar(QWidget *parent,Qt::WFlags f) + : Q3Frame(parent,"",f) { bar_pos=0; - setFrameStyle(QFrame::StyledPanel|QFrame::Sunken); + setFrameStyle(Q3Frame::StyledPanel|Q3Frame::Sunken); QPalette p=palette(); p.setColor(QPalette::Active,QColorGroup::Background, p.color(QPalette::Active,QColorGroup::Base)); diff --git a/lib/rdbusybar.h b/lib/rdbusybar.h index acb41d84..b6a1a483 100644 --- a/lib/rdbusybar.h +++ b/lib/rdbusybar.h @@ -23,16 +23,16 @@ #define RDBUSYBAR_H #include -#include +#include #include #include -class RDBusyBar : public QFrame +class RDBusyBar : public Q3Frame { Q_OBJECT public: - RDBusyBar(QWidget *parent=0,WFlags f=0); + RDBusyBar(QWidget *parent=0,Qt::WFlags f=0); public slots: void activate(bool state); diff --git a/lib/rdbusydialog.cpp b/lib/rdbusydialog.cpp index ea0932d8..390a0574 100644 --- a/lib/rdbusydialog.cpp +++ b/lib/rdbusydialog.cpp @@ -20,8 +20,11 @@ // #include +//Added by qt3to4: +#include +#include -RDBusyDialog::RDBusyDialog(QWidget *parent,WFlags f) +RDBusyDialog::RDBusyDialog(QWidget *parent,Qt::WFlags f) : QDialog(parent,"",true,f) { QFont font("helvetica",16,QFont::Bold); diff --git a/lib/rdbusydialog.h b/lib/rdbusydialog.h index ffbfe34a..be63da6c 100644 --- a/lib/rdbusydialog.h +++ b/lib/rdbusydialog.h @@ -23,6 +23,8 @@ #include #include +//Added by qt3to4: +#include #include @@ -30,7 +32,7 @@ class RDBusyDialog : public QDialog { Q_OBJECT; public: - RDBusyDialog(QWidget *parent=0,WFlags f=0); + RDBusyDialog(QWidget *parent=0,Qt::WFlags f=0); ~RDBusyDialog(); QSize sizeHint() const; void show(const QString &caption,const QString &label); diff --git a/lib/rdbutton_dialog.cpp b/lib/rdbutton_dialog.cpp index 2ec9de87..31053384 100644 --- a/lib/rdbutton_dialog.cpp +++ b/lib/rdbutton_dialog.cpp @@ -70,7 +70,7 @@ RDButtonDialog::RDButtonDialog(QString station_name, this,"edit_label_label"); label->setGeometry(10,12,45,16); label->setFont(label_font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); // // Button Cart @@ -82,7 +82,7 @@ RDButtonDialog::RDButtonDialog(QString station_name, label=new QLabel(edit_cart_edit,tr("Cart:"),this,"edit_cart_label"); label->setGeometry(10,36,45,16); label->setFont(label_font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); // // Set Cart Button diff --git a/lib/rdcae.cpp b/lib/rdcae.cpp index 3bc9e46e..66ee8a49 100644 --- a/lib/rdcae.cpp +++ b/lib/rdcae.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -47,13 +47,13 @@ RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent) // // TCP Connection // - cae_socket=new QSocketDevice(QSocketDevice::Stream); + cae_socket=new Q3SocketDevice(Q3SocketDevice::Stream); cae_socket->setBlocking(false); // // Meter Connection // - cae_meter_socket=new QSocketDevice(QSocketDevice::Datagram); + cae_meter_socket=new Q3SocketDevice(Q3SocketDevice::Datagram); cae_meter_socket->setBlocking(false); for(Q_INT16 i=30000;i<30100;i++) { if(cae_meter_socket->bind(QHostAddress(),i)) { diff --git a/lib/rdcae.h b/lib/rdcae.h index 47a7990b..4bf52f2d 100644 --- a/lib/rdcae.h +++ b/lib/rdcae.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -107,7 +107,7 @@ class RDCae : public QObject int StreamNumber(const char *arg); int GetHandle(const char *arg); void UpdateMeters(); - QSocketDevice *cae_socket; + Q3SocketDevice *cae_socket; bool debug; char args[CAE_MAX_ARGS][CAE_MAX_LENGTH]; int argnum; @@ -116,7 +116,7 @@ class RDCae : public QObject bool input_status[RD_MAX_CARDS][RD_MAX_PORTS]; int cae_handle[RD_MAX_CARDS][RD_MAX_STREAMS]; unsigned cae_pos[RD_MAX_CARDS][RD_MAX_STREAMS]; - QSocketDevice *cae_meter_socket; + Q3SocketDevice *cae_meter_socket; short cae_input_levels[RD_MAX_CARDS][RD_MAX_PORTS][2]; short cae_output_levels[RD_MAX_CARDS][RD_MAX_PORTS][2]; short cae_stream_output_levels[RD_MAX_CARDS][RD_MAX_PORTS][2]; diff --git a/lib/rdcardselector.cpp b/lib/rdcardselector.cpp index fe4214a0..b2d6fb9b 100644 --- a/lib/rdcardselector.cpp +++ b/lib/rdcardselector.cpp @@ -25,12 +25,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include @@ -58,7 +58,7 @@ RDCardSelector::RDCardSelector(QWidget *parent) card_title=new QLabel(this,"card_title"); card_title->setGeometry(0,0,geometry().width(),19); card_title->setFont(QFont("Helvetica",12,QFont::Bold)); - card_title->setAlignment(AlignHCenter); + card_title->setAlignment(Qt::AlignHCenter); card_title->hide(); // @@ -74,7 +74,7 @@ RDCardSelector::RDCardSelector(QWidget *parent) card_card_label=new QLabel(card_card_box,tr("Card:"),this, "card_card_label"); card_card_label->setGeometry(0,yoffset+2,55,19); - card_card_label->setAlignment(AlignRight|ShowPrefix); + card_card_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Port @@ -89,7 +89,7 @@ RDCardSelector::RDCardSelector(QWidget *parent) card_port_label=new QLabel(card_port_box,tr("Port:"),this, "card_port_label"); card_port_label->setGeometry(0,yoffset+24,55,19); - card_port_label->setAlignment(AlignRight|ShowPrefix); + card_port_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); for(int i=0;i *data,const QString &xml) RDSettings *settings=NULL; QStringList f0=f0.split("\n",xml); - for(unsigned i=0;i") { diff --git a/lib/rdcart_dialog.cpp b/lib/rdcart_dialog.cpp index 0686e5ce..8c6e19a4 100644 --- a/lib/rdcart_dialog.cpp +++ b/lib/rdcart_dialog.cpp @@ -27,8 +27,12 @@ #include #include #include -#include +#include #include +//Added by qt3to4: +#include +#include +#include #include #ifndef WIN32 @@ -111,12 +115,12 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode, // Progress Dialog // cart_progress_dialog= - new QProgressDialog(tr("Please Wait..."),"Cancel",10,this, + new Q3ProgressDialog(tr("Please Wait..."),"Cancel",10,this, "cart_progress_dialog",false, Qt::WStyle_Customize|Qt::WStyle_NormalBorder); cart_progress_dialog->setCaption(" "); QLabel *label=new QLabel(tr("Please Wait..."),cart_progress_dialog); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label->setFont(progress_font); cart_progress_dialog->setLabel(label); cart_progress_dialog->setCancelButton(NULL); @@ -130,7 +134,7 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode, cart_filter_edit=new QLineEdit(this); cart_filter_edit->setValidator(validator); cart_filter_label=new QLabel(cart_filter_edit,tr("Cart Filter:"),this); - cart_filter_label->setAlignment(AlignRight|AlignVCenter); + cart_filter_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); cart_filter_label->setFont(button_font); connect(cart_filter_edit,SIGNAL(textChanged(const QString &)), this,SLOT(filterChangedData(const QString &))); @@ -156,7 +160,7 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode, // cart_group_box=new RDComboBox(this); cart_group_label=new QLabel(cart_group_box,tr("Group:"),this); - cart_group_label->setAlignment(AlignRight|AlignVCenter); + cart_group_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); cart_group_label->setFont(button_font); connect(cart_group_box,SIGNAL(activated(const QString &)), this,SLOT(groupActivatedData(const QString &))); @@ -167,7 +171,7 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode, cart_schedcode_box=new RDComboBox(this); cart_schedcode_label= new QLabel(cart_schedcode_box,tr("Scheduler Code:"),this); - cart_schedcode_label->setAlignment(AlignRight|AlignVCenter); + cart_schedcode_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); cart_schedcode_label->setFont(button_font); connect(cart_schedcode_box,SIGNAL(activated(const QString &)), this,SLOT(schedcodeActivatedData(const QString &))); @@ -181,7 +185,7 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode, new QLabel(cart_limit_box,tr("Show Only First")+ QString().sprintf(" %d ", RD_LIMITED_CART_SEARCH_QUANTITY)+tr("Matches"),this); - cart_limit_label->setAlignment(AlignLeft|AlignVCenter); + cart_limit_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); cart_limit_label->setFont(button_font); connect(cart_limit_box,SIGNAL(stateChanged(int)), this,SLOT(limitChangedData(int))); @@ -190,15 +194,15 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode, // Cart List // cart_cart_list=new RDListView(this); - cart_cart_list->setSelectionMode(QListView::Single); + cart_cart_list->setSelectionMode(Q3ListView::Single); cart_cart_list->setAllColumnsShowFocus(true); cart_cart_list->setItemMargin(5); - connect(cart_cart_list,SIGNAL(clicked(QListViewItem *)), - this,SLOT(clickedData(QListViewItem *))); + connect(cart_cart_list,SIGNAL(clicked(Q3ListViewItem *)), + this,SLOT(clickedData(Q3ListViewItem *))); connect(cart_cart_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); cart_cart_label=new QLabel(cart_cart_list,"Carts",this); cart_cart_label->setFont(button_font); cart_cart_list->addColumn(""); @@ -213,7 +217,7 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode, cart_cart_list->addColumn(tr("TITLE"),200); cart_cart_list->setColumnAlignment(3,Qt::AlignLeft); - cart_cart_list->setColumnWidthMode(3,QListView::Manual); + cart_cart_list->setColumnWidthMode(3,Q3ListView::Manual); cart_cart_list->addColumn(tr("ARTIST")); cart_cart_list->setColumnAlignment(4,Qt::AlignLeft); @@ -255,7 +259,7 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode, rda->station()->cueStartCart(),rda->station()->cueStopCart(),this); cart_player->playButton()->setDisabled(true); cart_player->stopButton()->setDisabled(true); - cart_player->stopButton()->setOnColor(red); + cart_player->stopButton()->setOnColor(Qt::red); } #endif // WIN32 @@ -461,7 +465,7 @@ void RDCartDialog::limitChangedData(int state) } -void RDCartDialog::clickedData(QListViewItem *item) +void RDCartDialog::clickedData(Q3ListViewItem *item) { RDListViewItem *i=(RDListViewItem *)item; if (i==NULL) { @@ -480,7 +484,7 @@ void RDCartDialog::clickedData(QListViewItem *item) } -void RDCartDialog::doubleClickedData(QListViewItem *,const QPoint &,int) +void RDCartDialog::doubleClickedData(Q3ListViewItem *,const QPoint &,int) { okData(); } @@ -551,7 +555,7 @@ void RDCartDialog::loadFileData() RDWaveData wavedata; QString err_msg; - filename=QFileDialog::getOpenFileName(cart_import_path, + filename=Q3FileDialog::getOpenFileName(cart_import_path, cart_import_file_filter,this); if(!filename.isEmpty()) { cart_import_path=RDGetPathPart(filename); @@ -804,7 +808,7 @@ void RDCartDialog::RefreshCarts() if(count++>RDCART_DIALOG_STEP_SIZE) { cart_progress_dialog->setProgress(++step); count=0; - qApp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput); + QApplication::processEvents(QEventLoop::ExcludeUserInputEvents); } } cart_progress_dialog->reset(); diff --git a/lib/rdcart_dialog.h b/lib/rdcart_dialog.h index 043d835d..8a10e3b5 100644 --- a/lib/rdcart_dialog.h +++ b/lib/rdcart_dialog.h @@ -25,8 +25,12 @@ #include #include #include -#include +#include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -58,8 +62,8 @@ class RDCartDialog : public QDialog void groupActivatedData(const QString &group); void schedcodeActivatedData(const QString &schedcode); void limitChangedData(int state); - void clickedData(QListViewItem *item); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void clickedData(Q3ListViewItem *item); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void editorData(); void loadFileData(); void okData(); @@ -104,7 +108,7 @@ class RDCartDialog : public QDialog QString *cart_service; int cart_service_quan; RDStation::FilterMode cart_filter_mode; - QProgressDialog *cart_progress_dialog; + Q3ProgressDialog *cart_progress_dialog; QString cart_import_path; QString cart_import_file_filter; bool *cart_temp_allowed; diff --git a/lib/rdcartdrag.cpp b/lib/rdcartdrag.cpp index 12f9b156..cb285a0a 100644 --- a/lib/rdcartdrag.cpp +++ b/lib/rdcartdrag.cpp @@ -21,6 +21,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -35,7 +37,7 @@ #include "../icons/trashcan-16x16.xpm" RDCartDrag::RDCartDrag(unsigned cartnum,const QPixmap *icon,QWidget *src) - : QStoredDrag(RDMIMETYPE_CART,src) + : Q3StoredDrag(RDMIMETYPE_CART,src) { SetData(cartnum,QColor(),QString()); if(icon==NULL) { @@ -62,7 +64,7 @@ RDCartDrag::RDCartDrag(unsigned cartnum,const QPixmap *icon,QWidget *src) RDCartDrag::RDCartDrag(unsigned cartnum,const QString &title, const QColor &color,QWidget *src) - : QStoredDrag(RDMIMETYPE_CART,src) + : Q3StoredDrag(RDMIMETYPE_CART,src) { SetData(cartnum,color,title); if(cartnum==0) { diff --git a/lib/rdcartdrag.h b/lib/rdcartdrag.h index fbb9ac39..83a30019 100644 --- a/lib/rdcartdrag.h +++ b/lib/rdcartdrag.h @@ -22,13 +22,13 @@ #define RDCARTDRAG_H #include -#include +#include #include #include #include -class RDCartDrag : public QStoredDrag +class RDCartDrag : public Q3StoredDrag { public: RDCartDrag(unsigned cartnum,const QPixmap *icon,QWidget *src=0); diff --git a/lib/rdcatch_connect.cpp b/lib/rdcatch_connect.cpp index b6855fb2..949233d6 100644 --- a/lib/rdcatch_connect.cpp +++ b/lib/rdcatch_connect.cpp @@ -40,7 +40,7 @@ RDCatchConnect::RDCatchConnect(int serial,QObject *parent) // // TCP Connection // - cc_socket=new QSocket(this,"cc_socket"); + cc_socket=new Q3Socket(this,"cc_socket"); connect(cc_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(cc_socket,SIGNAL(readyRead()),this,SLOT(readyData())); diff --git a/lib/rdcatch_connect.h b/lib/rdcatch_connect.h index 74678c54..ea2349a6 100644 --- a/lib/rdcatch_connect.h +++ b/lib/rdcatch_connect.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -80,7 +80,7 @@ class RDCatchConnect : public QObject private: void SendCommand(QString cmd); void DispatchCommand(); - QSocket *cc_socket; + Q3Socket *cc_socket; QString cc_password; bool debug; char args[CC_MAX_ARGS][CC_MAX_LENGTH]; diff --git a/lib/rdcddblookup.cpp b/lib/rdcddblookup.cpp index cdf983ff..487ef5cd 100644 --- a/lib/rdcddblookup.cpp +++ b/lib/rdcddblookup.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -49,7 +49,7 @@ RDCddbLookup::RDCddbLookup(FILE *profile_msgs,QObject *parent) // // Socket // - lookup_socket=new QSocket(this,"lookup_socket"); + lookup_socket=new Q3Socket(this,"lookup_socket"); connect(lookup_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); connect(lookup_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); } @@ -252,13 +252,13 @@ void RDCddbLookup::readyReadData() void RDCddbLookup::errorData(int err) { switch(err) { - case QSocket::ErrConnectionRefused: + case Q3Socket::ErrConnectionRefused: printf("CDDB: Connection Refused!\n"); break; - case QSocket::ErrHostNotFound: + case Q3Socket::ErrHostNotFound: printf("CDDB: Host Not Found!\n"); break; - case QSocket::ErrSocketRead: + case Q3Socket::ErrSocketRead: printf("CDDB: Socket Read Error!\n"); break; } @@ -282,7 +282,7 @@ QString RDCddbLookup::DecodeString(QString &str) QString outstr; QChar ch; - for(unsigned i=0;ilength();i++) { + for(int i=0;ilength();i++) { if(line->at(i)=='=') { *tag=line->left(i); *value=line->right(line->length()-i-1); @@ -314,7 +314,7 @@ int RDCddbLookup::GetIndex(QString *tag) { int index; - for(unsigned i=0;ilength();i++) { + for(int i=0;ilength();i++) { if(tag->at(i).isDigit()) { index=tag->right(tag->length()-i).toInt(); *tag=tag->left(i); @@ -336,7 +336,7 @@ bool RDCddbLookup::ReadCdText(const QString &cdda_dir,const QString &cdda_dev) // Write the Track Title Data to a Temp File // QByteArray output; - QProcess *proc=new QProcess(this); + Q3Process *proc=new Q3Process(this); proc->addArgument("cdda2wav"); proc->addArgument("-D"); proc->addArgument(cdda_dev); diff --git a/lib/rdcddblookup.h b/lib/rdcddblookup.h index 42baa03f..a366e897 100644 --- a/lib/rdcddblookup.h +++ b/lib/rdcddblookup.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include // @@ -77,7 +77,7 @@ class RDCddbLookup : public QObject void SendToServer(const QString &msg); void Profile(const QString &msg); RDCddbRecord *lookup_record; - QSocket *lookup_socket; + Q3Socket *lookup_socket; int lookup_state; QString lookup_username; QString lookup_appname; diff --git a/lib/rdcmd_switch.cpp b/lib/rdcmd_switch.cpp index c454c1bc..5490089a 100644 --- a/lib/rdcmd_switch.cpp +++ b/lib/rdcmd_switch.cpp @@ -18,6 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#include #ifndef WIN32 #include #endif // WIN32 @@ -49,7 +50,7 @@ RDCmdSwitch::RDCmdSwitch(int argc,char *argv[],const char *modname, QStringList f0=f0.split("=",value,true); if(f0.size()>=2) { switch_keys.push_back(f0[0]); - for(unsigned i=2;i +//Added by qt3to4: +#include +#include RDComboBox::RDComboBox(QWidget *parent) diff --git a/lib/rdcombobox.h b/lib/rdcombobox.h index 707edac7..6e51ea9c 100644 --- a/lib/rdcombobox.h +++ b/lib/rdcombobox.h @@ -24,6 +24,9 @@ #include #include +//Added by qt3to4: +#include +#include class RDComboBox : public QComboBox { diff --git a/lib/rdconf.cpp b/lib/rdconf.cpp index 65a039d2..8f54e066 100644 --- a/lib/rdconf.cpp +++ b/lib/rdconf.cpp @@ -500,7 +500,7 @@ QString RDGetDisplay(bool strip_point) int l; if(getenv("DISPLAY")[0]==':') { - display=RDGetHostAddr().toString()+getenv("DISPLAY"); + display=RDGetHostAddr().toString()+QString(getenv("DISPLAY")); } else { display=QString(getenv("DISPLAY")); @@ -526,7 +526,7 @@ bool RDDoesRowExist(const QString &table,const QString &name, sql="select `"+name+"` from `"+table+"` where `"+name+"`="+ "\""+RDEscapeString(test)+"\""; - q=new RDSqlQuery(sql,db); + q=new RDSqlQuery(sql); if(q->first()) { delete q; return true; @@ -544,7 +544,7 @@ bool RDDoesRowExist(const QString &table,const QString &name,unsigned test, sql="select `"+name+"` from `"+table+"` where `"+name+"`="+ QString().sprintf("%d",test); - q=new RDSqlQuery(sql,db); + q=new RDSqlQuery(sql); if(q->size()>0) { delete q; return true; @@ -556,7 +556,7 @@ bool RDDoesRowExist(const QString &table,const QString &name,unsigned test, QVariant RDGetSqlValue(const QString &table,const QString &name, const QString &test,const QString ¶m, - QSqlDatabase *db,bool *valid) + bool *valid) { RDSqlQuery *q; QString sql; @@ -564,7 +564,7 @@ QVariant RDGetSqlValue(const QString &table,const QString &name, sql="select `"+param+"` from `"+table+"` where `"+name+"`="+ "\""+RDEscapeString(test)+"\""; - q=new RDSqlQuery(sql,db); + q=new RDSqlQuery(sql); if(q->isActive()) { q->first(); v=q->value(0); @@ -583,7 +583,7 @@ QVariant RDGetSqlValue(const QString &table, const QString &name1,const QString &test1, const QString &name2,const QString &test2, const QString &name3,const QString &test3, - const QString ¶m,QSqlDatabase *db,bool *valid) + const QString ¶m,bool *valid) { RDSqlQuery *q; QString sql; @@ -593,7 +593,7 @@ QVariant RDGetSqlValue(const QString &table, "(`"+name1+"`=\""+RDEscapeString(test1)+"\")&&"+ "(`"+name2+"`=\""+RDEscapeString(test1)+"\")&&"+ "(`"+name3+"`=\""+RDEscapeString(test1)+"\")"; - q=new RDSqlQuery(sql,db); + q=new RDSqlQuery(sql); if(q->isActive()) { q->first(); v=q->value(0); @@ -616,7 +616,7 @@ bool RDIsSqlNull(const QString &table,const QString &name,const QString &test, sql="select `"+param+"` from `"+table+"` where `"+name+"`="+ "\""+RDEscapeString(test)+"\""; - q=new RDSqlQuery(sql,db); + q=new RDSqlQuery(sql); if(q->isActive()) { q->first(); if(q->isNull(0)) { @@ -641,7 +641,7 @@ bool RDIsSqlNull(const QString &table,const QString &name,unsigned test, sql="select `"+param+"` from `"+table+"` where `"+name+"`="+ QString().sprintf("%d",test); - q=new RDSqlQuery(sql,db); + q=new RDSqlQuery(sql); if(q->isActive()) { q->first(); if(q->isNull(0)) { @@ -659,7 +659,7 @@ bool RDIsSqlNull(const QString &table,const QString &name,unsigned test, QVariant RDGetSqlValue(const QString &table,const QString &name,unsigned test, - const QString ¶m,QSqlDatabase *db,bool *valid) + const QString ¶m,bool *valid) { RDSqlQuery *q; QString sql; @@ -667,7 +667,7 @@ QVariant RDGetSqlValue(const QString &table,const QString &name,unsigned test, sql="select `"+param+"` from `"+table+"` where `"+name+"`="+ QString().sprintf("%u",test); - q=new RDSqlQuery(sql,db); + q=new RDSqlQuery(sql); if(q->first()) { v=q->value(0); if(valid!=NULL) { @@ -737,7 +737,7 @@ int RDSetTimeLength(const QString &str) if(str.isEmpty()) { return -1; } - for(unsigned i=0;isetFilter(QDir::Dirs); dirs=proc_dir->entryList(); - for(unsigned i=0;i #include #include -#include +#include /* Function Prototypes */ int GetPrivateProfileBool(const char *,const char *,const char *,bool); @@ -72,14 +72,14 @@ bool RDDoesRowExist(const QString &table,const QString &name,unsigned test, QSqlDatabase *db=0); QVariant RDGetSqlValue(const QString &table,const QString &name, const QString &test,const QString ¶m, - QSqlDatabase *db=0,bool *valid=0); + bool *valid=0); QVariant RDGetSqlValue(const QString &table,const QString &name,unsigned test, - const QString ¶m,QSqlDatabase *db=0,bool *valid=0); + const QString ¶m,bool *valid=0); QVariant RDGetSqlValue(const QString &table, const QString &name1,const QString &test1, const QString &name2,const QString &test2, const QString &name3,const QString &test3, - const QString ¶m,QSqlDatabase *db=0,bool *valid=0); + const QString ¶m,bool *valid=0); bool RDIsSqlNull(const QString &table,const QString &name, const QString &test,const QString ¶m,QSqlDatabase *db=0); bool RDIsSqlNull(const QString &table,const QString &name,unsigned test, @@ -110,6 +110,6 @@ QColor RDGetTextColor(const QColor &background_color); bool RDProcessActive(const QString &cmd); bool RDProcessActive(const QStringList &cmds); bool RDModulesActive(); -QByteArray RDStringToData(const QString &str); +//QByteArray RDStringToData(const QString &str); #endif // RDCONF_H diff --git a/lib/rdconfig.cpp b/lib/rdconfig.cpp index 9ea72373..3ddc7709 100644 --- a/lib/rdconfig.cpp +++ b/lib/rdconfig.cpp @@ -29,6 +29,7 @@ #include #endif // WIN32 +#include #include #include #include @@ -302,7 +303,7 @@ QString RDConfig::provisioningHostShortName(const QString &hostname) const exp.search(hostname); QStringList texts=exp.capturedTexts(); - if(texts.size() #include +//Added by qt3to4: +#include +#include +#include +#include +#include #include #include @@ -60,25 +66,25 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent) edit_position_label=new QLabel(this); edit_position_label->setGeometry(0,0,sizeHint().width()-30,30); - edit_position_label->setBackgroundColor(QColor(white)); + edit_position_label->setBackgroundColor(QColor(Qt::white)); edit_position_label->setLineWidth(1); edit_position_label->setMidLineWidth(0); - edit_position_label->setFrameStyle(QFrame::Box|QFrame::Plain); + edit_position_label->setFrameStyle(Q3Frame::Box|Q3Frame::Plain); edit_position_bar=new RDMarkerBar(this); edit_position_bar->setGeometry(85,8,sizeHint().width()-200,14); edit_up_label=new QLabel("00:00:00",this); edit_up_label->setGeometry(5,8,70,14); - edit_up_label->setBackgroundColor(white); + edit_up_label->setBackgroundColor(Qt::white); edit_up_label->setFont(label_font); - edit_up_label->setAlignment(AlignRight|AlignVCenter); + edit_up_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_down_label=new QLabel("00:00:00",this); edit_down_label->setGeometry(sizeHint().width()-110,8,70,14); - edit_down_label->setBackgroundColor(white); + edit_down_label->setBackgroundColor(Qt::white); edit_down_label->setFont(label_font); - edit_down_label->setAlignment(AlignRight|AlignVCenter); + edit_down_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Position Slider @@ -98,10 +104,10 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent) // QLabel *label=new QLabel(this); label->setGeometry(0,85,sizeHint().width()-30,60); - label->setBackgroundColor(QColor(gray)); + label->setBackgroundColor(QColor(Qt::gray)); label->setLineWidth(1); label->setMidLineWidth(0); - label->setFrameStyle(QFrame::Box|QFrame::Plain); + label->setFrameStyle(Q3Frame::Box|Q3Frame::Plain); // // Audition Button @@ -110,7 +116,7 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent) new RDTransportButton(RDTransportButton::PlayBetween,this); edit_audition_button->setGeometry(sizeHint().width()/2-130,90,80,50); edit_audition_button-> - setPalette(QPalette(backgroundColor(),QColor(gray))); + setPalette(QPalette(backgroundColor(),QColor(Qt::gray))); edit_audition_button->setFont(button_font); edit_audition_button->setText(tr("&Audition")); connect(edit_audition_button,SIGNAL(clicked()), @@ -122,7 +128,7 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent) edit_pause_button=new RDTransportButton(RDTransportButton::Pause,this); edit_pause_button->setGeometry(sizeHint().width()/2-40,90,80,50); edit_pause_button-> - setPalette(QPalette(backgroundColor(),QColor(gray))); + setPalette(QPalette(backgroundColor(),QColor(Qt::gray))); edit_pause_button->setFont(button_font); edit_pause_button->setText(tr("&Pause")); connect(edit_pause_button,SIGNAL(clicked()),this,SLOT(pauseButtonData())); @@ -132,9 +138,9 @@ RDCueEdit::RDCueEdit(RDCae *cae,int card,int port,QWidget *parent) // edit_stop_button=new RDTransportButton(RDTransportButton::Stop,this); edit_stop_button->setGeometry(sizeHint().width()/2+50,90,80,50); - edit_stop_button->setOnColor(QColor(red)); + edit_stop_button->setOnColor(QColor(Qt::red)); edit_stop_button-> - setPalette(QPalette(backgroundColor(),QColor(gray))); + setPalette(QPalette(backgroundColor(),QColor(Qt::gray))); edit_stop_button->setFont(button_font); edit_stop_button->setText(tr("&Stop")); connect(edit_stop_button,SIGNAL(clicked()),this,SLOT(stopButtonData())); @@ -661,7 +667,7 @@ void RDCueEdit::wheelEvent(QWheelEvent *e) void RDCueEdit::mousePressEvent(QMouseEvent *e) { switch(e->button()) { - case QMouseEvent::RightButton: + case Qt::RightButton: if(edit_audition_button->isShown()) { if(edit_right_click_stop) { stopButtonData(); @@ -672,7 +678,7 @@ void RDCueEdit::mousePressEvent(QMouseEvent *e) } break; - case QMouseEvent::MidButton: + case Qt::MidButton: if(edit_audition_button->isShown()) { if(edit_logline->forcedLength()>10000) { if(edit_play_deck->state()==RDPlayDeck::Playing) { diff --git a/lib/rdcueedit.h b/lib/rdcueedit.h index 72356bb1..ff0f6b92 100644 --- a/lib/rdcueedit.h +++ b/lib/rdcueedit.h @@ -23,8 +23,12 @@ #include #include -#include +#include #include +//Added by qt3to4: +#include +#include +#include #include #include diff --git a/lib/rdcut.cpp b/lib/rdcut.cpp index f23a5f6e..604f1378 100644 --- a/lib/rdcut.cpp +++ b/lib/rdcut.cpp @@ -26,6 +26,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -46,12 +48,11 @@ // // Global Classes // -RDCut::RDCut(const QString &name,bool create,QSqlDatabase *db) +RDCut::RDCut(const QString &name,bool create) { - cut_db=db; cut_name=name; - cut_signal=new QSignal(); + cut_signal=new Q3Signal(); if(name.isEmpty()) { cut_number=0; @@ -67,12 +68,11 @@ RDCut::RDCut(const QString &name,bool create,QSqlDatabase *db) } -RDCut::RDCut(unsigned cartnum,int cutnum,bool create,QSqlDatabase *db) +RDCut::RDCut(unsigned cartnum,int cutnum,bool create) { - cut_db=db; cut_name=RDCut::cutName(cartnum,cutnum); - cut_signal=new QSignal(); + cut_signal=new Q3Signal(); if(create) { RDCut::create(cut_name); @@ -90,7 +90,7 @@ RDCut::~RDCut() bool RDCut::exists() const { - return RDDoesRowExist("CUTS","CUT_NAME",cut_name,cut_db); + return RDDoesRowExist("CUTS","CUT_NAME",cut_name); } @@ -199,7 +199,7 @@ void RDCut::setEvergreen(bool state) const QString RDCut::description() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"DESCRIPTION",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"DESCRIPTION"). toString(); } @@ -212,7 +212,7 @@ void RDCut::setDescription(const QString &string) const QString RDCut::outcue() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"OUTCUE",cut_db).toString(); + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"OUTCUE").toString(); } @@ -224,7 +224,7 @@ void RDCut::setOutcue(const QString &string) const QString RDCut::isrc(IsrcFormat fmt) const { - QString str= RDGetSqlValue("CUTS","CUT_NAME",cut_name,"ISRC",cut_db). + QString str= RDGetSqlValue("CUTS","CUT_NAME",cut_name,"ISRC"). toString(); if((fmt==RDCut::RawIsrc)||(str.length()!=12)) { return str; @@ -244,7 +244,7 @@ void RDCut::setIsrc(const QString &isrc) const QString RDCut::isci() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"ISCI",cut_db).toString(); + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"ISCI").toString(); } @@ -256,7 +256,7 @@ void RDCut::setIsci(const QString &isci) const QString RDCut::sha1Hash() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SHA1_HASH",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SHA1_HASH"). toString(); } @@ -269,7 +269,7 @@ void RDCut::setSha1Hash(const QString &str) unsigned RDCut::length() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"LENGTH",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"LENGTH"). toUInt(); } @@ -283,7 +283,7 @@ void RDCut::setLength(int length) const QDateTime RDCut::originDatetime(bool *valid) const { return - RDGetSqlValue("CUTS","CUT_NAME",cut_name,"ORIGIN_DATETIME",cut_db,valid). + RDGetSqlValue("CUTS","CUT_NAME",cut_name,"ORIGIN_DATETIME",valid). toDateTime(); } @@ -297,7 +297,7 @@ void RDCut::setOriginDatetime(const QDateTime &datetime) const QDateTime RDCut::startDatetime(bool *valid) const { return - RDGetSqlValue("CUTS","CUT_NAME",cut_name,"START_DATETIME",cut_db,valid). + RDGetSqlValue("CUTS","CUT_NAME",cut_name,"START_DATETIME",valid). toDateTime(); } @@ -316,7 +316,7 @@ void RDCut::setStartDatetime(const QDateTime &datetime,bool valid) const QDateTime RDCut::endDatetime(bool *valid) const { return - RDGetSqlValue("CUTS","CUT_NAME",cut_name,"END_DATETIME",cut_db,valid). + RDGetSqlValue("CUTS","CUT_NAME",cut_name,"END_DATETIME",valid). toDateTime(); } @@ -335,7 +335,7 @@ void RDCut::setEndDatetime(const QDateTime &datetime,bool valid) const QTime RDCut::startDaypart(bool *valid) const { return - RDGetSqlValue("CUTS","CUT_NAME",cut_name,"START_DAYPART",cut_db,valid). + RDGetSqlValue("CUTS","CUT_NAME",cut_name,"START_DAYPART",valid). toTime(); } @@ -354,7 +354,7 @@ void RDCut::setStartDaypart(const QTime &time,bool valid) const bool RDCut::weekPart(int dayofweek) const { return RDBool(RDGetSqlValue("CUTS","CUT_NAME",cut_name, - RDGetShortDayNameEN(dayofweek).upper(),cut_db). + RDGetShortDayNameEN(dayofweek).upper()). toString()); } @@ -368,7 +368,7 @@ void RDCut::setWeekPart(int dayofweek,bool state) const QTime RDCut::endDaypart(bool *valid) const { return - RDGetSqlValue("CUTS","CUT_NAME",cut_name,"END_DAYPART",cut_db,valid). + RDGetSqlValue("CUTS","CUT_NAME",cut_name,"END_DAYPART",valid). toTime(); } @@ -386,7 +386,7 @@ void RDCut::setEndDaypart(const QTime &time,bool valid) const QString RDCut::originName() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"ORIGIN_NAME",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"ORIGIN_NAME"). toString(); } @@ -399,7 +399,7 @@ void RDCut::setOriginName(const QString &name) const QString RDCut::originLoginName() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"ORIGIN_LOGIN_NAME",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"ORIGIN_LOGIN_NAME"). toString(); } @@ -412,7 +412,7 @@ void RDCut::setOriginLoginName(const QString &name) const QString RDCut::sourceHostname() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SOURCE_HOSTNAME",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SOURCE_HOSTNAME"). toString(); } @@ -425,7 +425,7 @@ void RDCut::setSourceHostname(const QString &name) const unsigned RDCut::weight() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"WEIGHT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"WEIGHT"). toUInt(); } @@ -438,7 +438,7 @@ void RDCut::setWeight(int value) const int RDCut::playOrder() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"PLAY_ORDER",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"PLAY_ORDER"). toInt(); } @@ -452,7 +452,7 @@ void RDCut::setPlayOrder(int order) const QDateTime RDCut::lastPlayDatetime(bool *valid) const { return - RDGetSqlValue("CUTS","CUT_NAME",cut_name,"LAST_PLAY_DATETIME",cut_db,valid). + RDGetSqlValue("CUTS","CUT_NAME",cut_name,"LAST_PLAY_DATETIME",valid). toDateTime(); } @@ -471,7 +471,7 @@ void RDCut::setLastPlayDatetime(const QDateTime &datetime,bool valid) const QDateTime RDCut::uploadDatetime(bool *valid) const { return - RDGetSqlValue("CUTS","CUT_NAME",cut_name,"UPLOAD_DATETIME",cut_db,valid). + RDGetSqlValue("CUTS","CUT_NAME",cut_name,"UPLOAD_DATETIME",valid). toDateTime(); } @@ -489,7 +489,7 @@ void RDCut::setUploadDatetime(const QDateTime &datetime,bool valid) const unsigned RDCut::playCounter() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"PLAY_COUNTER",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"PLAY_COUNTER"). toUInt(); } @@ -515,7 +515,7 @@ void RDCut::setValidity(RDCut::Validity state) unsigned RDCut::localCounter() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"LOCAL_COUNTER",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"LOCAL_COUNTER"). toUInt(); } @@ -528,7 +528,7 @@ void RDCut::setLocalCounter(unsigned count) const unsigned RDCut::codingFormat() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"CODING_FORMAT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"CODING_FORMAT"). toUInt(); } @@ -541,7 +541,7 @@ void RDCut::setCodingFormat(unsigned format) const unsigned RDCut::sampleRate() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SAMPLE_RATE",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SAMPLE_RATE"). toUInt(); } @@ -554,7 +554,7 @@ void RDCut::setSampleRate(unsigned rate) const unsigned RDCut::bitRate() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"BIT_RATE",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"BIT_RATE"). toUInt(); } @@ -567,7 +567,7 @@ void RDCut::setBitRate(unsigned rate) const unsigned RDCut::channels() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"CHANNELS",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"CHANNELS"). toUInt(); } @@ -580,7 +580,7 @@ void RDCut::setChannels(unsigned chan) const int RDCut::playGain() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"PLAY_GAIN",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"PLAY_GAIN"). toInt(); } @@ -596,10 +596,10 @@ int RDCut::startPoint(bool calc) const int n; if(!calc) { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"START_POINT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"START_POINT"). toInt(); } - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"START_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"START_POINT"). toInt())!=-1) { return n; } @@ -618,10 +618,10 @@ int RDCut::endPoint(bool calc) const int n; if(!calc) { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"END_POINT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"END_POINT"). toInt(); } - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"END_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"END_POINT"). toInt())!=-1) { return n; } @@ -640,10 +640,10 @@ int RDCut::fadeupPoint(bool calc) const int n; if(!calc) { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"FADEUP_POINT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"FADEUP_POINT"). toInt(); } - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"FADEUP_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"FADEUP_POINT"). toInt())!=-1) { return n; } @@ -662,10 +662,10 @@ int RDCut::fadedownPoint(bool calc) const int n; if(!calc) { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"FADEDOWN_POINT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"FADEDOWN_POINT"). toInt(); } - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"FADEDOWN_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"FADEDOWN_POINT"). toInt())!=-1) { return n; } @@ -684,10 +684,10 @@ int RDCut::segueStartPoint(bool calc) const int n; if(!calc) { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SEGUE_START_POINT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SEGUE_START_POINT"). toInt(); } - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SEGUE_START_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SEGUE_START_POINT"). toInt())!=-1) { return n; } @@ -706,10 +706,10 @@ int RDCut::segueEndPoint(bool calc) const int n; if(!calc) { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SEGUE_END_POINT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SEGUE_END_POINT"). toInt(); } - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SEGUE_END_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SEGUE_END_POINT"). toInt())!=-1) { return n; } @@ -725,7 +725,7 @@ void RDCut::setSegueEndPoint(int point) const int RDCut::segueGain() const { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SEGUE_GAIN",cut_db).toInt(); + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"SEGUE_GAIN").toInt(); } @@ -740,10 +740,10 @@ int RDCut::hookStartPoint(bool calc) const int n; if(!calc) { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"HOOK_START_POINT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"HOOK_START_POINT"). toInt(); } - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"HOOK_START_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"HOOK_START_POINT"). toInt())!=-1) { return n; } @@ -762,10 +762,10 @@ int RDCut::hookEndPoint(bool calc) const int n; if(!calc) { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"HOOK_END_POINT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"HOOK_END_POINT"). toInt(); } - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"HOOK_END_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"HOOK_END_POINT"). toInt())!=-1) { return n; } @@ -784,10 +784,10 @@ int RDCut::talkStartPoint(bool calc) const int n; if(!calc) { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"TALK_START_POINT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"TALK_START_POINT"). toInt(); } - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"TALK_START_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"TALK_START_POINT"). toInt())!=-1) { return n; } @@ -806,10 +806,10 @@ int RDCut::talkEndPoint(bool calc) const int n; if(!calc) { - return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"TALK_END_POINT",cut_db). + return RDGetSqlValue("CUTS","CUT_NAME",cut_name,"TALK_END_POINT"). toInt(); } - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"TALK_END_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"TALK_END_POINT"). toInt())!=-1) { return n; } @@ -827,7 +827,7 @@ int RDCut::effectiveStart() const { int n; - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"START_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"START_POINT"). toInt())!=-1) { return n; } @@ -839,7 +839,7 @@ int RDCut::effectiveEnd() const { int n; - if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"END_POINT",cut_db). + if((n=RDGetSqlValue("CUTS","CUT_NAME",cut_name,"END_POINT"). toInt())!=-1) { return n; } @@ -1442,7 +1442,7 @@ void RDCut::reset() const "TALK_END_POINT=-1 "+ "where CUT_NAME=\""+RDEscapeString(cut_name)+"\""; } - q=new RDSqlQuery(sql,cut_db); + q=new RDSqlQuery(sql); delete q; wave->closeWave(); delete wave; @@ -1776,7 +1776,7 @@ void RDCut::SetRow(const QString ¶m,const QString &value) const sql=QString("update CUTS set ")+ param+"=\""+RDEscapeString(value)+"\" where "+ "CUT_NAME=\""+RDEscapeString(cut_name)+"\""; - q=new RDSqlQuery(sql,cut_db); + q=new RDSqlQuery(sql); delete q; } @@ -1789,7 +1789,7 @@ void RDCut::SetRow(const QString ¶m,unsigned value) const sql=QString("update CUTS set ")+ param+QString().sprintf("=%u where ",value)+ "CUT_NAME=\""+RDEscapeString(cut_name)+"\""; - q=new RDSqlQuery(sql,cut_db); + q=new RDSqlQuery(sql); delete q; } @@ -1802,7 +1802,7 @@ void RDCut::SetRow(const QString ¶m,int value) const sql=QString("update CUTS set ")+ param+QString().sprintf("=%d where ",value)+ "CUT_NAME=\""+RDEscapeString(cut_name)+"\""; - q=new RDSqlQuery(sql,cut_db); + q=new RDSqlQuery(sql); delete q; } @@ -1815,7 +1815,7 @@ void RDCut::SetRow(const QString ¶m,const QDateTime &value) const sql=QString("update CUTS set ")+ param+"="+RDCheckDateTime(value,"yyyy-MM-dd hh:mm:ss")+" where "+ "CUT_NAME=\""+RDEscapeString(cut_name)+"\""; - q=new RDSqlQuery(sql,cut_db); + q=new RDSqlQuery(sql); delete q; } @@ -1828,7 +1828,7 @@ void RDCut::SetRow(const QString ¶m,const QDate &value) const sql=QString("update CUTS set ")+ param+"="+RDCheckDateTime(value,"yyyy-MM-dd")+" where "+ "CUT_NAME=\""+RDEscapeString(cut_name)+"\""; - q=new RDSqlQuery(sql,cut_db); + q=new RDSqlQuery(sql); delete q; } @@ -1840,7 +1840,7 @@ void RDCut::SetRow(const QString ¶m,const QTime &value) const sql=QString("update CUTS set ")+ param+"="+RDCheckDateTime(value,"hh:mm:ss")+" where "+ "CUT_NAME=\""+RDEscapeString(cut_name)+"\""; - q=new RDSqlQuery(sql,cut_db); + q=new RDSqlQuery(sql); delete q; } @@ -1852,6 +1852,6 @@ void RDCut::SetRow(const QString ¶m) const sql=QString("update CUTS set ")+ param+"=NULL where "+ "CUT_NAME=\""+RDEscapeString(cut_name)+"\""; - q=new RDSqlQuery(sql,cut_db); + q=new RDSqlQuery(sql); delete q; } diff --git a/lib/rdcut.h b/lib/rdcut.h index e16d2aeb..41c7069f 100644 --- a/lib/rdcut.h +++ b/lib/rdcut.h @@ -19,7 +19,7 @@ // #include -#include +#include #include #include @@ -38,8 +38,8 @@ class RDCut enum AudioEnd {AudioBoth=0,AudioHead=1,AudioTail=2}; enum IsrcFormat {RawIsrc=0,FormattedIsrc=1}; enum Validity {NeverValid=0,ConditionallyValid=1,AlwaysValid=2,FutureValid=3}; - RDCut(const QString &name,bool create=false,QSqlDatabase *db=0); - RDCut(unsigned cartnum,int cutnum,bool create=false,QSqlDatabase *db=0); + RDCut(const QString &name,bool create=false); + RDCut(unsigned cartnum,int cutnum,bool create=false); ~RDCut(); bool exists() const; bool isValid() const; @@ -165,8 +165,7 @@ class RDCut void SetRow(const QString ¶m) const; static void GetDefaultDateTimes(QString *start_dt,QString *end_dt, const QString &cutname); - QSignal *cut_signal; - QSqlDatabase *cut_db; + Q3Signal *cut_signal; QString cut_name; unsigned cart_number; unsigned cut_number; diff --git a/lib/rdcut_dialog.cpp b/lib/rdcut_dialog.cpp index 39eb3863..06925b81 100644 --- a/lib/rdcut_dialog.cpp +++ b/lib/rdcut_dialog.cpp @@ -26,6 +26,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include "rdadd_cart.h" #include "rdapplication.h" @@ -92,12 +95,12 @@ RDCutDialog::RDCutDialog(QString *cutname,QString *filter,QString *group, // Progress Dialog // cut_progress_dialog= - new QProgressDialog(tr("Please Wait..."),"Cancel",10,this, + new Q3ProgressDialog(tr("Please Wait..."),"Cancel",10,this, "cut_progress_dialog",false, Qt::WStyle_Customize|Qt::WStyle_NormalBorder); cut_progress_dialog->setCaption(" "); QLabel *label=new QLabel(tr("Please Wait..."),cut_progress_dialog); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label->setFont(progress_font); cut_progress_dialog->setLabel(label); cut_progress_dialog->setCancelButton(NULL); @@ -109,7 +112,7 @@ RDCutDialog::RDCutDialog(QString *cutname,QString *filter,QString *group, cut_filter_edit=new QLineEdit(this); label=new QLabel(cut_filter_edit,tr("Cart Filter:"),this); label->setGeometry(10,10,85,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label->setFont(label_font); connect(cut_filter_edit,SIGNAL(textChanged(const QString &)), this,SLOT(filterChangedData(const QString &))); @@ -139,7 +142,7 @@ RDCutDialog::RDCutDialog(QString *cutname,QString *filter,QString *group, cut_group_box->setGeometry(100,40,140,20); label=new QLabel(cut_filter_edit,tr("Group:"),this); label->setGeometry(10,40,85,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label->setFont(label_font); connect(cut_group_box,SIGNAL(activated(const QString &)), this,SLOT(groupActivatedData(const QString &))); @@ -151,7 +154,7 @@ RDCutDialog::RDCutDialog(QString *cutname,QString *filter,QString *group, cut_schedcode_box->setGeometry(380,40,sizeHint().width()-390,20); cut_schedcode_label=new QLabel(cut_schedcode_box,tr("Scheduler Code:"),this); cut_schedcode_label->setGeometry(260,40,115,20); - cut_schedcode_label->setAlignment(AlignRight|AlignVCenter); + cut_schedcode_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); cut_schedcode_label->setFont(label_font); connect(cut_schedcode_box,SIGNAL(activated(const QString &)), this,SLOT(groupActivatedData(const QString &))); @@ -166,7 +169,7 @@ RDCutDialog::RDCutDialog(QString *cutname,QString *filter,QString *group, QString().sprintf(" %d ", RD_LIMITED_CART_SEARCH_QUANTITY)+tr("Matches"),this); label->setGeometry(120,70,300,20); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); label->setFont(label_font); connect(cart_limit_box,SIGNAL(stateChanged(int)), this,SLOT(limitChangedData(int))); @@ -180,8 +183,8 @@ RDCutDialog::RDCutDialog(QString *cutname,QString *filter,QString *group, cut_cart_list->setItemMargin(5); connect(cut_cart_list,SIGNAL(selectionChanged()), this,SLOT(selectionChangedData())); - connect(cut_cart_list,SIGNAL(clicked(QListViewItem *)), - this,SLOT(cartClickedData(QListViewItem *))); + connect(cut_cart_list,SIGNAL(clicked(Q3ListViewItem *)), + this,SLOT(cartClickedData(Q3ListViewItem *))); label=new QLabel(cut_cart_list,tr("Carts"),this); label->setGeometry(15,100,100,20); label->setFont(label_font); @@ -199,7 +202,7 @@ RDCutDialog::RDCutDialog(QString *cutname,QString *filter,QString *group, // // Cut List // - cut_cut_list=new QListView(this); + cut_cut_list=new Q3ListView(this); cut_cut_list->setGeometry(320,120,sizeHint().width()-330,200); cut_cut_list->setAllColumnsShowFocus(true); cut_cut_list->setItemMargin(5); @@ -346,7 +349,7 @@ void RDCutDialog::limitChangedData(int state) } -void RDCutDialog::cartClickedData(QListViewItem *) +void RDCutDialog::cartClickedData(Q3ListViewItem *) { cut_ok_button->setEnabled(true); } @@ -422,7 +425,7 @@ void RDCutDialog::addButtonData() void RDCutDialog::okData() { RDListViewItem *cart_item=(RDListViewItem *)cut_cart_list->selectedItem(); - QListViewItem *cut_item=cut_cut_list->selectedItem(); + Q3ListViewItem *cut_item=cut_cut_list->selectedItem(); if((cart_item==NULL)||(cut_item==NULL)) { if(cut_allow_clear) { *cut_cutname=""; @@ -521,7 +524,7 @@ void RDCutDialog::RefreshCarts() if(count++>RDCUT_DIALOG_STEP_SIZE) { cut_progress_dialog->setProgress(++step); count=0; - qApp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput); + qApp->processEvents(QEventLoop::ExcludeUserInputEvents); } } cut_progress_dialog->reset(); @@ -536,8 +539,8 @@ void RDCutDialog::RefreshCuts() { QString sql; RDSqlQuery *q; - QListViewItem *l; - QListViewItem *cart_item=cut_cart_list->selectedItem(); + Q3ListViewItem *l; + Q3ListViewItem *cart_item=cut_cart_list->selectedItem(); cut_cut_list->clear(); if(cart_item==NULL) { @@ -547,7 +550,7 @@ void RDCutDialog::RefreshCuts() CART_NUMBER=%s",(const char *)cart_item->text(1)); q=new RDSqlQuery(sql); while(q->next()) { - l=new QListViewItem(cut_cut_list); + l=new Q3ListViewItem(cut_cut_list); l->setText(0,q->value(0).toString()); // Description l->setText(1,QString().sprintf("%03u", // Cut Number q->value(1).toString().right(3).toUInt())); @@ -560,7 +563,7 @@ void RDCutDialog::SelectCut(QString cutname) { QString cart=cutname.left(6); QString cut=cutname.right(3); - QListViewItem *item=cut_cart_list->findItem(cart,1); + Q3ListViewItem *item=cut_cart_list->findItem(cart,1); if(item!=NULL) { cut_cart_list->setSelected(item,true); cut_cart_list->ensureItemVisible(item); @@ -634,17 +637,16 @@ void RDCutDialog::BuildGroupList() QString RDCutDialog::StateFile() { bool home_found = false; QString home = RDGetHomeDir(&home_found); - if (home_found) { + if(home_found) { return QString().sprintf("%s/.rdcartdialog",(const char *)home); - } else { - return NULL; } + return QString(); } void RDCutDialog::LoadState() { QString state_file = StateFile(); - if (state_file == NULL) { + if(state_file.isEmpty()) { return; } @@ -663,7 +665,7 @@ void RDCutDialog::SaveState() FILE *f=NULL; QString state_file = StateFile(); - if (state_file == NULL) { + if(state_file.isEmpty()) { return; } diff --git a/lib/rdcut_dialog.h b/lib/rdcut_dialog.h index 1bc14467..734795c0 100644 --- a/lib/rdcut_dialog.h +++ b/lib/rdcut_dialog.h @@ -22,12 +22,16 @@ #define RDCUT_DIALOG_H #include -#include +#include #include #include #include -#include +#include #include +//Added by qt3to4: +#include +#include +#include #include @@ -52,7 +56,7 @@ class RDCutDialog : public QDialog void clearData(); void groupActivatedData(const QString &); void limitChangedData(int state); - void cartClickedData(QListViewItem *); + void cartClickedData(Q3ListViewItem *); void selectionChangedData(); void searchButtonData(); void clearButtonData(); @@ -72,7 +76,7 @@ class RDCutDialog : public QDialog void LoadState(); void SaveState(); RDListView *cut_cart_list; - QListView *cut_cut_list; + Q3ListView *cut_cut_list; QLineEdit *cut_filter_edit; QCheckBox *cart_limit_box; QPushButton *cut_search_button; @@ -91,7 +95,7 @@ class RDCutDialog : public QDialog QPixmap *cut_macro_map; bool cut_allow_clear; bool cut_exclude_tracks; - QProgressDialog *cut_progress_dialog; + Q3ProgressDialog *cut_progress_dialog; }; diff --git a/lib/rddatedecode.cpp b/lib/rddatedecode.cpp index f7cb38a4..9ee07ea4 100644 --- a/lib/rddatedecode.cpp +++ b/lib/rddatedecode.cpp @@ -33,7 +33,7 @@ QString RDDateDecode(QString str,const QDate &date,RDStation *station, QString field; int offset=0; - for(unsigned i=0;i #include #include +//Added by qt3to4: +#include #include @@ -90,44 +92,44 @@ RDDatePicker::RDDatePicker(int low_year,int high_year,QWidget *parent) QLabel *label=new QLabel(tr("Mo"),this,"monday_label"); label->setGeometry(RDDATEPICKER_X_ORIGIN,30,30,30); label->setFont(header_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label=new QLabel(tr("Tu"),this,"tuesday_label"); label->setGeometry(RDDATEPICKER_X_ORIGIN+RDDATEPICKER_X_INTERVAL, RDDATEPICKER_Y_ORIGIN,30,30); label->setFont(header_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label=new QLabel(tr("We"),this,"wednesday_label"); label->setGeometry(RDDATEPICKER_X_ORIGIN+RDDATEPICKER_X_INTERVAL*2, RDDATEPICKER_Y_ORIGIN,30,30); label->setFont(header_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label=new QLabel(tr("Th"),this,"thursday_label"); label->setGeometry(RDDATEPICKER_X_ORIGIN+RDDATEPICKER_X_INTERVAL*3, RDDATEPICKER_Y_ORIGIN,30,30); label->setFont(header_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label=new QLabel(tr("Fr"),this,"friday_label"); label->setGeometry(RDDATEPICKER_X_ORIGIN+RDDATEPICKER_X_INTERVAL*4, RDDATEPICKER_Y_ORIGIN,30,30); label->setFont(header_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label=new QLabel(tr("Sa"),this,"saturday_label"); label->setGeometry(RDDATEPICKER_X_ORIGIN+RDDATEPICKER_X_INTERVAL*5, RDDATEPICKER_Y_ORIGIN,30,30); label->setFont(header_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label->setPalette(weekend_palette); label=new QLabel(tr("Su"),this,"sunday_label"); label->setGeometry(RDDATEPICKER_X_ORIGIN+RDDATEPICKER_X_INTERVAL*6, RDDATEPICKER_Y_ORIGIN,30,30); label->setFont(header_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label->setPalette(weekend_palette); diff --git a/lib/rddatepicker.h b/lib/rddatepicker.h index 89213889..5bf6e777 100644 --- a/lib/rddatepicker.h +++ b/lib/rddatepicker.h @@ -32,6 +32,8 @@ #include #include #include +//Added by qt3to4: +#include // // Display Settings diff --git a/lib/rddb.cpp b/lib/rddb.cpp index 3f032bd4..27ef87d0 100644 --- a/lib/rddb.cpp +++ b/lib/rddb.cpp @@ -3,7 +3,7 @@ // Database driver with automatic reconnect // // (C) Copyright 2007 Dan Mills -// (C) Copyright 2016 Fred Gleason +// (C) Copyright 2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,77 +19,45 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include #include "rddb.h" #include "rddbheartbeat.h" -static QSqlDatabase *db = NULL; -static RDSqlDatabaseStatus * dbStatus = NULL; - -QSqlDatabase *RDInitDb (unsigned *schema,QString *error) +RDSqlQuery::RDSqlQuery (const QString &query,bool reconnect): + QSqlQuery(query) { - static bool firsttime = true; + sql_columns=0; - *schema=0; - RDConfig *cf = RDConfiguration(); - cf->load(); - assert (cf); - if (!db){ - db=QSqlDatabase::addDatabase(cf->mysqlDriver()); - if(!db) { - if (error){ - (*error) += QString(QObject::tr("Couldn't initialize QSql driver!")); + if(isActive()) { + QStringList f0=query.split(" "); + if(f0[0].toLower()=="select") { + for(int i=1;isetDatabaseName(cf->mysqlDbname()); - db->setUserName(cf->mysqlUsername()); - db->setPassword(cf->mysqlPassword()); - db->setHostName(cf->mysqlHostname()); - if(!db->open()) { - if (error){ - (*error) += QString(QObject::tr("Couldn't open mySQL connection!")); - } - db->removeDatabase(cf->mysqlDbname()); - db->close(); - return NULL; } } - - QString sql=QString("set charset '")+cf->mysqlCharset()+"'"; - QSqlQuery *q=new QSqlQuery(sql); - delete q; - - if (firsttime){ - new RDDbHeartbeat(cf->mysqlHeartbeatInterval()); - firsttime = false; - } - q=new QSqlQuery("select DB from VERSION"); - if(q->first()) { - *schema=q->value(0).toUInt(); - } - delete q; - - return db; -} - -//RDSqlQuery::RDSqlQuery (const QString &query, QSqlDatabase *dbase): -RDSqlQuery::RDSqlQuery(const QString &query,bool reconnect): - QSqlQuery (query) -{ - //printf("lastQuery: %s\n",(const char *)lastQuery()); - - // With any luck, by the time we get here, we have already done the biz... - unsigned schema; - if (!isActive()){ //DB Offline? + else { QString err=QObject::tr("invalid SQL or failed DB connection")+ +"["+lastError().text()+"]: "+query; @@ -97,31 +65,16 @@ RDSqlQuery::RDSqlQuery(const QString &query,bool reconnect): #ifndef WIN32 syslog(LOG_ERR,(const char *)err); #endif // WIN32 - if(reconnect) { - QSqlDatabase *ldb = QSqlDatabase::database(); - // Something went wrong with the DB, trying a reconnect - ldb->removeDatabase(RDConfiguration()->mysqlDbname()); - ldb->close(); - db = NULL; - RDInitDb (&schema); - QSqlQuery::prepare (query); - QSqlQuery::exec (); - if (RDDbStatus()){ - if (isActive()){ - RDDbStatus()->sendRecon(); - } - else { - RDDbStatus()->sendDiscon(query); - } - } - else { - RDDbStatus()->sendRecon(); - } - } } } +int RDSqlQuery::columns() const +{ + return sql_columns; +} + + QVariant RDSqlQuery::run(const QString &sql,bool *ok) { QVariant ret; @@ -130,12 +83,7 @@ QVariant RDSqlQuery::run(const QString &sql,bool *ok) if(ok!=NULL) { *ok=q->isActive(); } - delete q; - - q=new RDSqlQuery("select LAST_INSERT_ID()",false); - if(q->first()) { - ret=q->value(0); - } + ret=q->lastInsertId(); delete q; return ret; @@ -169,36 +117,2466 @@ int RDSqlQuery::rows(const QString &sql) } -void RDSqlDatabaseStatus::sendRecon() +bool RDOpenDb (int *schema,QString *err_str,RDConfig *config) { - if (discon){ - discon = false; - emit reconnected(); - fprintf (stderr,"Database connection restored.\n"); - emit logText(RDConfig::LogErr,QString(tr("Database connection restored."))); + QSqlDatabase db; + QString sql; + QSqlQuery *q; + + if (!db.isOpen()){ + db=QSqlDatabase::addDatabase(config->mysqlDriver()); + if(!db.isValid()) { + *err_str+= QString(QObject::tr("Couldn't initialize MySql driver!")); + return false; + } + db.setHostName(config->mysqlHostname()); + db.setDatabaseName(config->mysqlDbname()); + db.setUserName(config->mysqlUsername()); + db.setPassword(config->mysqlPassword()); + if(!db.open()) { + *err_str+=QString(QObject::tr("Couldn't open MySQL connection on"))+ + " \""+config->mysqlHostname()+"\"."; + db.removeDatabase(config->mysqlDbname()); + db.close(); + return false; + } } + new RDDbHeartbeat(config->mysqlHeartbeatInterval()); + sql=QString("set NAMES '")+config->mysqlCharset()+"'"+ + "COLLATE '"+config->mysqlCollation()+"'"; + q=new QSqlQuery(sql); + delete q; + + *schema=-1; + sql=QString("show tables where ")+ + "Tables_in_"+config->mysqlDbname()+"=\"VERSION\""; + q=new QSqlQuery(sql); + if(q->first()) { + delete q; + q=new QSqlQuery("select DB from VERSION"); + if(q->first()) { + *schema=q->value(0).toUInt(); + } + } + else { + delete q; + sql=QString("show tables"); + q=new QSqlQuery(sql); + if(!q->first()) { + *schema=0; + } + } + delete q; + + return true; } -void RDSqlDatabaseStatus::sendDiscon(QString query) +/* +bool RunQuery(QString *err_str,QString sql) { - if (!discon){ - emit connectionFailed(); - fprintf (stderr,"Database connection failed: %s\n",(const char *)query); - emit logText(RDConfig::LogErr, - QString(tr("Database connection failed : ")) + query); - discon = true; + QSqlQuery *q=new QSqlQuery(sql); + if(!q->isActive()) { + *err_str=q->lastError().databaseText()+" ["+sql+"]"; + delete q; + return false; } + delete q; + return true; } -RDSqlDatabaseStatus::RDSqlDatabaseStatus() + +bool InsertRDAirPlayHotkey(QString *err_str,const QString &station, + const QString &label,int id) { - discon = false; + QString sql=QString("insert into RDHOTKEYS set ")+ + "STATION_NAME=\""+RDEscapeString(station)+"\","+ + "MODULE_NAME=\"airplay\","+ + QString().sprintf("KEY_ID=%d,",id)+ + "KEY_LABEL=\""+RDEscapeString(label)+"\""; + if(!RunQuery(err_str,sql)) { + return false; + } + return true; } -RDSqlDatabaseStatus * RDDbStatus() + +bool UpdateRDAirplayHotkeys(QString *err_str,QString station) { - if (!dbStatus){ - dbStatus = new RDSqlDatabaseStatus; + bool ret=true; + QString sql; + + for(int i=0;i<7;i++) { + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Start Line")+ + QString().sprintf(" %d",i+1),3*i+1); + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Stop Line")+ + QString().sprintf(" %d",i+1),3*i+2); + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Pause Line")+ + QString().sprintf(" %d",i+1),3*i+3); } - return dbStatus; + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Add"),22); + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Delete"),23); + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Copy"),24); + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Move"),25); + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Sound Panel"),26); + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Main Log"),27); + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Aux Log 1"),28); + ret=ret&&InsertRDAirPlayHotkey(err_str,station,QObject::tr("Aux Log 2"),29); + + return ret; } + + +void UpdateImportFormats() +{ + QString sql; + QSqlQuery *q; + + sql=QString("insert into IMPORT_TEMPLATES set ")+ + "NAME=\"Rivendell Standard Import\","+ + "CART_OFFSET=10,"+ + "CART_LENGTH=6,"+ + "TITLE_OFFSET=25,"+ + "TITLE_LENGTH=34,"+ + "HOURS_OFFSET=0,"+ + "HOURS_LENGTH=2,"+ + "MINUTES_OFFSET=3,"+ + "MINUTES_LENGTH=2,"+ + "SECONDS_OFFSET=6,"+ + "SECONDS_LENGTH=2,"+ + "LEN_HOURS_OFFSET=60,"+ + "LEN_HOURS_LENGTH=2,"+ + "LEN_MINUTES_OFFSET=63,"+ + "LEN_MINUTES_LENGTH=2,"+ + "LEN_SECONDS_OFFSET=66,"+ + "LEN_SECONDS_LENGTH=2,"+ + "DATA_OFFSET=69,"+ + "DATA_LENGTH=32"; + q=new QSqlQuery(sql); + delete q; + + sql=QString("insert into IMPORT_TEMPLATES set ")+ + "NAME=\"PowerGold Music Scheduling\","+ + "CART_OFFSET=10,"+ + "CART_LENGTH=6,"+ + "TITLE_OFFSET=25,"+ + "TITLE_LENGTH=34,"+ + "HOURS_OFFSET=0,"+ + "HOURS_LENGTH=2,"+ + "MINUTES_OFFSET=3,"+ + "MINUTES_LENGTH=2,"+ + "SECONDS_OFFSET=6,"+ + "SECONDS_LENGTH=2,"+ + "LEN_HOURS_OFFSET=60,"+ + "LEN_HOURS_LENGTH=2,"+ + "LEN_MINUTES_OFFSET=63,"+ + "LEN_MINUTES_LENGTH=2,"+ + "LEN_SECONDS_OFFSET=66,"+ + "LEN_SECONDS_LENGTH=2,"+ + "DATA_OFFSET=69,"+ + "DATA_LENGTH=32"; + q=new QSqlQuery(sql); + delete q; + + sql=QString("insert into IMPORT_TEMPLATES set ")+ + "NAME=\"RadioTraffic.com\","+ + "CART_OFFSET=10,"+ + "CART_LENGTH=6,"+ + "TITLE_OFFSET=25,"+ + "TITLE_LENGTH=34,"+ + "HOURS_OFFSET=0,"+ + "HOURS_LENGTH=2,"+ + "MINUTES_OFFSET=3,"+ + "MINUTES_LENGTH=2,"+ + "SECONDS_OFFSET=6,"+ + "SECONDS_LENGTH=2,"+ + "LEN_HOURS_OFFSET=60,"+ + "LEN_HOURS_LENGTH=2,"+ + "LEN_MINUTES_OFFSET=63,"+ + "LEN_MINUTES_LENGTH=2,"+ + "LEN_SECONDS_OFFSET=66,"+ + "LEN_SECONDS_LENGTH=2,"+ + "DATA_OFFSET=69,"+ + "DATA_LENGTH=32"; + q=new QSqlQuery(sql); + delete q; + + sql=QString("insert into IMPORT_TEMPLATES set ")+ + "NAME=\"CounterPoint Traffic\","+ + "CART_OFFSET=10,"+ + "CART_LENGTH=6,"+ + "TITLE_OFFSET=25,"+ + "TITLE_LENGTH=34,"+ + "HOURS_OFFSET=0,"+ + "HOURS_LENGTH=2,"+ + "MINUTES_OFFSET=3,"+ + "MINUTES_LENGTH=2,"+ + "SECONDS_OFFSET=6,"+ + "SECONDS_LENGTH=2,"+ + "LEN_HOURS_OFFSET=60,"+ + "LEN_HOURS_LENGTH=2,"+ + "LEN_MINUTES_OFFSET=63,"+ + "LEN_MINUTES_LENGTH=2,"+ + "LEN_SECONDS_OFFSET=66,"+ + "LEN_SECONDS_LENGTH=2,"+ + "EVENT_ID_OFFSET=69,"+ + "EVENT_ID_LENGTH=32,"+ + "DATA_OFFSET=102,"+ + "DATA_LENGTH=32"; + q=new QSqlQuery(sql); + delete q; + + sql=QString("insert into IMPORT_TEMPLATES set ")+ + "NAME=\"WideOrbit Traffic\","+ + "CART_OFFSET=10,"+ + "CART_LENGTH=6,"+ + "TITLE_OFFSET=25,"+ + "TITLE_LENGTH=34,"+ + "HOURS_OFFSET=0,"+ + "HOURS_LENGTH=2,"+ + "MINUTES_OFFSET=3,"+ + "MINUTES_LENGTH=2,"+ + "SECONDS_OFFSET=6,"+ + "SECONDS_LENGTH=2,"+ + "LEN_HOURS_OFFSET=60,"+ + "LEN_HOURS_LENGTH=2,"+ + "LEN_MINUTES_OFFSET=63,"+ + "LEN_MINUTES_LENGTH=2,"+ + "LEN_SECONDS_OFFSET=66,"+ + "LEN_SECONDS_LENGTH=2,"+ + "EVENT_ID_OFFSET=69,"+ + "EVENT_ID_LENGTH=32,"+ + "DATA_OFFSET=102,"+ + "DATA_LENGTH=32"; + q=new QSqlQuery(sql); + delete q; + + sql=QString("insert into IMPORT_TEMPLATES set ")+ + "NAME=\"Visual Traffic\","+ + "CART_OFFSET=14,"+ + "CART_LENGTH=6,"+ + "TITLE_OFFSET=25,"+ + "TITLE_LENGTH=39,"+ + "HOURS_OFFSET=5,"+ + "HOURS_LENGTH=2,"+ + "MINUTES_OFFSET=8,"+ + "MINUTES_LENGTH=2,"+ + "SECONDS_OFFSET=11,"+ + "SECONDS_LENGTH=2,"+ + "LEN_HOURS_OFFSET=0,"+ + "LEN_HOURS_LENGTH=0,"+ + "LEN_MINUTES_OFFSET=97,"+ + "LEN_MINUTES_LENGTH=2,"+ + "LEN_SECONDS_OFFSET=99,"+ + "LEN_SECONDS_LENGTH=2,"+ + "EVENT_ID_OFFSET=0,"+ + "EVENT_ID_LENGTH=0,"+ + "DATA_OFFSET=0,"+ + "DATA_LENGTH=0"; + q=new QSqlQuery(sql); + delete q; + + sql=QString("insert into IMPORT_TEMPLATES set ")+ + "NAME=\"Music 1\","+ + "CART_OFFSET=10,"+ + "CART_LENGTH=6,"+ + "TITLE_OFFSET=25,"+ + "TITLE_LENGTH=34,"+ + "HOURS_OFFSET=0,"+ + "HOURS_LENGTH=2,"+ + "MINUTES_OFFSET=3,"+ + "MINUTES_LENGTH=2,"+ + "SECONDS_OFFSET=6,"+ + "SECONDS_LENGTH=2,"+ + "LEN_HOURS_OFFSET=60,"+ + "LEN_HOURS_LENGTH=2,"+ + "LEN_MINUTES_OFFSET=63,"+ + "LEN_MINUTES_LENGTH=2,"+ + "LEN_SECONDS_OFFSET=66,"+ + "LEN_SECONDS_LENGTH=2,"+ + "DATA_OFFSET=69,"+ + "DATA_LENGTH=32"; + q=new QSqlQuery(sql); + delete q; + + sql=QString("insert into IMPORT_TEMPLATES set ")+ + "NAME=\"NaturalLog\","+ + "CART_OFFSET=9,"+ + "CART_LENGTH=6,"+ + "TITLE_OFFSET=19,"+ + "TITLE_LENGTH=40,"+ + "HOURS_OFFSET=0,"+ + "HOURS_LENGTH=2,"+ + "MINUTES_OFFSET=3,"+ + "MINUTES_LENGTH=2,"+ + "SECONDS_OFFSET=6,"+ + "SECONDS_LENGTH=2,"+ + "LEN_HOURS_OFFSET=61,"+ + "LEN_HOURS_LENGTH=2,"+ + "LEN_MINUTES_OFFSET=64,"+ + "LEN_MINUTES_LENGTH=2,"+ + "LEN_SECONDS_OFFSET=67,"+ + "LEN_SECONDS_LENGTH=2,"+ + "DATA_OFFSET=0,"+ + "DATA_LENGTH=0"; + q=new QSqlQuery(sql); + delete q; +} + + +bool RDInitDb(QString *err_str,RDConfig *config) +{ + QString sql; + RDUser *user=NULL; + + // + // Create Default Admin Account + // + if(!RDUser::create(RDA_LOGIN_NAME)) { + return false; + } + user=new RDUser(RDA_LOGIN_NAME); + user->setPassword(RDA_PASSWORD); + user->setFullName(RDA_FULLNAME); + user->setDescription(RDA_DESCRIPTION); + user->setAdminConfig(true); + delete user; + + // + // Create Default User Account + // + if(!RDUser::create(RD_USER_LOGIN_NAME)) { + return false; + } + user=new RDUser(RD_USER_LOGIN_NAME); + user->setPassword(RD_USER_PASSWORD); + user->setFullName(RD_USER_FULL_NAME); + user->setDescription(RD_USER_DESCRIPTION); + user->setCreateCarts(true); + user->setDeleteCarts(true); + user->setModifyCarts(true); + user->setEditAudio(true); + user->setCreateLog(true); + user->setDeleteLog(true); + user->setDeleteRec(true); + user->setPlayoutLog(true); + user->setArrangeLog(true); + user->setAddtoLog(true); + user->setRemovefromLog(true); + user->setConfigPanels(true); + user->setVoicetrackLog(true); + user->setEditCatches(true); + user->setModifyTemplate(true); + user->setAddPodcast(true); + user->setEditPodcast(true); + user->setDeletePodcast(true); + delete user; + + // + // Create Default Workstation + // + struct hostent *hostent=gethostbyname(config->stationName()); + if(!RDStation::create(config->stationName())) { + return false; + } + RDStation *station=new RDStation(config->stationName()); + station->setDescription(RD_STATION_DESCRIPTION); + station->setUserName(RD_USER_LOGIN_NAME); + if(hostent!=NULL) { + station-> + setAddress(QHostAddress(QString().sprintf("%d.%d.%d.%d", + 0xFF&hostent->h_addr[0], + 0xFF&hostent->h_addr[1], + 0xFF&hostent->h_addr[2], + 0xFF&hostent->h_addr[3]))); + } + delete station; + + // + // Create Test Tone Cart/Cut + // + QString filename= + QString().sprintf("%s/999999_001.%s", + config->audioRoot().ascii(), + config->audioExtension().ascii()); + + QString cmd=QString().sprintf("rdgen -t 10 -l 16 %s", + (const char *)filename); + system((const char *)cmd); + if(getuid()==0) { + chown(filename,config->uid(),config->gid()); + chmod (filename,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH); + } + + RDCart *cart=new RDCart(999999); + if(!cart->create("TEST",RDCart::Audio)) { + return false; + } + cart->setTitle(QObject::tr("Test Tone")); + cart->setArtist(QObject::tr("Rivendell Radio Automation")); + cart->setForcedLength(10000); + + cart->addCut(0,0,2,"",QObject::tr("1 kHz at Reference Level [-16 dBFS]")); + RDCut *cut=new RDCut(999999,1); + cut->setOutcue("["+QObject::tr("tone")+"]"); + RDSettings *s=new RDSettings(); + s->setFormat(RDSettings::Pcm16); + s->setSampleRate(RD_DEFAULT_SAMPLE_RATE); + s->setChannels(2); + cut->checkInRecording("RDGen",s,10000); + delete s; + delete cut; + delete cart; + + // + // Create Clipboard Entry + // + // FIXME: Make this per-host! + // + sql=QString("insert into CLIPBOARD set ")+ + "CUT_NAME=\"clip\","+ + "CART_NUMBER=0,"+ + "DESCRIPTION=\"Default Clipboard\""; + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create Default Service + // + RDSvc *svc=new RDSvc(RD_SERVICE_NAME); + svc->create(""); + svc->setDescription(RD_SERVICE_DESCRIPTION); + delete svc; + + // + // Create Default Groups + // + + struct Group + { + const char *group; + const char *description; + int start; + int end; + bool now_next; + bool rpt_traffic; + bool rpt_music; + bool macro; + }; + + static const struct Group group[] = { + {"TEMP","Temporary Carts",0,0,false,false,false,false}, + {"TEST","Test Carts",0,0,false,false,false,false}, + {"TRAFFIC","Traffic Carts",1,10000,false,true,false,false}, + {"MUSIC","Music Carts",10001,40000,true,false,true,false}, + {"BEDS","Music Bed Carts",40001,45000,false,false,false,false}, + {"STINGS","Short stingers",45001,50000,false,false,false,false}, + {"MACROS","Macro Carts",50001,60000,false,false,false,true}, + {"LEGAL","Legal IDs",60001,60100,false,false,false,false}, + {"IDENTS","General IDs",60101,60500,false,false,false,false}, + {NULL,NULL,0,0,false,false,false,false}, + }; + + + for(const struct Group *g=group;g->group!= NULL; g++) { + RDGroup::create(g->group,true,true); + RDGroup *group=new RDGroup(g->group); + group->setDescription(g->description); + if(g->macro) { + group->setDefaultCartType(RDCart::Macro); + } + else { + group->setDefaultCartType(RDCart::Audio); + } + group->setDefaultLowCart(g->start); + group->setDefaultHighCart(g->end); + group->setExportReport(RDGroup::Traffic,g->rpt_traffic); + group->setExportReport(RDGroup::Music,g->rpt_music); + group->setEnableNowNext(g->now_next); + delete group; + // Add it to the user permissions table for the default user + sql=QString().sprintf("insert into USER_PERMS (USER_NAME,GROUP_NAME) \ + values (\"%s\",\"%s\")",RD_USER_LOGIN_NAME,g->group); + if(!RunQuery(err_str,sql)) { + return false; + } + // Add it to the audio permsmissions table + sql=QString().sprintf("insert into AUDIO_PERMS (GROUP_NAME,SERVICE_NAME) \ + values (\"%s\",\"%s\")",g->group,RD_SERVICE_NAME); + if(!RunQuery(err_str,sql)) { + return false; + } + } + + // + // Create Sample Log + // + sql=RDCreateLogTableSql("SAMPLE_LOG"); + if(!RunQuery(err_str,sql)) { + return false; + } + sql=QString("insert into LOGS ")+ + "(NAME,SERVICE,DESCRIPTION,ORIGIN_USER,ORIGIN_DATETIME,MODIFIED_DATETIME) "+ + "values (\"SAMPLE\",\"Production\",\"Sample Log\",\"user\",now(),now())"; + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Generate Hotkey Definitions + // + if (!UpdateRDAirplayHotkeys(err_str,RD_STATION_NAME)) { + return false; + } + + + return true; +} + + +bool RDMakeDb(QString *err_str,RDConfig *config) +{ + QString sql; + +// +// Create USERS table +// + sql=QString("create table if not exists USERS (")+ + "LOGIN_NAME char(255) not null primary key,"+ + "FULL_NAME char(255),"+ + "PHONE_NUMBER char(20),"+ + "DESCRIPTION char(255),"+ + "PASSWORD char(32),"+ + "ENABLE_WEB enum('N','Y') default 'N',"+ + "ADMIN_USERS_PRIV enum('N','Y') not null default 'N',"+ + "ADMIN_CONFIG_PRIV enum('N','Y') not null default 'N',"+ + "CREATE_CARTS_PRIV enum('N','Y') not null default 'N',"+ + "DELETE_CARTS_PRIV enum('N','Y') not null default 'N',"+ + "MODIFY_CARTS_PRIV enum('N','Y') not null default 'N',"+ + "EDIT_AUDIO_PRIV enum('N','Y') not null default 'N',"+ + "ASSIGN_CART_PRIV enum('N','Y') not null default 'N',"+ + "CREATE_LOG_PRIV enum('N','Y') not null default 'N',"+ + "DELETE_LOG_PRIV enum('N','Y') not null default 'N',"+ + "DELETE_REC_PRIV enum('N','Y') not null default 'N',"+ + "PLAYOUT_LOG_PRIV enum('N','Y') not null default 'N',"+ + "ARRANGE_LOG_PRIV enum('N','Y') not null default 'N',"+ + "MODIFY_TEMPLATE_PRIV enum('N','Y') not null default 'N',"+ + "ADDTO_LOG_PRIV enum('N','Y') not null default 'N',"+ + "REMOVEFROM_LOG_PRIV enum('N','Y') not null default 'N',"+ + "CONFIG_PANELS_PRIV enum('N','Y') not null default 'N',"+ + "VOICETRACK_LOG_PRIV enum('N','Y') not null default 'N',"+ + "EDIT_CATCHES_PRIV enum('N','Y') not null default 'N',"+ + "ADD_PODCAST_PRIV enum('N','Y') not null default 'N',"+ + "EDIT_PODCAST_PRIV enum('N','Y') not null default 'N',"+ + "DELETE_PODCAST_PRIV enum('N','Y') not null default 'N',"+ + "index FULL_NAME_IDX (FULL_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create STATIONS table +// + sql=QString("create table if not exists STATIONS (")+ + "NAME char(64) primary key not null,"+ + "DESCRIPTION char(64),"+ + "USER_NAME char(255),"+ + "DEFAULT_NAME char(255),"+ + "IPV4_ADDRESS char(15) default \"127.0.0.2\","+ + "HTTP_STATION char(64) default \"localhost\","+ + "CAE_STATION char(64) default \"localhost\","+ + "TIME_OFFSET int default 0,"+ + "BACKUP_DIR char(255),"+ + "BACKUP_LIFE int default 0,"+ + "BROADCAST_SECURITY int unsigned default 0,"+ + "HEARTBEAT_CART int unsigned default 0,"+ + "HEARTBEAT_INTERVAL int unsigned default 0,"+ + "STARTUP_CART int unsigned default 0,"+ + "EDITOR_PATH char(255) default \"\","+ + "FILTER_MODE int default 0,"+ + "START_JACK enum('N','Y') default 'N',"+ + "JACK_SERVER_NAME char(64),"+ + "JACK_COMMAND_LINE char(255),"+ + "CUE_CARD int default 0,"+ + "CUE_PORT int default 0,"+ + "CUE_START_CART int unsigned,"+ + "CUE_STOP_CART int unsigned,"+ + "CARTSLOT_COLUMNS int default 1,"+ + "CARTSLOT_ROWS int default 8,"+ + "ENABLE_DRAGDROP enum('N','Y') default 'Y',"+ + "ENFORCE_PANEL_SETUP enum('N','Y') default 'N',"+ + "SYSTEM_MAINT enum('N','Y') default 'Y',"+ + "STATION_SCANNED enum('N','Y') default 'N',"+ + "HAVE_OGGENC enum('N','Y') default 'N',"+ + "HAVE_OGG123 enum('N','Y') default 'N',"+ + "HAVE_FLAC enum('N','Y') default 'N',"+ + "HAVE_TWOLAME enum('N','Y') default 'N',"+ + "HAVE_LAME enum('N','Y') default 'N',"+ + "HAVE_MPG321 enum('N','Y') default 'N',"+ + "HAVE_MP4_DECODE enum('N','Y') default 'N',"+ + "HPI_VERSION char(16),"+ + "JACK_VERSION char(16),"+ + "ALSA_VERSION char(16),"+ + "CARD0_DRIVER int(11) default 0,"+ + "CARD0_NAME char(64),"+ + "CARD0_INPUTS int default -1,"+ + "CARD0_OUTPUTS int default -1,"+ + "CARD1_DRIVER int(11) default 0,"+ + "CARD1_NAME char(64),"+ + "CARD1_INPUTS int default -1,"+ + "CARD1_OUTPUTS int default -1,"+ + "CARD2_DRIVER int(11) default 0,"+ + "CARD2_NAME char(64),"+ + "CARD2_INPUTS int default -1,"+ + "CARD2_OUTPUTS int default -1,"+ + "CARD3_DRIVER int(11) default 0,"+ + "CARD3_NAME char(64),"+ + "CARD3_INPUTS int default -1,"+ + "CARD3_OUTPUTS int default -1,"+ + "CARD4_DRIVER int(11) default 0,"+ + "CARD4_NAME char(64),"+ + "CARD4_INPUTS int default -1,"+ + "CARD4_OUTPUTS int default -1,"+ + "CARD5_DRIVER int(11) default 0,"+ + "CARD5_NAME char(64),"+ + "CARD5_INPUTS int default -1,"+ + "CARD5_OUTPUTS int default -1,"+ + "CARD6_DRIVER int(11) default 0,"+ + "CARD6_NAME char(64),"+ + "CARD6_INPUTS int default -1,"+ + "CARD6_OUTPUTS int default -1,"+ + "CARD7_DRIVER int(11) default 0,"+ + "CARD7_NAME char(64),"+ + "CARD7_INPUTS int default -1,"+ + "CARD7_OUTPUTS int default -1,"+ + "index DESCRIPTION_IDX (DESCRIPTION))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create CART table +// + sql=QString("create table if not exists CART (")+ + "NUMBER int unsigned not null primary key,"+ + "TYPE int unsigned not null,"+ + "GROUP_NAME char(10) not null,"+ + "TITLE char(255),"+ + "ARTIST char(255),"+ + "ALBUM char(255),"+ + "YEAR date,"+ + "ISRC char(12),"+ + "CONDUCTOR char(64),"+ + "LABEL char(64),"+ + "CLIENT char(64),"+ + "AGENCY char(64),"+ + "PUBLISHER char(64),"+ + "COMPOSER char(64),"+ + "USER_DEFINED char(255),"+ + "SONG_ID char(32),"+ + "BPM int unsigned default 0,"+ + "USAGE_CODE int default 0,"+ + "FORCED_LENGTH int unsigned,"+ + "AVERAGE_LENGTH int unsigned,"+ + "LENGTH_DEVIATION int unsigned default 0,"+ + "AVERAGE_SEGUE_LENGTH int unsigned,"+ + "AVERAGE_HOOK_LENGTH int unsigned default 0,"+ + "CUT_QUANTITY int unsigned,"+ + "LAST_CUT_PLAYED int unsigned,"+ + "PLAY_ORDER int unsigned,"+ + "VALIDITY int unsigned default 2,"+ + "START_DATETIME datetime,"+ + "END_DATETIME datetime,"+ + "ENFORCE_LENGTH enum('N','Y') default 'N',"+ + "PRESERVE_PITCH enum('N','Y') default 'N',"+ + "USE_WEIGHTING enum('N','Y') default 'Y',"+ + "ASYNCRONOUS enum('N','Y') default 'N',"+ + "OWNER char(64),"+ + "MACROS text,"+ + "SCHED_CODES varchar( 255 ) NULL default NULL,"+ + "NOTES text,"+ + "METADATA_DATETIME datetime,"+ + "USE_EVENT_LENGTH enum('N','Y') default 'N',"+ + "PENDING_STATION char(64),"+ + "PENDING_PID int,"+ + "PENDING_DATETIME datetime,"+ + "index GROUP_NAME_IDX (GROUP_NAME),"+ + "index TITLE_IDX (TITLE),"+ + "index ARTIST_IDX (ARTIST),"+ + "index ALBUM_IDX (ALBUM),"+ + "index CONDUCTOR_IDX (CONDUCTOR),"+ + "index LABEL_IDX (LABEL),"+ + "index CLIENT_IDX (CLIENT),"+ + "index AGENCY_IDX (AGENCY),"+ + "index PUBLISHER_IDX (PUBLISHER),"+ + "index COMPOSER_IDX (COMPOSER),"+ + "index USER_DEFINED_IDX (USER_DEFINED),"+ + "index SONG_ID_IDX (SONG_ID),"+ + "index OWNER_IDX (OWNER),"+ + "index METADATA_DATETIME_IDX (METADATA_DATETIME),"+ + "index PENDING_STATION_IDX(PENDING_STATION),"+ + "index PENDING_PID_IDX(PENDING_STATION,PENDING_PID),"+ + "index PENDING_DATETIME_IDX(PENDING_DATETIME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create CUTS table +// + sql=QString("create table if not exists CUTS (")+ + "CUT_NAME char(12) primary key not null,"+ + "CART_NUMBER int unsigned not null,"+ + "EVERGREEN enum('N','Y') default 'N',"+ + "DESCRIPTION char(64),"+ + "OUTCUE char(64),"+ + "ISRC char(12),"+ + "ISCI char(32),"+ + "LENGTH int unsigned,"+ + "ORIGIN_DATETIME datetime,"+ + "START_DATETIME datetime,"+ + "END_DATETIME datetime,"+ + "SUN enum('N','Y') default 'Y',"+ + "MON enum('N','Y') default 'Y',"+ + "TUE enum('N','Y') default 'Y',"+ + "WED enum('N','Y') default 'Y',"+ + "THU enum('N','Y') default 'Y',"+ + "FRI enum('N','Y') default 'Y',"+ + "SAT enum('N','Y') default 'Y',"+ + "START_DAYPART time,"+ + "END_DAYPART time,"+ + "ORIGIN_NAME char(64),"+ + "WEIGHT int unsigned default 1,"+ + "PLAY_ORDER int,"+ + "LAST_PLAY_DATETIME datetime,"+ + "UPLOAD_DATETIME datetime,"+ + "PLAY_COUNTER int unsigned default 0,"+ + "LOCAL_COUNTER int unsigned default 0,"+ + "VALIDITY int unsigned default 2,"+ + "CODING_FORMAT int unsigned,"+ + "SAMPLE_RATE int unsigned,"+ + "BIT_RATE int unsigned,"+ + "CHANNELS int unsigned,"+ + "PLAY_GAIN int default 0,"+ + "START_POINT int default -1,"+ + "END_POINT int default -1,"+ + "FADEUP_POINT int default -1,"+ + "FADEDOWN_POINT int default -1,"+ + "SEGUE_START_POINT int default -1,"+ + "SEGUE_END_POINT int default -1,"+ + "SEGUE_GAIN int default "+QString().sprintf("%d",RD_FADE_DEPTH)+","+ + "HOOK_START_POINT int default -1,"+ + "HOOK_END_POINT int default -1,"+ + "TALK_START_POINT int default -1,"+ + "TALK_END_POINT int default -1,"+ + "index CART_NUMBER_IDX (CART_NUMBER),"+ + "index DESCRIPTION_IDX (DESCRIPTION),"+ + "index OUTCUE_IDX (OUTCUE),"+ + "index ORIGIN_DATETIME_IDX (ORIGIN_DATETIME),"+ + "index START_DATETIME_IDX (START_DATETIME),"+ + "index END_DATETIME_IDX (END_DATETIME),"+ + "index ISCI_IDX (ISCI),"+ + "index ISRC_IDX (ISRC))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create CLIPBOARD table +// + sql=QString("create table if not exists CLIPBOARD (")+ + "CUT_NAME char(12) primary key not null,"+ + "CART_NUMBER int unsigned not null,"+ + "DESCRIPTION char(64),"+ + "OUTCUE char(64),"+ + "LENGTH int unsigned,"+ + "ORIGIN_DATETIME datetime,"+ + "ORIGIN_NAME char(64),"+ + "WEIGHT int unsigned default 1,"+ + "LAST_PLAY_DATETIME datetime,"+ + "PLAY_COUNTER int unsigned default 0,"+ + "CODING_FORMAT int unsigned,"+ + "SAMPLE_RATE int unsigned,"+ + "BIT_RATE int unsigned,"+ + "CHANNELS int unsigned,"+ + "PLAY_GAIN int default 0,"+ + "START_POINT int default -1,"+ + "END_POINT int default -1,"+ + "FADEUP_POINT int default -1,"+ + "FADEDOWN_POINT int default -1,"+ + "SEGUE_START_POINT int default -1,"+ + "SEGUE_END_POINT int default -1,"+ + "HOOK_START_POINT int default -1,"+ + "HOOK_END_POINT int default -1,"+ + "TALK_START_POINT int default -1,"+ + "TALK_END_POINT int default -1,"+ + "index CART_NUMBER_IDX (CART_NUMBER),"+ + "index DESCRIPTION_IDX (DESCRIPTION),"+ + "index OUTCUE_IDX (OUTCUE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create SERVICES table +// + sql=QString("create table if not exists SERVICES (")+ + "NAME char(10) not null primary key,"+ + "DESCRIPTION char(255),"+ + "NAME_TEMPLATE char(255),"+ + "DESCRIPTION_TEMPLATE char(255),"+ + "PROGRAM_CODE char(255),"+ + "CHAIN_LOG enum('N','Y') default 'N',"+ + "TRACK_GROUP char(10),"+ + "AUTOSPOT_GROUP char(10),"+ + "AUTO_REFRESH enum('N','Y') default 'N',"+ + "DEFAULT_LOG_SHELFLIFE int default -1,"+ + "ELR_SHELFLIFE int default -1,"+ + "TFC_PATH char(255),"+ + "TFC_PREIMPORT_CMD text,"+ + "TFC_WIN_PATH char(255),"+ + "TFC_WIN_PREIMPORT_CMD text,"+ + "TFC_IMPORT_TEMPLATE char(64) default \"Rivendell Standard Import\","+ + "TFC_LABEL_CART char(32),"+ + "TFC_TRACK_CART char(32),"+ + "TFC_BREAK_STRING char(64),"+ + "TFC_TRACK_STRING char(64),"+ + "TFC_CART_OFFSET int,"+ + "TFC_CART_LENGTH int,"+ + "TFC_TITLE_OFFSET int,"+ + "TFC_TITLE_LENGTH int,"+ + "TFC_START_OFFSET int,"+ + "TFC_START_LENGTH int,"+ + "TFC_HOURS_OFFSET int,"+ + "TFC_HOURS_LENGTH int,"+ + "TFC_MINUTES_OFFSET int,"+ + "TFC_MINUTES_LENGTH int,"+ + "TFC_SECONDS_OFFSET int,"+ + "TFC_SECONDS_LENGTH int,"+ + "TFC_LEN_HOURS_OFFSET int,"+ + "TFC_LEN_HOURS_LENGTH int,"+ + "TFC_LEN_MINUTES_OFFSET int,"+ + "TFC_LEN_MINUTES_LENGTH int,"+ + "TFC_LEN_SECONDS_OFFSET int,"+ + "TFC_LEN_SECONDS_LENGTH int,"+ + "TFC_LENGTH_OFFSET int,"+ + "TFC_LENGTH_LENGTH int,"+ + "TFC_DATA_OFFSET int,"+ + "TFC_DATA_LENGTH int,"+ + "TFC_EVENT_ID_OFFSET int,"+ + "TFC_EVENT_ID_LENGTH int,"+ + "TFC_ANNC_TYPE_OFFSET int,"+ + "TFC_ANNC_TYPE_LENGTH int,"+ + "MUS_PATH char(255),"+ + "MUS_PREIMPORT_CMD text,"+ + "MUS_WIN_PATH char(255),"+ + "MUS_WIN_PREIMPORT_CMD text,"+ + "MUS_IMPORT_TEMPLATE char(64) default \"Rivendell Standard Import\","+ + "MUS_LABEL_CART char(32),"+ + "MUS_TRACK_CART char(32),"+ + "MUS_BREAK_STRING char(64),"+ + "MUS_TRACK_STRING char(64),"+ + "MUS_CART_OFFSET int,"+ + "MUS_CART_LENGTH int,"+ + "MUS_TITLE_OFFSET int,"+ + "MUS_TITLE_LENGTH int,"+ + "MUS_START_OFFSET int,"+ + "MUS_START_LENGTH int,"+ + "MUS_HOURS_OFFSET int,"+ + "MUS_HOURS_LENGTH int,"+ + "MUS_MINUTES_OFFSET int,"+ + "MUS_MINUTES_LENGTH int,"+ + "MUS_SECONDS_OFFSET int,"+ + "MUS_SECONDS_LENGTH int,"+ + "MUS_LEN_HOURS_OFFSET int,"+ + "MUS_LEN_HOURS_LENGTH int,"+ + "MUS_LEN_MINUTES_OFFSET int,"+ + "MUS_LEN_MINUTES_LENGTH int,"+ + "MUS_LEN_SECONDS_OFFSET int,"+ + "MUS_LEN_SECONDS_LENGTH int,"+ + "MUS_LENGTH_OFFSET int,"+ + "MUS_LENGTH_LENGTH int,"+ + "MUS_DATA_OFFSET int,"+ + "MUS_DATA_LENGTH int,"+ + "MUS_EVENT_ID_OFFSET int,"+ + "MUS_EVENT_ID_LENGTH int,"+ + "MUS_ANNC_TYPE_OFFSET int,"+ + "MUS_ANNC_TYPE_LENGTH int)"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create GROUPS table +// + sql=QString("create table if not exists GROUPS (")+ + "NAME char(10) not null primary key,"+ + "DESCRIPTION char(255),"+ + "DEFAULT_CART_TYPE int unsigned default 1,"+ + "DEFAULT_LOW_CART int unsigned default 0,"+ + "DEFAULT_HIGH_CART int unsigned default 0,"+ + "CUT_SHELFLIFE int default -1,"+ + "DELETE_EMPTY_CARTS enum('N','Y') default 'N',"+ + "DEFAULT_TITLE char(255) default \"Imported from %f.%e\","+ + "ENFORCE_CART_RANGE enum('N','Y') default 'N',"+ + "REPORT_TFC enum('N','Y') default 'Y',"+ + "REPORT_MUS enum('N','Y') default 'Y',"+ + "ENABLE_NOW_NEXT enum('N','Y') default 'N',"+ + "COLOR char(7),"+ + "index IDX_REPORT_TFC (REPORT_TFC),"+ + "index IDX_REPORT_MUS (REPORT_MUS))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create AUDIO_PERMS table +// + sql=QString("create table if not exists AUDIO_PERMS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "GROUP_NAME char(10),"+ + "SERVICE_NAME char(10),"+ + "index GROUP_IDX (GROUP_NAME),"+ + "index SERVICE_IDX (SERVICE_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create RDLIBRARY table +// + sql=QString("create table if not exists RDLIBRARY (")+ + "ID int unsigned primary key auto_increment,"+ + "STATION char(40) not null,"+ + "INSTANCE int unsigned not null,"+ + "INPUT_CARD int default 0,"+ + "INPUT_STREAM int default 0,"+ + "INPUT_PORT int default 0,"+ + "INPUT_TYPE enum('A','D') default 'A',"+ + "OUTPUT_CARD int default 0,"+ + "OUTPUT_STREAM int default 0,"+ + "OUTPUT_PORT int default 0,"+ + "VOX_THRESHOLD int default -5000,"+ + "TRIM_THRESHOLD int default 0,"+ + "RECORD_GPI int default -1,"+ + "PLAY_GPI int default -1,"+ + "STOP_GPI int default -1,"+ + "DEFAULT_FORMAT int unsigned default 0,"+ + "DEFAULT_CHANNELS int unsigned default 2,"+ + "DEFAULT_SAMPRATE int unsigned default 44100,"+ + "DEFAULT_LAYER int unsigned default 0,"+ + "DEFAULT_BITRATE int unsigned default 0,"+ + "DEFAULT_RECORD_MODE int unsigned default 0,"+ + "DEFAULT_TRIM_STATE enum('N','Y') default 'N',"+ + "MAXLENGTH INT,"+ + "TAIL_PREROLL int unsigned default 1500,"+ + "RIPPER_DEVICE char(64) default \"/dev/cdrom\","+ + "PARANOIA_LEVEL int default 0,"+ + "RIPPER_LEVEL int default -1300,"+ + "CDDB_SERVER char(64) default \"freedb.freedb.org\","+ + "READ_ISRC enum('N','Y') default 'Y',"+ + "ENABLE_EDITOR enum('N','Y') default 'N',"+ + "SRC_CONVERTER int default 1,"+ + "LIMIT_SEARCH int default 1,"+ + "SEARCH_LIMITED enum('N','Y') default 'Y',"+ + "index STATION_IDX (STATION,INSTANCE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create TRIGGERS table +// + sql=QString("create table if not exists TRIGGERS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "CUT_NAME char(12),"+ + "TRIGGER_CODE int unsigned,"+ + "OFFSET int unsigned,"+ + "index CUT_NAME_IDX (CUT_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create TTYS table +// + sql=QString("create table if not exists TTYS (")+ + "ID int unsigned not null primary key auto_increment,"+ + "PORT_ID int unsigned not null,"+ + "ACTIVE enum('N','Y') not null default 'N',"+ + "STATION_NAME char(64) not null,"+ + "PORT char(20),"+ + "BAUD_RATE int default 9600,"+ + "DATA_BITS int default 8,"+ + "STOP_BITS int default 1,"+ + "PARITY int default 0,"+ + "TERMINATION int default 0,"+ + "index STATION_NAME_IDX (STATION_NAME),"+ + "index ACTIVE_IDX (ACTIVE),"+ + "index PORT_ID_IDX (PORT_ID))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create DECKS table +// + sql=QString("create table if not exists DECKS (")+ + "ID int unsigned not null primary key auto_increment,"+ + "STATION_NAME char(64) not null,"+ + "CHANNEL int unsigned not null,"+ + "CARD_NUMBER int default -1,"+ + "STREAM_NUMBER int default -1,"+ + "PORT_NUMBER int default -1,"+ + "MON_PORT_NUMBER int default -1,"+ + "DEFAULT_MONITOR_ON enum('N','Y') default 'N',"+ + "PORT_TYPE enum('A','D') default 'A',"+ + "DEFAULT_FORMAT int default 0,"+ + "DEFAULT_CHANNELS int default 2,"+ + "DEFAULT_SAMPRATE int default 44100,"+ + "DEFAULT_BITRATE int default 0,"+ + "DEFAULT_THRESHOLD int default 0,"+ + "SWITCH_STATION char(64),"+ + "SWITCH_MATRIX int default -1,"+ + "SWITCH_OUTPUT int default -1,"+ + "SWITCH_DELAY int default 0,"+ + "index STATION_NAME_IDX (STATION_NAME),"+ + "index CHANNEL_IDX (CHANNEL))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create RECORDINGS table +// + sql=QString("create table if not exists RECORDINGS (")+ + "ID int unsigned not null primary key auto_increment,"+ + "IS_ACTIVE enum('N','Y') default 'Y',"+ + "STATION_NAME char(64) not null,"+ + "TYPE int default 0,"+ + "CHANNEL int unsigned not null,"+ + "CUT_NAME char(12) not null,"+ + "SUN enum('N','Y') default 'N',"+ + "MON enum('N','Y') default 'N',"+ + "TUE enum('N','Y') default 'N',"+ + "WED enum('N','Y') default 'N',"+ + "THU enum('N','Y') default 'N',"+ + "FRI enum('N','Y') default 'N',"+ + "SAT enum('N','Y') default 'N',"+ + "DESCRIPTION char(64),"+ + "START_TYPE int unsigned default 0,"+ + "START_TIME time,"+ + "START_LENGTH int default 0,"+ + "START_MATRIX int default -1,"+ + "START_LINE int default -1,"+ + "START_OFFSET int default 0,"+ + "END_TYPE int default 0,"+ + "END_TIME time,"+ + "END_LENGTH int default 0,"+ + "END_MATRIX int default -1,"+ + "END_LINE int default -1,"+ + "LENGTH int unsigned,"+ + "START_GPI int default -1,"+ + "END_GPI int default -1,"+ + "ALLOW_MULT_RECS enum('N','Y') default 'N',"+ + "MAX_GPI_REC_LENGTH int unsigned default 3600000,"+ + "TRIM_THRESHOLD int,"+ + "NORMALIZE_LEVEL int default -1300,"+ + "STARTDATE_OFFSET int unsigned default 0,"+ + "ENDDATE_OFFSET int unsigned default 0,"+ + "EVENTDATE_OFFSET int default 0,"+ + "FORMAT int default 0,"+ + "CHANNELS int default 2,"+ + "SAMPRATE int default 44100,"+ + "BITRATE int default 0,"+ + "QUALITY int default 0,"+ + "MACRO_CART int default -1,"+ + "SWITCH_INPUT int default -1,"+ + "SWITCH_OUTPUT int default -1,"+ + "EXIT_CODE int default 0,"+ + "EXIT_TEXT text,"+ + "ONE_SHOT enum('N','Y') default 'N',"+ + "URL char(255),"+ + "URL_USERNAME char(64),"+ + "URL_PASSWORD char(64),"+ + "ENABLE_METADATA enum('N','Y') default 'N',"+ + "FEED_ID int default -1,"+ + "index STATION_NAME_IDX (STATION_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create AUDIO_PORTS table +// + sql=QString("create table if not exists AUDIO_PORTS (")+ + "ID int unsigned not null primary key auto_increment,"+ + "STATION_NAME char(64) not null,"+ + "CARD_NUMBER int not null,"+ + "CLOCK_SOURCE int default 0,"+ + "INPUT_0_LEVEL int default 0,"+ + "INPUT_0_TYPE int default 0,"+ + "INPUT_0_MODE int default 0,"+ + "INPUT_1_LEVEL int default 0,"+ + "INPUT_1_TYPE int default 0,"+ + "INPUT_1_MODE int default 0,"+ + "INPUT_2_LEVEL int default 0,"+ + "INPUT_2_TYPE int default 0,"+ + "INPUT_2_MODE int default 0,"+ + "INPUT_3_LEVEL int default 0,"+ + "INPUT_3_TYPE int default 0,"+ + "INPUT_3_MODE int default 0,"+ + "INPUT_4_LEVEL int default 0,"+ + "INPUT_4_TYPE int default 0,"+ + "INPUT_4_MODE int default 0,"+ + "INPUT_5_LEVEL int default 0,"+ + "INPUT_5_TYPE int default 0,"+ + "INPUT_5_MODE int default 0,"+ + "INPUT_6_LEVEL int default 0,"+ + "INPUT_6_TYPE int default 0,"+ + "INPUT_6_MODE int default 0,"+ + "INPUT_7_LEVEL int default 0,"+ + "INPUT_7_TYPE int default 0,"+ + "INPUT_7_MODE int default 0,"+ + "OUTPUT_0_LEVEL int default 0,"+ + "OUTPUT_1_LEVEL int default 0,"+ + "OUTPUT_2_LEVEL int default 0,"+ + "OUTPUT_3_LEVEL int default 0,"+ + "OUTPUT_4_LEVEL int default 0,"+ + "OUTPUT_5_LEVEL int default 0,"+ + "OUTPUT_6_LEVEL int default 0,"+ + "OUTPUT_7_LEVEL int default 0,"+ + "index STATION_NAME_IDX (STATION_NAME),"+ + "index CARD_NUMBER_IDX (CARD_NUMBER))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create LOGS table +// + sql=QString("create table if not exists LOGS (")+ + "NAME char(64) not null primary key,"+ + "LOG_EXISTS enum('N','Y') default 'Y',"+ + "TYPE int not null default 0,"+ + "SERVICE char(10) not null,"+ + "DESCRIPTION char(64),"+ + "ORIGIN_USER char(255) not null,"+ + "ORIGIN_DATETIME datetime not null,"+ + "LINK_DATETIME datetime,"+ + "MODIFIED_DATETIME datetime not null,"+ + "AUTO_REFRESH enum('N','Y') default 'N',"+ + "START_DATE date,"+ + "END_DATE date,"+ + "PURGE_DATE date,"+ + "IMPORT_DATE date,"+ + "SCHEDULED_TRACKS int unsigned default 0,"+ + "COMPLETED_TRACKS int unsigned default 0,"+ + "MUSIC_LINKS int default 0,"+ + "MUSIC_LINKED enum('N','Y') default 'N',"+ + "TRAFFIC_LINKS int default 0,"+ + "TRAFFIC_LINKED enum('N','Y') default 'N',"+ + "NEXT_ID int default 0,"+ + "index NAME_IDX (NAME,LOG_EXISTS),"+ + "index SERVICE_IDX (SERVICE),"+ + "index DESCRIPTION_IDX (DESCRIPTION),"+ + "index ORIGIN_USER_IDX (ORIGIN_USER),"+ + "index START_DATE_IDX (START_DATE),"+ + "index END_DATE_IDX (END_DATE),"+ + "index TYPE_IDX(TYPE,LOG_EXISTS))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create VERSION table +// + sql=QString("create table if not exists VERSION (")+ + " DB int not null primary key,"+ + " LAST_MAINT_DATETIME datetime default \"1970-01-01 00:00:00\","+ + " LAST_ISCI_XREFERENCE datetime default \"1970-01-01 00:00:00\")"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create RDAIRPLAY Table + // + sql=QString("create table if not exists RDAIRPLAY (")+ + "ID int not null primary key auto_increment,"+ + "STATION char(40) not null,"+ + "CARD0 int default 0,"+ + "PORT0 int default 0,"+ + "START_RML0 char(255),"+ + "STOP_RML0 char(255),"+ + "CARD1 int default 0,"+ + "PORT1 int default 0,"+ + "START_RML1 char(255),"+ + "STOP_RML1 char(255),"+ + "CARD2 int default 0,"+ + "PORT2 int default 0,"+ + "START_RML2 char(255),"+ + "STOP_RML2 char(255),"+ + "CARD3 int default 0,"+ + "PORT3 int default 0,"+ + "START_RML3 char(255),"+ + "STOP_RML3 char(255),"+ + "CARD4 int default 0,"+ + "PORT4 int default 0,"+ + "START_RML4 char(255),"+ + "STOP_RML4 char(255),"+ + "CARD5 int default 0,"+ + "PORT5 int default 0,"+ + "START_RML5 char(255),"+ + "STOP_RML5 char(255),"+ + "CARD6 int default 0,"+ + "PORT6 int default 0,"+ + "START_RML6 char(255),"+ + "STOP_RML6 char(255),"+ + "CARD7 int default 0,"+ + "PORT7 int default 0,"+ + "START_RML7 char(255),"+ + "STOP_RML7 char(255),"+ + "CARD8 int default 0,"+ + "PORT8 int default 0,"+ + "START_RML8 char(255),"+ + "STOP_RML8 char(255),"+ + "CARD9 int default 0,"+ + "PORT9 int default 0,"+ + "START_RML9 char(255),"+ + "STOP_RML9 char(255),"+ + "SEGUE_LENGTH int default 250,"+ + "TRANS_LENGTH int default 50,"+ + "OP_MODE int default 2,"+ + "START_MODE int default 0,"+ + "LOG_MODE_STYLE int default 0,"+ + "PIE_COUNT_LENGTH int default 15000,"+ + "PIE_COUNT_ENDPOINT int default 0,"+ + "CHECK_TIMESYNC enum('N','Y') default 'N',"+ + "STATION_PANELS int default 3,"+ + "USER_PANELS int default 3,"+ + "SHOW_AUX_1 enum('N','Y') default 'Y',"+ + "SHOW_AUX_2 enum('N','Y') default 'Y',"+ + "CLEAR_FILTER enum('N','Y') default 'N',"+ + "DEFAULT_TRANS_TYPE int default 0,"+ + "BAR_ACTION int unsigned default 0,"+ + "FLASH_PANEL enum('N','Y') default 'N',"+ + "PANEL_PAUSE_ENABLED enum('N','Y') default 'N',"+ + "BUTTON_LABEL_TEMPLATE char(32) default \"%t\","+ + "PAUSE_ENABLED enum('N','Y'),"+ + "DEFAULT_SERVICE char(10),"+ + "HOUR_SELECTOR_ENABLED enum('N','Y') default 'N',"+ + "TITLE_TEMPLATE char(64) default '%t',"+ + "ARTIST_TEMPLATE char(64) default '%a',"+ + "OUTCUE_TEMPLATE char(64) default '%o',"+ + "DESCRIPTION_TEMPLATE char(64) default '%i',"+ + "UDP_ADDR0 char(255),"+ + "UDP_PORT0 int unsigned,"+ + "UDP_STRING0 char(255),"+ + "LOG_RML0 char(255),"+ + "UDP_ADDR1 char(255),"+ + "UDP_PORT1 int unsigned,"+ + "UDP_STRING1 char(255),"+ + "LOG_RML1 char(255),"+ + "UDP_ADDR2 char(255),"+ + "UDP_PORT2 int unsigned,"+ + "UDP_STRING2 char(255),"+ + "LOG_RML2 char(255),"+ + "EXIT_CODE int default 0,"+ + "EXIT_PASSWORD char(41) default \"\","+ + "SKIN_PATH char(255) default \""+ + RDEscapeString(RD_DEFAULT_RDAIRPLAY_SKIN)+"\","+ + "SHOW_COUNTERS enum('N','Y') default 'N',"+ + "AUDITION_PREROLL int default 10000,"+ + "LOG0_START_MODE int default 0,"+ + "LOG0_AUTO_RESTART enum('N','Y') default 'N',"+ + "LOG0_LOG_NAME char(64),"+ + "LOG0_CURRENT_LOG char(64),"+ + "LOG0_RUNNING enum('N','Y') default 'N',"+ + "LOG0_LOG_ID int default -1,"+ + "LOG0_LOG_LINE int default -1,"+ + "LOG0_NOW_CART int unsigned default 0,"+ + "LOG0_NEXT_CART int unsigned default 0,"+ + "LOG1_START_MODE int default 0,"+ + "LOG1_AUTO_RESTART enum('N','Y') default 'N',"+ + "LOG1_LOG_NAME char(64),"+ + "LOG1_CURRENT_LOG char(64),"+ + "LOG1_RUNNING enum('N','Y') default 'N',"+ + "LOG1_LOG_ID int default -1,"+ + "LOG1_LOG_LINE int default -1,"+ + "LOG1_NOW_CART int unsigned default 0,"+ + "LOG1_NEXT_CART int unsigned default 0,"+ + "LOG2_START_MODE int default 0,"+ + "LOG2_AUTO_RESTART enum('N','Y') default 'N',"+ + "LOG2_LOG_NAME char(64),"+ + "LOG2_CURRENT_LOG char(64),"+ + "LOG2_RUNNING enum('N','Y') default 'N',"+ + "LOG2_LOG_ID int default -1,"+ + "LOG2_LOG_LINE int default -1,"+ + "LOG2_NOW_CART int unsigned default 0,"+ + "LOG2_NEXT_CART int unsigned default 0,"+ + "index STATION_IDX (STATION))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create PANELS Table + // + sql=QString("create table if not exists PANELS (")+ + "ID int auto_increment not null primary key,"+ + "TYPE int not null,"+ + "OWNER char(64) not null,"+ + "PANEL_NO int not null,"+ + "ROW_NO int not null,"+ + "COLUMN_NO int not null,"+ + "LABEL char(64),"+ + "CART int,"+ + "DEFAULT_COLOR char(7),"+ + "index LOAD_IDX (TYPE,OWNER,PANEL_NO),"+ + "index SAVE_IDX (TYPE,OWNER,PANEL_NO,ROW_NO,COLUMN_NO))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create MATRICES Table + // + sql=QString("create table if not exists MATRICES (")+ + "ID int auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "NAME char(64),"+ + "MATRIX int not null,"+ + "TYPE int not null,"+ + "LAYER int default 86,"+ + "PORT_TYPE int default 0,"+ + "PORT_TYPE_2 int default 0,"+ + "CARD int default -1,"+ + "PORT int not null,"+ + "PORT_2 int not null,"+ + "IP_ADDRESS char(16),"+ + "IP_ADDRESS_2 char(16),"+ + "IP_PORT int,"+ + "IP_PORT_2 int,"+ + "USERNAME char(32),"+ + "USERNAME_2 char(32),"+ + "PASSWORD char(32),"+ + "PASSWORD_2 char(32),"+ + "START_CART int unsigned,"+ + "STOP_CART int unsigned,"+ + "START_CART_2 int unsigned,"+ + "STOP_CART_2 int unsigned,"+ + "GPIO_DEVICE char(255),"+ + "INPUTS int not null,"+ + "OUTPUTS int not null,"+ + "GPIS int not null,"+ + "GPOS int not null,"+ + "FADERS int default 0,"+ + "DISPLAYS int default 0,"+ + "index MATRIX_IDX (STATION_NAME,MATRIX))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create INPUTS Table + // + sql=QString("create table if not exists INPUTS (")+ + "ID int auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "MATRIX int not null,"+ + "NUMBER int not null,"+ + "NAME char(64),"+ + "FEED_NAME char(8),"+ + "CHANNEL_MODE int,"+ + "ENGINE_NUM int default -1,"+ + "DEVICE_NUM int default -1,"+ + "NODE_HOSTNAME char(255),"+ + "NODE_TCP_PORT int,"+ + "NODE_SLOT int,"+ + "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER),"+ + "index NODE_IDX (STATION_NAME,MATRIX,NUMBER,NODE_HOSTNAME,NODE_TCP_PORT))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create OUTPUTS Table + // + sql=QString("create table if not exists OUTPUTS (")+ + "ID int auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "MATRIX int not null,"+ + "NUMBER int not null,"+ + "NAME char(64),"+ + "ENGINE_NUM int default -1,"+ + "DEVICE_NUM int default -1,"+ + "NODE_HOSTNAME char(255),"+ + "NODE_TCP_PORT int,"+ + "NODE_SLOT int,"+ + "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER),"+ + "index NODE_IDX (STATION_NAME,MATRIX,NUMBER,NODE_HOSTNAME,NODE_TCP_PORT))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create GPIS Table + // + sql=QString("create table if not exists GPIS (")+ + "ID int auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "MATRIX int not null,"+ + "NUMBER int not null,"+ + "MACRO_CART int default 0,"+ + "OFF_MACRO_CART int default 0,"+ + "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create EVENTS table +// + sql=QString("create table if not exists EVENTS (")+ + "NAME char(64) not null primary key,"+ + "PROPERTIES char(64),"+ + "DISPLAY_TEXT char(64),"+ + "NOTE_TEXT char(255),"+ + "PREPOSITION int default -1,"+ + "TIME_TYPE int default 0,"+ + "GRACE_TIME int default 0,"+ + "POST_POINT enum('N','Y') default 'N',"+ + "USE_AUTOFILL enum('N','Y') default 'N',"+ + "AUTOFILL_SLOP int default -1,"+ + "USE_TIMESCALE enum('N','Y') default 'N',"+ + "IMPORT_SOURCE int default 0,"+ + "START_SLOP int default 0,"+ + "END_SLOP int default 0,"+ + "FIRST_TRANS_TYPE int default 0,"+ + "DEFAULT_TRANS_TYPE int default 0,"+ + "COLOR char(7),"+ + "SCHED_GROUP varchar(10),"+ + "TITLE_SEP INT(10) UNSIGNED,"+ + "HAVE_CODE varchar(10),"+ + "HAVE_CODE2 varchar(10),"+ + "HOR_SEP INT(10) UNSIGNED,"+ + "HOR_DIST INT(10) UNSIGNED,"+ + "NESTED_EVENT char(64),"+ + "REMARKS char(255))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create CLOCKS table +// + sql=QString("create table if not exists CLOCKS (")+ + "NAME char(64) not null primary key,"+ + "SHORT_NAME char(8),"+ + "ARTISTSEP int(10) unsigned,"+ + "COLOR char(7),"+ + "REMARKS char(255))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create AUTOFILLS table +// + sql=QString("create table if not exists AUTOFILLS (")+ + "ID int not null primary key auto_increment,"+ + "SERVICE char(10),"+ + "CART_NUMBER int unsigned,"+ + "index SERVICE_IDX (SERVICE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create HOSTVARS table +// + sql=QString("create table if not exists HOSTVARS (")+ + "ID int not null primary key auto_increment,"+ + "STATION_NAME char(64) not null,"+ + "NAME char(32) not null,"+ + "VARVALUE char(255),"+ + "REMARK char(255),"+ + "index NAME_IDX (STATION_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create SERVICE_PERMS Table + // + sql=QString("create table if not exists SERVICE_PERMS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "STATION_NAME char(64),"+ + "SERVICE_NAME char(10),"+ + "index STATION_IDX (STATION_NAME),"+ + "index SERVICE_IDX (SERVICE_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create REPORTS Table + // + sql=QString("create table if not exists REPORTS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "NAME char(64) not null unique,"+ + "DESCRIPTION char(64),"+ + "EXPORT_FILTER int,"+ + "EXPORT_PATH char(255),"+ + "POST_EXPORT_CMD text,"+ + "WIN_EXPORT_PATH char(255),"+ + "WIN_POST_EXPORT_CMD text,"+ + "EXPORT_TFC enum('N','Y') default 'N',"+ + "FORCE_TFC enum('N','Y') default 'N',"+ + "EXPORT_MUS enum('N','Y') default 'N',"+ + "FORCE_MUS enum('N','Y') default 'N',"+ + "EXPORT_GEN enum('N','Y') default 'N',"+ + "STATION_ID char(16),"+ + "CART_DIGITS int unsigned default 6,"+ + "USE_LEADING_ZEROS enum('N','Y') default 'N',"+ + "LINES_PER_PAGE int default 66,"+ + "SERVICE_NAME char(64),"+ + "STATION_TYPE int default 0,"+ + "STATION_FORMAT char(64),"+ + "FILTER_ONAIR_FLAG enum('N','Y') default 'N',"+ + "FILTER_GROUPS enum('N','Y') default 'N',"+ + "START_TIME time,"+ + "END_TIME time,"+ + "index IDX_NAME (NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create REPORT_SERVICES Table + // + sql=QString("create table if not exists REPORT_SERVICES (")+ + "ID int unsigned auto_increment not null primary key,"+ + "REPORT_NAME char(64) not null,"+ + "SERVICE_NAME char(10),"+ + "index IDX_REPORT_NAME (REPORT_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create REPORT_STATIONS Table + // + sql=QString("create table if not exists REPORT_STATIONS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "REPORT_NAME char(64) not null,"+ + "STATION_NAME char(64),"+ + "index IDX_REPORT_NAME (REPORT_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create REPORT_GROUPS Table + // + sql=QString("create table if not exists REPORT_GROUPS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "REPORT_NAME char(64) not null,"+ + "GROUP_NAME char(10),"+ + "index IDX_REPORT_NAME (REPORT_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create CLOCK_PERMS Table + // + sql=QString("create table if not exists CLOCK_PERMS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "CLOCK_NAME char(64),"+ + "SERVICE_NAME char(10),"+ + "index STATION_IDX (CLOCK_NAME),"+ + "index SERVICE_IDX (SERVICE_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create EVENT_PERMS Table + // + sql=QString("create table if not exists EVENT_PERMS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "EVENT_NAME char(64),"+ + "SERVICE_NAME char(10),"+ + "index STATION_IDX (EVENT_NAME),"+ + "index SERVICE_IDX (SERVICE_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create USER_PERMS table + // + sql=QString("create table if not exists USER_PERMS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "USER_NAME char(255),"+ + "GROUP_NAME char(10),"+ + "index USER_IDX (USER_NAME),"+ + "index GROUP_IDX (GROUP_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create VGUEST_RESOURCES Table + // + sql=QString("create table if not exists VGUEST_RESOURCES (")+ + "ID int unsigned auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "MATRIX_NUM int not null,"+ + "VGUEST_TYPE int not null,"+ + "NUMBER int not null,"+ + "ENGINE_NUM int default -1,"+ + "DEVICE_NUM int default -1,"+ + "SURFACE_NUM int default 0,"+ + "RELAY_NUM int default -1,"+ + "BUSS_NUM int default -1,"+ + "index STATION_MATRIX_IDX (STATION_NAME,MATRIX_NUM,VGUEST_TYPE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create RDLOGEDIT table +// + sql=QString("create table if not exists RDLOGEDIT (")+ + "ID int unsigned primary key auto_increment,"+ + "STATION char(64) not null,"+ + "INPUT_CARD int default -1,"+ + "INPUT_PORT int default 0,"+ + "OUTPUT_CARD int default -1,"+ + "OUTPUT_PORT int default 0,"+ + "FORMAT int unsigned default 0,"+ + "SAMPRATE int unsigned default 44100,"+ + "LAYER int unsigned default 0,"+ + "BITRATE int unsigned default 0,"+ + "ENABLE_SECOND_START enum('N','Y') default 'Y',"+ + "DEFAULT_CHANNELS int unsigned default 2,"+ + "MAXLENGTH int default 0,"+ + "TAIL_PREROLL int unsigned default 2000,"+ + "START_CART int unsigned default 0,"+ + "END_CART int unsigned default 0,"+ + "REC_START_CART int unsigned default 0,"+ + "REC_END_CART int unsigned default 0,"+ + "TRIM_THRESHOLD int default -3000,"+ + "RIPPER_LEVEL int default -1300,"+ + "DEFAULT_TRANS_TYPE int default 0,"+ + "index STATION_IDX (STATION))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + +// +// Create RDCATCH table +// + sql=QString("create table if not exists RDCATCH (")+ + "ID int unsigned primary key auto_increment,"+ + "STATION char(64) not null,"+ + "ERROR_RML char(255),"+ + "index STATION_IDX (STATION))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create SCHED_CODES Table + // + sql=QString("create table if not exists SCHED_CODES (")+ + "CODE varchar(10) not null primary key,"+ + "DESCRIPTION varchar(255))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create DROPBOXES Table + // + sql=QString("create table if not exists DROPBOXES (")+ + "ID int auto_increment not null primary key,"+ + "STATION_NAME char(64),"+ + "GROUP_NAME char(10),"+ + "PATH char(255),"+ + "NORMALIZATION_LEVEL int default 1,"+ + "AUTOTRIM_LEVEL int default 1,"+ + "SINGLE_CART enum('N','Y') default 'N',"+ + "TO_CART int unsigned default 0,"+ + "USE_CARTCHUNK_ID enum('N','Y') default 'N',"+ + "TITLE_FROM_CARTCHUNK_ID enum('N','Y') default 'N',"+ + "DELETE_CUTS enum('N','Y') default 'N',"+ + "DELETE_SOURCE enum('N','Y') default 'Y',"+ + "METADATA_PATTERN char(64),"+ + "STARTDATE_OFFSET int default 0,"+ + "ENDDATE_OFFSET int default 0,"+ + "FIX_BROKEN_FORMATS enum('N','Y') default 'N',"+ + "LOG_PATH char(255),"+ + "IMPORT_CREATE_DATES enum('N','Y') default 'N',"+ + "CREATE_STARTDATE_OFFSET int default 0,"+ + "CREATE_ENDDATE_OFFSET int default 0,"+ + "SET_USER_DEFINED char(255),"+ + "index STATION_NAME_IDX (STATION_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create RDPANEL Table + // + sql=QString("create table if not exists RDPANEL (")+ + "ID int not null primary key auto_increment,"+ + "STATION char(40) not null,"+ + "INSTANCE int unsigned not null,"+ + "CARD2 int default 0,"+ + "PORT2 int default 0,"+ + "START_RML2 char(255),"+ + "STOP_RML2 char(255),"+ + "CARD3 int default 0,"+ + "PORT3 int default 0,"+ + "START_RML3 char(255),"+ + "STOP_RML3 char(255),"+ + "CARD6 int default 0,"+ + "PORT6 int default 0,"+ + "START_RML6 char(255),"+ + "STOP_RML6 char(255),"+ + "CARD7 int default 0,"+ + "PORT7 int default 0,"+ + "START_RML7 char(255),"+ + "STOP_RML7 char(255),"+ + "CARD8 int default 0,"+ + "PORT8 int default 0,"+ + "START_RML8 char(255),"+ + "STOP_RML8 char(255),"+ + "CARD9 int default 0,"+ + "PORT9 int default 0,"+ + "START_RML9 char(255),"+ + "STOP_RML9 char(255),"+ + "STATION_PANELS int default 3,"+ + "USER_PANELS int default 3,"+ + "CLEAR_FILTER enum('N','Y') default 'N',"+ + "FLASH_PANEL enum('N','Y') default 'N',"+ + "PANEL_PAUSE_ENABLED enum('N','Y') default 'N',"+ + "BUTTON_LABEL_TEMPLATE char(32) default \"%t\","+ + "DEFAULT_SERVICE char(10),"+ + "SKIN_PATH char(255) default \""+RD_DEFAULT_RDPANEL_SKIN+"\","+ + "index STATION_IDX (STATION,INSTANCE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create EXTENDED_PANELS Table + // + sql=QString("create table if not exists EXTENDED_PANELS (")+ + "ID int auto_increment not null primary key,"+ + "TYPE int not null,"+ + "OWNER char(64) not null,"+ + "PANEL_NO int not null,"+ + "ROW_NO int not null,"+ + "COLUMN_NO int not null,"+ + "LABEL char(64),"+ + "CART int,"+ + "DEFAULT_COLOR char(7),"+ + "index LOAD_IDX (TYPE,OWNER,PANEL_NO),"+ + "index SAVE_IDX (TYPE,OWNER,PANEL_NO,ROW_NO,COLUMN_NO))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create PANEL_NAMES Table + // + sql=QString("create table if not exists PANEL_NAMES (")+ + "ID int auto_increment not null primary key,"+ + "TYPE int not null,"+ + "OWNER char(64) not null,"+ + "PANEL_NO int not null,"+ + "NAME char(64),"+ + "index LOAD_IDX (TYPE,OWNER,PANEL_NO))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create EXTENDED_PANEL_NAMES Table + // + sql=QString("create table if not exists EXTENDED_PANEL_NAMES (")+ + "ID int auto_increment not null primary key,"+ + "TYPE int not null,"+ + "OWNER char(64) not null,"+ + "PANEL_NO int not null,"+ + "NAME char(64),"+ + "index LOAD_IDX (TYPE,OWNER,PANEL_NO))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create FEEDS Table + // + sql=QString("create table if not exists FEEDS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "KEY_NAME char(8) unique not null,"+ + "CHANNEL_TITLE char(255),"+ + "CHANNEL_DESCRIPTION text,"+ + "CHANNEL_CATEGORY char(64),"+ + "CHANNEL_LINK char(255),"+ + "CHANNEL_COPYRIGHT char(64),"+ + "CHANNEL_WEBMASTER char(64),"+ + "CHANNEL_LANGUAGE char(5) default \"en-us\","+ + "BASE_URL char(255),"+ + "BASE_PREAMBLE char(255),"+ + "PURGE_URL char(255),"+ + "PURGE_USERNAME char(64),"+ + "PURGE_PASSWORD char(64),"+ + "HEADER_XML text,"+ + "CHANNEL_XML text,"+ + "ITEM_XML text,"+ + "CAST_ORDER enum('N','Y') default 'N',"+ + "MAX_SHELF_LIFE int,"+ + "LAST_BUILD_DATETIME datetime,"+ + "ORIGIN_DATETIME datetime,"+ + "ENABLE_AUTOPOST enum('N','Y') default 'N',"+ + "KEEP_METADATA enum('N','Y') default 'Y',"+ + "UPLOAD_FORMAT int default 2,"+ + "UPLOAD_CHANNELS int default 2,"+ + "UPLOAD_SAMPRATE int default 44100,"+ + "UPLOAD_BITRATE int default 32000,"+ + "UPLOAD_QUALITY int default 0,"+ + "UPLOAD_EXTENSION char(16) default \"mp3\","+ + "NORMALIZE_LEVEL int default -100,"+ + "REDIRECT_PATH char(255),"+ + "MEDIA_LINK_MODE int default 0,"+ + "index KEY_NAME_IDX(KEY_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create PODCASTS Table + // + sql=QString("create table if not exists PODCASTS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "FEED_ID int unsigned not null,"+ + "STATUS int unsigned default 1,"+ + "ITEM_TITLE char(255),"+ + "ITEM_DESCRIPTION text,"+ + "ITEM_CATEGORY char(64),"+ + "ITEM_LINK char(255),"+ + "ITEM_COMMENTS char(255),"+ + "ITEM_AUTHOR char(255),"+ + "ITEM_SOURCE_TEXT char(64),"+ + "ITEM_SOURCE_URL char(255),"+ + "AUDIO_FILENAME char(255),"+ + "AUDIO_LENGTH int unsigned,"+ + "AUDIO_TIME int unsigned,"+ + "SHELF_LIFE int,"+ + "ORIGIN_DATETIME datetime,"+ + "EFFECTIVE_DATETIME datetime,"+ + "index FEED_ID_IDX(FEED_ID,ORIGIN_DATETIME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create AUX_METADATA Table + // + sql=QString("create table if not exists AUX_METADATA (")+ + "ID int unsigned auto_increment not null primary key,"+ + "FEED_ID int unsigned,"+ + "VAR_NAME char(16),"+ + "CAPTION char(64),"+ + "index FEED_ID_IDX(FEED_ID))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create FEED_PERMS table + // + sql=QString("create table if not exists FEED_PERMS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "USER_NAME char(255),"+ + "KEY_NAME char(8),"+ + "index USER_IDX (USER_NAME),"+ + "index KEYNAME_IDX (KEY_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create WEB_CONNECTIONS Table + // + sql=QString("create table if not exists WEB_CONNECTIONS (")+ + "SESSION_ID int unsigned not null primary key,"+ + "LOGIN_NAME char(255),"+ + "IP_ADDRESS char(16),"+ + "TIME_STAMP datetime)"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create SWITCHER_NODES Table + // + sql=QString("create table if not exists SWITCHER_NODES (")+ + "ID int not null auto_increment primary key,"+ + "STATION_NAME char(64),"+ + "MATRIX int,"+ + "BASE_OUTPUT int default 0,"+ + "HOSTNAME char(64),"+ + "PASSWORD char(64),"+ + "TCP_PORT int,"+ + "DESCRIPTION char(255),"+ + "index STATION_IDX (STATION_NAME,MATRIX))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create ENCODERS Table + // + sql=QString("create table if not exists ENCODERS (")+ + "ID int not null auto_increment primary key,"+ + "NAME char(32) not null,"+ + "STATION_NAME char(64),"+ + "COMMAND_LINE char(255),"+ + "DEFAULT_EXTENSION char(16),"+ + "index NAME_IDX(NAME,STATION_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + // Ensure that dynamic format IDs start after 100 + sql="insert into ENCODERS set ID=100,NAME=\"dummy\""; + if(!RunQuery(err_str,sql)) { + return false; + } + sql="delete from ENCODERS where ID=100"; + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create ENCODER_BITRATES Table + // + sql=QString("create table if not exists ENCODER_BITRATES (")+ + "ID int not null auto_increment primary key,"+ + "ENCODER_ID int not null,"+ + "BITRATES int not null,"+ + "index ENCODER_ID_IDX(ENCODER_ID))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create ENCODER_CHANNELS Table + // + sql=QString("create table if not exists ENCODER_CHANNELS (")+ + "ID int not null auto_increment primary key,"+ + "ENCODER_ID int not null,"+ + "CHANNELS int not null,"+ + "index ENCODER_ID_IDX(ENCODER_ID))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create ENCODER_SAMPLERATES Table + // + sql=QString("create table if not exists ENCODER_SAMPLERATES (")+ + "ID int not null auto_increment primary key,"+ + "ENCODER_ID int not null,"+ + "SAMPLERATES int not null,"+ + "index ENCODER_ID_IDX(ENCODER_ID))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create GPOS Table + // + sql=QString("create table if not exists GPOS (")+ + "ID int auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "MATRIX int not null,"+ + "NUMBER int not null,"+ + "MACRO_CART int default 0,"+ + "OFF_MACRO_CART int default 0,"+ + "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // DROPBOX_PATHS Table + // + sql=QString("create table if not exists DROPBOX_PATHS (")+ + "ID int auto_increment not null primary key,"+ + "DROPBOX_ID int not null,"+ + "FILE_PATH char(255) not null,"+ + "FILE_DATETIME datetime,"+ + "index FILE_PATH_IDX (DROPBOX_ID,FILE_PATH))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create NOWNEXT_PLUGINS Table + // + sql=QString("create table if not exists NOWNEXT_PLUGINS (")+ + "ID int auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "LOG_MACHINE int unsigned not null default 0,"+ + "PLUGIN_PATH char(255),"+ + "PLUGIN_ARG char(255),"+ + "index STATION_IDX (STATION_NAME,LOG_MACHINE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create SYSTEM Table + // + sql=QString("create table if not exists SYSTEM (")+ + "ID int auto_increment not null primary key,"+ + QString().sprintf("SAMPLE_RATE int unsigned default %d,", + RD_DEFAULT_SAMPLE_RATE)+ + "DUP_CART_TITLES enum('N','Y') not null default 'Y',"+ + QString().sprintf("MAX_POST_LENGTH int unsigned default %u,", + RD_DEFAULT_MAX_POST_LENGTH)+ + "ISCI_XREFERENCE_PATH char(255),"+ + "TEMP_CART_GROUP char(10))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create IMPORT_TEMPLATES table + // + sql=QString("create table if not exists IMPORT_TEMPLATES (")+ + "NAME char(64) not null primary key,"+ + "CART_OFFSET int,"+ + "CART_LENGTH int,"+ + "TITLE_OFFSET int,"+ + "TITLE_LENGTH int,"+ + "HOURS_OFFSET int,"+ + "HOURS_LENGTH int,"+ + "MINUTES_OFFSET int,"+ + "MINUTES_LENGTH int,"+ + "SECONDS_OFFSET int,"+ + "SECONDS_LENGTH int,"+ + "LEN_HOURS_OFFSET int,"+ + "LEN_HOURS_LENGTH int,"+ + "LEN_MINUTES_OFFSET int,"+ + "LEN_MINUTES_LENGTH int,"+ + "LEN_SECONDS_OFFSET int,"+ + "LEN_SECONDS_LENGTH int,"+ + "LENGTH_OFFSET int,"+ + "LENGTH_LENGTH int,"+ + "DATA_OFFSET int,"+ + "DATA_LENGTH int,"+ + "EVENT_ID_OFFSET int,"+ + "EVENT_ID_LENGTH int,"+ + "ANNC_TYPE_OFFSET int,"+ + "ANNC_TYPE_LENGTH int)"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + UpdateImportFormats(); + + // + // Create REPLICATORS Table + // + sql=QString("create table if not exists REPLICATORS (")+ + "NAME char(32) not null primary key,"+ + "DESCRIPTION char(64),"+ + "TYPE_ID int unsigned not null,"+ + "STATION_NAME char(64),"+ + "FORMAT int unsigned default 0,"+ + "CHANNELS int unsigned default 2,"+ + QString().sprintf("SAMPRATE int unsigned default %u,", + RD_DEFAULT_SAMPLE_RATE)+ + "BITRATE int unsigned default 0,"+ + "QUALITY int unsigned default 0,"+ + "URL char(255),"+ + "URL_USERNAME char(64),"+ + "URL_PASSWORD char(64),"+ + "ENABLE_METADATA enum('N','Y') default 'N',"+ + "NORMALIZATION_LEVEL int default 0,"+ + "index TYPE_ID_IDX (TYPE_ID))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create REPLICATOR_MAP Table + // + sql=QString("create table if not exists REPLICATOR_MAP (")+ + "ID int unsigned not null auto_increment primary key,"+ + "REPLICATOR_NAME char(32) not null,"+ + "GROUP_NAME char(10) not null,"+ + "index REPLICATOR_NAME_IDX(REPLICATOR_NAME),"+ + "index GROUP_NAME_IDX(GROUP_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create REPL_CART_STATE Table + // + sql=QString("create table if not exists REPL_CART_STATE (")+ + "ID int unsigned not null auto_increment primary key,"+ + "REPLICATOR_NAME char(32) not null,"+ + "CART_NUMBER int unsigned not null,"+ + "POSTED_FILENAME char(255),"+ + "ITEM_DATETIME datetime not null,"+ + "REPOST enum('N','Y') default 'N',"+ + "unique REPLICATOR_NAME_IDX(REPLICATOR_NAME,CART_NUMBER,POSTED_FILENAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create REPL_CUT_STATE Table + // + sql=QString("create table if not exists REPL_CUT_STATE (")+ + "ID int unsigned not null auto_increment primary key,"+ + "REPLICATOR_NAME char(32) not null,"+ + "CUT_NAME char(12) not null,"+ + "ITEM_DATETIME datetime not null,"+ + "unique REPLICATOR_NAME_IDX(REPLICATOR_NAME,CUT_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create ISCI_XREFERENCE Table + // + sql=QString("create table if not exists ISCI_XREFERENCE (")+ + "ID int unsigned not null auto_increment primary key,"+ + "CART_NUMBER int unsigned not null,"+ + "ISCI char(32) not null,"+ + "FILENAME char(64) not null,"+ + "LATEST_DATE date not null,"+ + "TYPE char(1) not null,"+ + "ADVERTISER_NAME char(30),"+ + "PRODUCT_NAME char(35),"+ + "CREATIVE_TITLE char(30),"+ + "REGION_NAME char(80),"+ + "index CART_NUMBER_IDX(CART_NUMBER),"+ + "index TYPE_IDX(TYPE,LATEST_DATE),"+ + "index LATEST_DATE_IDX(LATEST_DATE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create RDHOTKEYS table + // + sql=QString("create table if not exists RDHOTKEYS (")+ + "ID int unsigned not null auto_increment primary key,"+ + "STATION_NAME char(64),"+ + "MODULE_NAME char(64),"+ + "KEY_ID int,"+ + "KEY_VALUE char(64),"+ + "KEY_LABEL char(64))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create JACK_CLIENTS Table + // + sql=QString("create table if not exists JACK_CLIENTS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "DESCRIPTION char(64),"+ + "COMMAND_LINE text not null,"+ + "index IDX_STATION_NAME (STATION_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create CARTSLOTS Table + // + sql=QString("create table if not exists CARTSLOTS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "SLOT_NUMBER int unsigned not null,"+ + "MODE int not null default 0,"+ + "DEFAULT_MODE int not null default -1,"+ + "STOP_ACTION int not null default 0,"+ + "DEFAULT_STOP_ACTION int not null default -1,"+ + "CART_NUMBER int default 0,"+ + "DEFAULT_CART_NUMBER int not null default 0,"+ + "HOOK_MODE int default 0,"+ + "DEFAULT_HOOK_MODE int not null default -1,"+ + "SERVICE_NAME char(10),"+ + "CARD int not null default 0,"+ + "INPUT_PORT int not null default 0,"+ + "OUTPUT_PORT int not null default 0,"+ + "index STATION_NAME_IDX(STATION_NAME,SLOT_NUMBER))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create LIVEWIRE_GPIO_SLOTS table + // + sql=QString("create table if not exists LIVEWIRE_GPIO_SLOTS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "MATRIX int not null,"+ + "SLOT int not null,"+ + "IP_ADDRESS char(15),"+ + "SOURCE_NUMBER int,"+ + "index STATION_NAME_IDX(STATION_NAME,MATRIX))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create RDAIRPLAY_CHANNELS table + // + sql=QString("create table if not exists RDAIRPLAY_CHANNELS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "INSTANCE int unsigned not null,"+ + "CARD int not null default 0,"+ + "PORT int not null default 0,"+ + "START_RML char(255),"+ + "STOP_RML char(255),"+ + "GPIO_TYPE int unsigned default 0,"+ + "START_GPI_MATRIX int not null default -1,"+ + "START_GPI_LINE int not null default -1,"+ + "START_GPO_MATRIX int not null default -1,"+ + "START_GPO_LINE int not null default -1,"+ + "STOP_GPI_MATRIX int not null default -1,"+ + "STOP_GPI_LINE int not null default -1,"+ + "STOP_GPO_MATRIX int not null default -1,"+ + "STOP_GPO_LINE int not null default -1,"+ + "index STATION_NAME_IDX(STATION_NAME,INSTANCE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create RDPANEL_CHANNELS table + // + sql=QString("create table if not exists RDPANEL_CHANNELS (")+ + "ID int unsigned auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "INSTANCE int unsigned not null,"+ + "CARD int not null default 0,"+ + "PORT int not null default 0,"+ + "START_RML char(255),"+ + "STOP_RML char(255),"+ + "GPIO_TYPE int unsigned default 0,"+ + "START_GPI_MATRIX int not null default -1,"+ + "START_GPI_LINE int not null default -1,"+ + "START_GPO_MATRIX int not null default -1,"+ + "START_GPO_LINE int not null default -1,"+ + "STOP_GPI_MATRIX int not null default -1,"+ + "STOP_GPI_LINE int not null default -1,"+ + "STOP_GPO_MATRIX int not null default -1,"+ + "STOP_GPO_LINE int not null default -1,"+ + "index STATION_NAME_IDX(STATION_NAME,INSTANCE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create LOG_MODES table + // + sql=QString("create table if not exists LOG_MODES (")+ + "ID int unsigned auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "MACHINE int unsigned not null,"+ + "START_MODE int not null default 0,"+ + "OP_MODE int not null default 2,"+ + "index STATION_NAME_IDX(STATION_NAME,MACHINE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create DROPBOX_SCHED_CODES table + // + sql=QString("create table if not exists DROPBOX_SCHED_CODES(")+ + "ID int auto_increment not null primary key,"+ + "DROPBOX_ID int not null,"+ + "SCHED_CODE char(11) not null," + "index DROPBOX_ID_IDX(DROPBOX_ID),"+ + "index SCHED_CODE_IDX(SCHED_CODE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create GPIO_EVENTS table + // + sql=QString("create table if not exists GPIO_EVENTS(")+ + "ID int auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "MATRIX int not null,"+ + "NUMBER int not null,"+ + "TYPE int not null,"+ + "EDGE int not null,"+ + "EVENT_DATETIME datetime not null,"+ + "index STATION_NAME_IDX(STATION_NAME,MATRIX,TYPE,EVENT_DATETIME,EDGE))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create CUT_EVENTS table + // + sql=QString("create table if not exists CUT_EVENTS(")+ + "ID int auto_increment not null primary key,"+ + "CUT_NAME char(12) not null,"+ + "NUMBER int not null,"+ + "POINT int not null,"+ + "index CUT_NAME_IDX(CUT_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create DECK_EVENTS table + // + sql=QString("create table if not exists DECK_EVENTS(")+ + "ID int auto_increment not null primary key,"+ + "STATION_NAME char(64) not null,"+ + "CHANNEL int unsigned not null,"+ + "NUMBER int not null,"+ + "CART_NUMBER int unsigned not null default 0,"+ + "index STATION_NAME_IDX(STATION_NAME,CHANNEL))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create SERVICE_CLOCKS table + // + sql=QString("create table if not exists SERVICE_CLOCKS(")+ + "ID int auto_increment not null primary key,"+ + "SERVICE_NAME char(10) not null,"+ + "HOUR int not null,"+ + "CLOCK_NAME char(64) default null,"+ + "index SERVICE_NAME_IDX(SERVICE_NAME,HOUR),"+ + "index CLOCK_NAME_IDX(CLOCK_NAME))"+ + config->createTablePostfix(); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Write Schema Version + // + sql=QString().sprintf("insert into VERSION set DB=%u", + RD_VERSION3_BASE_DATABASE); + if(!RunQuery(err_str,sql)) { + return false; + } + + // + // Create System Entry + // + sql=QString("insert into SYSTEM set ID=1"); + if(!RunQuery(err_str,sql)) { + return false; + } + + return true; +} + + +bool RDUpdateDb(QString *err_str,int schema,RDConfig *config) +{ + return true; +} +*/ diff --git a/lib/rddb.h b/lib/rddb.h index 2aada8b5..ac648636 100644 --- a/lib/rddb.h +++ b/lib/rddb.h @@ -1,9 +1,9 @@ // rddb.h // -// Database driver with automatic reconnect +// Database driver with automatic error reporting and recovery // // (C) Copyright 2007 Dan Mills -// (C) Copyright 2016 Fred Gleason +// (C) Copyright 2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -19,47 +19,29 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef RDDB_INC -#define RDDB_INC +#ifndef RDDB_H +#define RDDB_H -#include -#include -#include +#include +#include +#include #include -class RDSqlDatabaseStatus : public QObject -{ - Q_OBJECT - signals: - void logText(RDConfig::LogPriority prio,const QString &msg); - void reconnected(); - void connectionFailed (); - private: - RDSqlDatabaseStatus (); - bool discon; - friend RDSqlDatabaseStatus * RDDbStatus(); - public: - void sendRecon(); - void sendDiscon(QString query); -}; - - class RDSqlQuery : public QSqlQuery { public: - RDSqlQuery(const QString &query=QString::null,bool reconnect=true); + RDSqlQuery(const QString &query = QString::null,bool reconnect=true); + int columns() const; static QVariant run(const QString &sql,bool *ok=NULL); static bool apply(const QString &sql,QString *err_msg=NULL); static int rows(const QString &sql); + + private: + int sql_columns; }; -// Setup the default database, returns true on success. -// if error is non NULL, an error string will be appended to it -// if there is a problem. -QSqlDatabase * RDInitDb(unsigned *schema,QString *error=NULL); +bool RDOpenDb(int *schema,QString *err_str,RDConfig *config); -// Return a handle to the database status object. -RDSqlDatabaseStatus * RDDbStatus(); -#endif +#endif // RDDB_H diff --git a/lib/rddelete.h b/lib/rddelete.h index 38126b8b..244656e6 100644 --- a/lib/rddelete.h +++ b/lib/rddelete.h @@ -22,7 +22,7 @@ #define RDDELETE_H #include -#include +#include #include @@ -44,7 +44,7 @@ class RDDelete : public QObject static QString errorText(RDDelete::ErrorCode err); private: - QUrl conv_target_url; + Q3Url conv_target_url; RDConfig *conv_config; }; diff --git a/lib/rddownload.h b/lib/rddownload.h index da6300a9..ddca6225 100644 --- a/lib/rddownload.h +++ b/lib/rddownload.h @@ -22,7 +22,7 @@ #define RDDOWNLOAD_H #include -#include +#include #include @@ -56,7 +56,7 @@ class RDDownload : public QObject void UpdateProgress(int step); friend int DownloadProgressCallback(void *clientp,double dltotal,double dlnow, double ultotal,double ulnow); - QUrl conv_src_url; + Q3Url conv_src_url; QString conv_dst_filename; bool conv_aborting; uint conv_dst_size; diff --git a/lib/rdedit_audio.cpp b/lib/rdedit_audio.cpp index b6809a93..04d13c07 100644 --- a/lib/rdedit_audio.cpp +++ b/lib/rdedit_audio.cpp @@ -23,6 +23,15 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include #include "rd.h" #include "rdapplication.h" @@ -175,14 +184,14 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card, edit_pause_button=new RDTransportButton(RDTransportButton::Pause,this); edit_pause_button->setGeometry(160,425,65,45); - edit_pause_button->setOnColor(QColor(red)); + edit_pause_button->setOnColor(QColor(Qt::red)); edit_pause_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_pause_button,SIGNAL(clicked()),this,SLOT(pauseData())); edit_stop_button=new RDTransportButton(RDTransportButton::Stop,this); edit_stop_button->setGeometry(230,425,65,45); edit_stop_button->on(); - edit_stop_button->setOnColor(QColor(red)); + edit_stop_button->setOnColor(QColor(Qt::red)); edit_stop_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_stop_button,SIGNAL(clicked()),this,SLOT(stopData())); @@ -206,7 +215,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card, // QLabel *amp_label=new QLabel(this,"amp_label"); amp_label->setGeometry(742,5,80,16); - amp_label->setAlignment(AlignHCenter|AlignVCenter); + amp_label->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); amp_label->setFont(button_font); amp_label->setText(tr("Amplitude")); @@ -229,7 +238,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card, // QLabel *time_label=new QLabel(this); time_label->setGeometry(760,143,40,16); - time_label->setAlignment(AlignHCenter|AlignVCenter); + time_label->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); time_label->setFont(button_font); time_label->setText(tr("Time")); @@ -264,7 +273,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card, // QLabel *goto_label=new QLabel(this); goto_label->setGeometry(760,378,40,16); - goto_label->setAlignment(AlignHCenter|AlignVCenter); + goto_label->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); goto_label->setFont(button_font); goto_label->setText(tr("Goto")); @@ -616,14 +625,13 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card, edit_trim_box=new QSpinBox(this); edit_trim_box->setGeometry(243,529,70,21); edit_trim_box->setAcceptDrops(false); - edit_trim_box->setValidator(0); edit_trim_box->setSuffix(tr(" dB")); edit_trim_box->setRange(-99,0); edit_trim_box-> setValue((trim_level+REFERENCE_LEVEL)/100); QLabel *label=new QLabel(tr("Threshold"),this); label->setGeometry(238,513,70,15); - label->setAlignment(AlignHCenter); + label->setAlignment(Qt::AlignHCenter); label->setFont(QFont(small_font)); QPushButton *trim_start_button=new QPushButton(this); trim_start_button->setGeometry(175,485,66,45); @@ -644,7 +652,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card, // // Cut Gain Control // - edit_gain_control=new QRangeControl(); + edit_gain_control=new Q3RangeControl(); edit_gain_control->setRange(-1000,1000); edit_gain_control->setSteps(10,10); edit_gain_edit=new RDMarkerEdit(this); @@ -653,7 +661,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card, connect(edit_gain_edit,SIGNAL(returnPressed()),this,SLOT(gainChangedData())); label=new QLabel(tr("Cut Gain"),this); label->setGeometry(388,513,70,15); - label->setAlignment(AlignHCenter); + label->setAlignment(Qt::AlignHCenter); label->setFont(QFont(small_font)); RDTransportButton *gain_up_button=new RDTransportButton(RDTransportButton::Up,this); @@ -691,7 +699,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card, label=new QLabel(edit_overlap_box,tr("No Fade on Segue Out"),this); label->setGeometry(590,513,130,20); label->setFont(small_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Time Counters @@ -756,13 +764,13 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card, tr("Unable to download peak data, error was:\n\"")+ RDPeaksExport::errorText(conv_err)+"\"."); } - edit_wave_array=new QPointArray(EDITAUDIO_WAVEFORM_WIDTH-2); + edit_wave_array=new Q3PointArray(EDITAUDIO_WAVEFORM_WIDTH-2); DrawMaps(); // // The Edit Menu // - edit_menu=new QPopupMenu(this); + edit_menu=new Q3PopupMenu(this); connect(edit_menu,SIGNAL(aboutToShow()),this,SLOT(updateMenuData())); edit_menu->insertItem(tr("Delete Talk Markers"),this, SLOT(deleteTalkData()),0,RDEditAudio::TalkStart); @@ -878,7 +886,7 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,int card, DrawPointers(); setCursor(*edit_arrow_cursor); setMouseTracking(true); - setFocusPolicy(StrongFocus); + setFocusPolicy(Qt::StrongFocus); UpdateCursors(); UpdateCounters(); @@ -1660,7 +1668,7 @@ void RDEditAudio::paintEvent(QPaintEvent *e) // // Waveforms // - p->setPen(QColor(black)); + p->setPen(QColor(Qt::black)); if(edit_channels==1) { p->drawImage(11,11,edit_left_image); } @@ -1738,36 +1746,36 @@ void RDEditAudio::mousePressEvent(QMouseEvent *e) cursor=(int)((((double)e->x()-10.0)*edit_factor_x+ (double)edit_hscroll->value())*1152.0); switch(e->button()) { - case QMouseEvent::LeftButton: - left_button_pressed=true; - if(edit_cue_point!=RDEditAudio::Play) { - ignore_pause=true; - PositionCursor(cursor); - ignore_pause=false; - } - else { - ignore_pause=true; - rda->cae()->positionPlay(edit_handle,GetTime(cursor)); - ignore_pause=false; - } - break; + case Qt::LeftButton: + left_button_pressed=true; + if(edit_cue_point!=RDEditAudio::Play) { + ignore_pause=true; + PositionCursor(cursor); + ignore_pause=false; + } + else { + ignore_pause=true; + rda->cae()->positionPlay(edit_handle,GetTime(cursor)); + ignore_pause=false; + } + break; - case QMouseEvent::MidButton: - center_button_pressed=true; - ignore_pause=true; - rda->cae()->positionPlay(edit_handle,GetTime(cursor)); - ignore_pause=false; - break; + case Qt::MidButton: + center_button_pressed=true; + ignore_pause=true; + rda->cae()->positionPlay(edit_handle,GetTime(cursor)); + ignore_pause=false; + break; - case QMouseEvent::RightButton: - edit_menu->setGeometry(e->x(),e->y()+53, - edit_menu->sizeHint().width(), - edit_menu->sizeHint().height()); - edit_menu->exec(); - break; + case Qt::RightButton: + edit_menu->setGeometry(e->x(),e->y()+53, + edit_menu->sizeHint().width(), + edit_menu->sizeHint().height()); + edit_menu->exec(); + break; - default: - break; + default: + break; } } } @@ -1776,11 +1784,11 @@ void RDEditAudio::mousePressEvent(QMouseEvent *e) void RDEditAudio::mouseReleaseEvent(QMouseEvent *e) { switch(e->button()) { - case QMouseEvent::LeftButton: + case Qt::LeftButton: left_button_pressed=false; break; - case QMouseEvent::MidButton: + case Qt::MidButton: center_button_pressed=false; break; @@ -1793,54 +1801,54 @@ void RDEditAudio::mouseReleaseEvent(QMouseEvent *e) void RDEditAudio::keyPressEvent(QKeyEvent *e) { switch(e->key()) { - case Key_Space: - if(is_playing) { - stopData(); - } - else { - if(e->state()==0) { - playCursorData(); - } - if((e->state()&ControlButton)!=0) { - playStartData(); - } - } - e->accept(); - break; + case Qt::Key_Space: + if(is_playing) { + stopData(); + } + else { + if(e->state()==0) { + playCursorData(); + } + if((e->state()&Qt::ControlButton)!=0) { + playStartData(); + } + } + e->accept(); + break; - case Key_Left: - PositionCursor(-(edit_sample_rate/10),true); - e->accept(); - break; + case Qt::Key_Left: + PositionCursor(-(edit_sample_rate/10),true); + e->accept(); + break; - case Key_Right: - PositionCursor(edit_sample_rate/10,true); - e->accept(); - break; + case Qt::Key_Right: + PositionCursor(edit_sample_rate/10,true); + e->accept(); + break; - case Key_Plus: - xUp(); - break; + case Qt::Key_Plus: + xUp(); + break; - case Key_Minus: - xDown(); - break; + case Qt::Key_Minus: + xDown(); + break; - case Key_Home: - gotoHomeData(); - break; + case Qt::Key_Home: + gotoHomeData(); + break; - case Key_End: - gotoEndData(); - break; + case Qt::Key_End: + gotoEndData(); + break; - case Key_Delete: - DeleteMarkerData(edit_cue_point); - break; + case Qt::Key_Delete: + DeleteMarkerData(edit_cue_point); + break; - default: - e->ignore(); - break; + default: + e->ignore(); + break; } } @@ -1857,31 +1865,31 @@ void RDEditAudio::DeleteMarkerData(int id) return; } switch(id) { - case RDEditAudio::Start: - case RDEditAudio::TalkStart: - case RDEditAudio::SegueStart: - case RDEditAudio::HookStart: - edit_cursors[id]=-1; - edit_cursors[id+1]=-1; - edit_cursor_edit[id]->clear(); - edit_cursor_edit[id+1]->clear(); - break; + case RDEditAudio::Start: + case RDEditAudio::TalkStart: + case RDEditAudio::SegueStart: + case RDEditAudio::HookStart: + edit_cursors[id]=-1; + edit_cursors[id+1]=-1; + edit_cursor_edit[id]->clear(); + edit_cursor_edit[id+1]->clear(); + break; - case RDEditAudio::End: - case RDEditAudio::TalkEnd: - case RDEditAudio::SegueEnd: - case RDEditAudio::HookEnd: - edit_cursors[id]=-1; - edit_cursors[id-1]=-1; - edit_cursor_edit[id]->clear(); - edit_cursor_edit[id-1]->clear(); - break; + case RDEditAudio::End: + case RDEditAudio::TalkEnd: + case RDEditAudio::SegueEnd: + case RDEditAudio::HookEnd: + edit_cursors[id]=-1; + edit_cursors[id-1]=-1; + edit_cursor_edit[id]->clear(); + edit_cursor_edit[id-1]->clear(); + break; - case RDEditAudio::FadeUp: - case RDEditAudio::FadeDown: - edit_cursors[id]=-1; - edit_cursor_edit[id]->clear(); - break; + case RDEditAudio::FadeUp: + case RDEditAudio::FadeDown: + edit_cursors[id]=-1; + edit_cursor_edit[id]->clear(); + break; } UpdateCursors(); UpdateCounters(); @@ -1892,45 +1900,48 @@ void RDEditAudio::PreRoll(int cursor,RDEditAudio::CuePoints point) { int prepoint=cursor-edit_preroll; switch(point) { - case RDEditAudio::SegueEnd: - if(prepoint>1152*edit_cursors[RDEditAudio::SegueStart]) { - rda->cae()->positionPlay(edit_handle,GetTime(prepoint)); - } - else { - rda->cae()->positionPlay(edit_handle, - GetTime(1152*edit_cursors[RDEditAudio::SegueStart])); - } - break; - case RDEditAudio::End: - if(prepoint>1152*edit_cursors[RDEditAudio::Start]) { - rda->cae()->positionPlay(edit_handle,GetTime(prepoint)); - } - else { - rda->cae()->positionPlay(edit_handle, - GetTime(1152*edit_cursors[RDEditAudio::Start])); - } - break; - case RDEditAudio::TalkEnd: - if(prepoint>1152*edit_cursors[RDEditAudio::TalkStart]) { - rda->cae()->positionPlay(edit_handle,GetTime(prepoint)); - } - else { - rda->cae()->positionPlay(edit_handle, - GetTime(1152*edit_cursors[RDEditAudio::TalkStart])); - } - break; - case RDEditAudio::HookEnd: - if(prepoint>1152*edit_cursors[RDEditAudio::HookStart]) { - rda->cae()->positionPlay(edit_handle,GetTime(prepoint)); - } - else { - rda->cae()->positionPlay(edit_handle, - GetTime(1152*edit_cursors[RDEditAudio::HookStart])); - } - break; + case RDEditAudio::SegueEnd: + if(prepoint>1152*edit_cursors[RDEditAudio::SegueStart]) { + rda->cae()->positionPlay(edit_handle,GetTime(prepoint)); + } + else { + rda->cae()->positionPlay(edit_handle, + GetTime(1152*edit_cursors[RDEditAudio::SegueStart])); + } + break; - default: - break; + case RDEditAudio::End: + if(prepoint>1152*edit_cursors[RDEditAudio::Start]) { + rda->cae()->positionPlay(edit_handle,GetTime(prepoint)); + } + else { + rda->cae()->positionPlay(edit_handle, + GetTime(1152*edit_cursors[RDEditAudio::Start])); + } + break; + + case RDEditAudio::TalkEnd: + if(prepoint>1152*edit_cursors[RDEditAudio::TalkStart]) { + rda->cae()->positionPlay(edit_handle,GetTime(prepoint)); + } + else { + rda->cae()->positionPlay(edit_handle, + GetTime(1152*edit_cursors[RDEditAudio::TalkStart])); + } + break; + + case RDEditAudio::HookEnd: + if(prepoint>1152*edit_cursors[RDEditAudio::HookStart]) { + rda->cae()->positionPlay(edit_handle,GetTime(prepoint)); + } + else { + rda->cae()->positionPlay(edit_handle, + GetTime(1152*edit_cursors[RDEditAudio::HookStart])); + } + break; + + default: + break; } } @@ -1938,168 +1949,168 @@ void RDEditAudio::PreRoll(int cursor,RDEditAudio::CuePoints point) bool RDEditAudio::PositionCursor(int cursor,bool relative) { switch(edit_cue_point) { - case RDEditAudio::Start: - case RDEditAudio::TalkStart: - case RDEditAudio::HookStart: - case RDEditAudio::SegueStart: - if((edit_cursors[edit_cue_point+1]==-1)&&(cursor!=-1)) { - edit_cursors[edit_cue_point+1]=edit_cursors[RDEditAudio::End]; - edit_cursor_edit[edit_cue_point+1]-> - setText(RDGetTimeLength( - (int)(1152000.0*(double)edit_cursors[edit_cue_point+1]/ - (double)edit_sample_rate),true)); - } - if(relative) { - if((edit_cursors[edit_cue_point]+cursor/1152)> - edit_cursors[edit_cue_point+1]) { - return false; - } - if(((edit_cursors[edit_cue_point]+cursor/1152)< - edit_cursors[RDEditAudio::Start])&& - (edit_cue_point!=RDEditAudio::Start)) { - return false; - } - edit_cursors[edit_cue_point]+=cursor/1152; - cursor=edit_cursors[edit_cue_point]*1152; - } - else { - if((cursor/1152)>edit_cursors[edit_cue_point+1]) { - return false; - } - if(((cursor/1152) - setText(RDGetTimeLength((int)(1000.0*(double)cursor/ - (double)edit_sample_rate),true)); - rda->cae()->positionPlay(edit_handle,GetTime(cursor)); - break; + case RDEditAudio::Start: + case RDEditAudio::TalkStart: + case RDEditAudio::HookStart: + case RDEditAudio::SegueStart: + if((edit_cursors[edit_cue_point+1]==-1)&&(cursor!=-1)) { + edit_cursors[edit_cue_point+1]=edit_cursors[RDEditAudio::End]; + edit_cursor_edit[edit_cue_point+1]-> + setText(RDGetTimeLength( + (int)(1152000.0*(double)edit_cursors[edit_cue_point+1]/ + (double)edit_sample_rate),true)); + } + if(relative) { + if((edit_cursors[edit_cue_point]+cursor/1152)> + edit_cursors[edit_cue_point+1]) { + return false; + } + if(((edit_cursors[edit_cue_point]+cursor/1152)< + edit_cursors[RDEditAudio::Start])&& + (edit_cue_point!=RDEditAudio::Start)) { + return false; + } + edit_cursors[edit_cue_point]+=cursor/1152; + cursor=edit_cursors[edit_cue_point]*1152; + } + else { + if((cursor/1152)>edit_cursors[edit_cue_point+1]) { + return false; + } + if(((cursor/1152) + setText(RDGetTimeLength((int)(1000.0*(double)cursor/ + (double)edit_sample_rate),true)); + rda->cae()->positionPlay(edit_handle,GetTime(cursor)); + break; - case RDEditAudio::End: - case RDEditAudio::TalkEnd: - case RDEditAudio::HookEnd: - case RDEditAudio::SegueEnd: - if((edit_cursors[edit_cue_point-1]==-1)&&(cursor!=-1)) { - edit_cursors[edit_cue_point-1]=edit_cursors[RDEditAudio::Start]; - edit_cursor_edit[edit_cue_point-1]-> - setText(RDGetTimeLength( - (int)(1152000.0*(double)edit_cursors[edit_cue_point-1]/ - (double)edit_sample_rate),true)); - } - if(relative) { - if((edit_cursors[edit_cue_point]+cursor/1152)< - edit_cursors[edit_cue_point-1]) { - return false; - } - if(((edit_cursors[edit_cue_point]+cursor/1152)> - edit_cursors[RDEditAudio::End])&& - (edit_cue_point!=RDEditAudio::End)) { - return false; - } - if((edit_cue_point==RDEditAudio::End)&& - ((1152*edit_cursors[edit_cue_point]+cursor) - >(int)edit_sample_length)) { - cursor=edit_sample_length- - 1152*edit_cursors[edit_cue_point];; - } - edit_cursors[edit_cue_point]+=cursor/1152; - cursor=edit_cursors[edit_cue_point]*1152; - } - else { - if((cursor/1152)edit_cursors[RDEditAudio::End])&& - (edit_cue_point!=RDEditAudio::End)) { - return false; - } - if((edit_cue_point==RDEditAudio::End)&& - (cursor>(int)edit_sample_length)) { - cursor=edit_sample_length; - } - edit_cursors[edit_cue_point]=cursor/1152; - } - if(((edit_play_mode==RDEditAudio::Region)&& - ((edit_cue_point==edit_cue_point-1)|| - (edit_cue_point==edit_cue_point)))) { - } - edit_cursor_edit[edit_cue_point]-> - setText(RDGetTimeLength((int)(1000.0*(double)cursor/ - (double)edit_sample_rate),true)); - PreRoll(cursor,edit_cue_point); - break; - - case RDEditAudio::FadeUp: - if(relative) { - if(((edit_cursors[RDEditAudio::FadeUp]+cursor/1152)> - edit_cursors[RDEditAudio::FadeDown])&& - edit_cursors[RDEditAudio::FadeDown]==-1) { - return false; - } - if((edit_cursors[edit_cue_point]+cursor/1152)< - edit_cursors[RDEditAudio::Start]) { - return false; - } - edit_cursors[RDEditAudio::FadeUp]+=cursor/1152; - cursor=edit_cursors[RDEditAudio::FadeUp]*1152; - } - else { - if(((cursor/1152)>edit_cursors[RDEditAudio::FadeDown])&& - (edit_cursors[RDEditAudio::FadeDown]!=-1)) { - return false; - } - if(((cursor/1152)edit_cursors[RDEditAudio::End])) { - return false; - } - edit_cursors[RDEditAudio::FadeUp]=cursor/1152; - } - if(((edit_play_mode==RDEditAudio::Region)&& - ((edit_cue_point==RDEditAudio::FadeUp)))) { - } - edit_cursor_edit[RDEditAudio::FadeUp]-> - setText(RDGetTimeLength((int)(1000.0*(double)cursor/ - (double)edit_sample_rate),true)); - rda->cae()->positionPlay(edit_handle, - GetTime(edit_cursors[RDEditAudio::Start]*1152)); - break; - - case RDEditAudio::FadeDown: - if(relative) { - if((edit_cursors[RDEditAudio::FadeDown]+cursor/1152)< - edit_cursors[RDEditAudio::FadeUp]) { - return false; - } - if(((edit_cursors[RDEditAudio::FadeDown]+cursor/1152)< - edit_cursors[RDEditAudio::Start])|| - ((edit_cursors[RDEditAudio::FadeDown]+cursor/1152)> - edit_cursors[RDEditAudio::End])) { - return false; - } - edit_cursors[RDEditAudio::FadeDown]+=cursor/1152; - cursor=edit_cursors[RDEditAudio::FadeDown]*1152; - } - else { - if(((cursor/1152)edit_cursors[RDEditAudio::End])) { - return false; - } - edit_cursors[RDEditAudio::FadeDown]=cursor/1152; - } - edit_cursor_edit[RDEditAudio::FadeDown]-> - setText(RDGetTimeLength((int)(1000.0*(double)cursor/ - (double)edit_sample_rate),true)); - rda->cae()->positionPlay(edit_handle,GetTime(cursor)); - break; + case RDEditAudio::End: + case RDEditAudio::TalkEnd: + case RDEditAudio::HookEnd: + case RDEditAudio::SegueEnd: + if((edit_cursors[edit_cue_point-1]==-1)&&(cursor!=-1)) { + edit_cursors[edit_cue_point-1]=edit_cursors[RDEditAudio::Start]; + edit_cursor_edit[edit_cue_point-1]-> + setText(RDGetTimeLength( + (int)(1152000.0*(double)edit_cursors[edit_cue_point-1]/ + (double)edit_sample_rate),true)); + } + if(relative) { + if((edit_cursors[edit_cue_point]+cursor/1152)< + edit_cursors[edit_cue_point-1]) { + return false; + } + if(((edit_cursors[edit_cue_point]+cursor/1152)> + edit_cursors[RDEditAudio::End])&& + (edit_cue_point!=RDEditAudio::End)) { + return false; + } + if((edit_cue_point==RDEditAudio::End)&& + ((1152*edit_cursors[edit_cue_point]+cursor) + >(int)edit_sample_length)) { + cursor=edit_sample_length- + 1152*edit_cursors[edit_cue_point];; + } + edit_cursors[edit_cue_point]+=cursor/1152; + cursor=edit_cursors[edit_cue_point]*1152; + } + else { + if((cursor/1152)edit_cursors[RDEditAudio::End])&& + (edit_cue_point!=RDEditAudio::End)) { + return false; + } + if((edit_cue_point==RDEditAudio::End)&& + (cursor>(int)edit_sample_length)) { + cursor=edit_sample_length; + } + edit_cursors[edit_cue_point]=cursor/1152; + } + if(((edit_play_mode==RDEditAudio::Region)&& + ((edit_cue_point==edit_cue_point-1)|| + (edit_cue_point==edit_cue_point)))) { + } + edit_cursor_edit[edit_cue_point]-> + setText(RDGetTimeLength((int)(1000.0*(double)cursor/ + (double)edit_sample_rate),true)); + PreRoll(cursor,edit_cue_point); + break; - default: - break; + case RDEditAudio::FadeUp: + if(relative) { + if(((edit_cursors[RDEditAudio::FadeUp]+cursor/1152)> + edit_cursors[RDEditAudio::FadeDown])&& + edit_cursors[RDEditAudio::FadeDown]==-1) { + return false; + } + if((edit_cursors[edit_cue_point]+cursor/1152)< + edit_cursors[RDEditAudio::Start]) { + return false; + } + edit_cursors[RDEditAudio::FadeUp]+=cursor/1152; + cursor=edit_cursors[RDEditAudio::FadeUp]*1152; + } + else { + if(((cursor/1152)>edit_cursors[RDEditAudio::FadeDown])&& + (edit_cursors[RDEditAudio::FadeDown]!=-1)) { + return false; + } + if(((cursor/1152)edit_cursors[RDEditAudio::End])) { + return false; + } + edit_cursors[RDEditAudio::FadeUp]=cursor/1152; + } + if(((edit_play_mode==RDEditAudio::Region)&& + ((edit_cue_point==RDEditAudio::FadeUp)))) { + } + edit_cursor_edit[RDEditAudio::FadeUp]-> + setText(RDGetTimeLength((int)(1000.0*(double)cursor/ + (double)edit_sample_rate),true)); + rda->cae()->positionPlay(edit_handle, + GetTime(edit_cursors[RDEditAudio::Start]*1152)); + break; + + case RDEditAudio::FadeDown: + if(relative) { + if((edit_cursors[RDEditAudio::FadeDown]+cursor/1152)< + edit_cursors[RDEditAudio::FadeUp]) { + return false; + } + if(((edit_cursors[RDEditAudio::FadeDown]+cursor/1152)< + edit_cursors[RDEditAudio::Start])|| + ((edit_cursors[RDEditAudio::FadeDown]+cursor/1152)> + edit_cursors[RDEditAudio::End])) { + return false; + } + edit_cursors[RDEditAudio::FadeDown]+=cursor/1152; + cursor=edit_cursors[RDEditAudio::FadeDown]*1152; + } + else { + if(((cursor/1152)edit_cursors[RDEditAudio::End])) { + return false; + } + edit_cursors[RDEditAudio::FadeDown]=cursor/1152; + } + edit_cursor_edit[RDEditAudio::FadeDown]-> + setText(RDGetTimeLength((int)(1000.0*(double)cursor/ + (double)edit_sample_rate),true)); + rda->cae()->positionPlay(edit_handle,GetTime(cursor)); + break; + + default: + break; } ValidateMarkers(); UpdateCursors(); @@ -2567,8 +2578,8 @@ void RDEditAudio::DrawCursors(int xpos,int ypos,int xsize,int ysize,int chan) edit_cursors[RDEditAudio::Play], prev_x[chan][RDEditAudio::Play], QColor(EDITAUDIO_PLAY_COLOR), - RDEditAudio::None,20,RDEditAudio::Play, - Qt::XorROP); + RDEditAudio::None,20,RDEditAudio::Play); + // Qt::XorROP); prev_x[chan][RDEditAudio::SegueStart]=DrawCursor(xpos,ypos,xsize,ysize,chan, edit_cursors[RDEditAudio::SegueStart], @@ -2642,12 +2653,15 @@ void RDEditAudio::DrawCursors(int xpos,int ypos,int xsize,int ysize,int chan) } +//int RDEditAudio::DrawCursor(int xpos,int ypos,int xsize,int ysize,int chan, +// int samp,int prev,QColor color,Arrow arrow,int apos, +// RDEditAudio::CuePoints pt,Qt::RasterOp op) int RDEditAudio::DrawCursor(int xpos,int ypos,int xsize,int ysize,int chan, int samp,int prev,QColor color,Arrow arrow,int apos, - RDEditAudio::CuePoints pt,Qt::RasterOp op) + RDEditAudio::CuePoints pt) { int x; - QPointArray *point; + Q3PointArray *point; if(samp<0) { return 0; @@ -2656,16 +2670,15 @@ int RDEditAudio::DrawCursor(int xpos,int ypos,int xsize,int ysize,int chan, if((x!=prev)||(pt!=RDEditAudio::Play)) { QPainter *p=new QPainter(this); p->setClipRect(xpos,ypos,xsize,ysize); - p->setRasterOp(op); + // p->setRasterOp(op); p->translate(xpos,ypos); if((x>=0)&(xsetPen(color); - p->moveTo(x,0); - p->lineTo(x,ysize); + p->drawLine(x,0,x,ysize); if(arrow==RDEditAudio::Left) { p->setClipRect(0,0,xsize+xpos+10,ysize+ypos); p->setBrush(color); - point=new QPointArray(3); + point=new Q3PointArray(3); point->setPoint(0,x,apos); point->setPoint(1,x+10,apos-5); point->setPoint(2,x+10,apos+5); @@ -2679,7 +2692,7 @@ int RDEditAudio::DrawCursor(int xpos,int ypos,int xsize,int ysize,int chan, if(arrow==RDEditAudio::Right) { p->setClipRect(-10,0,xsize+10,ysize+ypos); p->setBrush(color); - point=new QPointArray(3); + point=new Q3PointArray(3); point->setPoint(0,x,apos); point->setPoint(1,x-10,apos-5); point->setPoint(2,x-10,apos+5); @@ -2768,8 +2781,8 @@ void RDEditAudio::DrawWave(int xsize,int ysize,int chan,QString label, int vert=ysize/2; double size_y=pow(10,(-((double)edit_gain)/20.0)); - ref_line=int(size_y*ysize*pow(10.0,-(double)REFERENCE_LEVEL/2000.0- - (double)edit_gain_control->value()/2000.0)/2.0); + ref_line=(int)(size_y*ysize*pow(10.0,-(double)REFERENCE_LEVEL/2000.0- + (double)edit_gain_control->value()/2000.0)/2.0); // // Grayed-Out Area @@ -2790,11 +2803,9 @@ void RDEditAudio::DrawWave(int xsize,int ysize,int chan,QString label, // // Reference Level Lines // - p->setPen(QColor(red)); - p->moveTo(0,vert+ref_line); - p->lineTo(xsize,vert+ref_line); - p->moveTo(0,vert-ref_line); - p->lineTo(xsize,vert-ref_line); + p->setPen(QColor(Qt::red)); + p->drawLine(0,vert+ref_line,xsize,vert+ref_line); + p->drawLine(0,vert-ref_line,xsize,vert-ref_line); p->translate(1,ysize/2); if(edit_peaks->energySize()>0) { @@ -2808,10 +2819,9 @@ void RDEditAudio::DrawWave(int xsize,int ysize,int chan,QString label, i+=(int)(edit_factor_x*(double)edit_sample_rate/576.0)) { offset=(int)((double)(i-origin_x)/edit_factor_x); if((offset>0)&&(offset<(EDITAUDIO_WAVEFORM_WIDTH-2))) { - p->setPen(QColor(green)); - p->moveTo(offset,-ysize/2); - p->lineTo(offset,ysize/2); - p->setPen(QColor(red)); + p->setPen(QColor(Qt::green)); + p->drawLine(offset,-ysize/2,offset,ysize/2); + p->setPen(QColor(Qt::red)); p->drawText(offset+3,ysize/2-4, RDGetTimeLength((int)((1152000.0*(double)i)/ (double)edit_sample_rate+1000.0), @@ -2862,14 +2872,13 @@ void RDEditAudio::DrawWave(int xsize,int ysize,int chan,QString label, edit_wave_array->setPoint(xsize-3,xsize-3,0); p->drawPolygon(*edit_wave_array); - p->setPen(QColor(red)); + p->setPen(QColor(Qt::red)); if(!label.isEmpty()) { p->setFont(QFont("Helvetica",24,QFont::Normal)); p->drawText(10,28-ysize/2,label); } - p->setPen(QColor(black)); - p->moveTo(0,0); - p->lineTo(xsize-3,0); + p->setPen(QColor(Qt::black)); + p->drawLine(0,0,xsize-3,0); } else { p->setFont(QFont("Helvetica",24,QFont::Bold)); diff --git a/lib/rdedit_audio.h b/lib/rdedit_audio.h index 7bcc885f..8d01461b 100644 --- a/lib/rdedit_audio.h +++ b/lib/rdedit_audio.h @@ -26,14 +26,20 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include #include #include @@ -61,9 +67,9 @@ // // Widget Colors // -#define EDITAUDIO_PLAY_COLOR white -#define EDITAUDIO_REMOVE_FLASH_COLOR blue -#define EDITAUDIO_WAVEFORM_COLOR black +#define EDITAUDIO_PLAY_COLOR Qt::white +#define EDITAUDIO_REMOVE_FLASH_COLOR Qt::blue +#define EDITAUDIO_WAVEFORM_COLOR Qt::black #define EDITAUDIO_HIGHLIGHT_COLOR colorGroup().mid() class RDEditAudio : public QDialog @@ -141,9 +147,12 @@ class RDEditAudio : public QDialog void DrawMaps(); void UpdateCursors(); void DrawCursors(int xpos,int ypos,int xsize,int ysize,int chan); + // int DrawCursor(int xpos,int ypos,int xsize,int ysize,int chan, + // int samp,int prev,QColor color,Arrow arrow,int apos, + // RDEditAudio::CuePoints pt,Qt::RasterOp op=Qt::CopyROP); int DrawCursor(int xpos,int ypos,int xsize,int ysize,int chan, int samp,int prev,QColor color,Arrow arrow,int apos, - RDEditAudio::CuePoints pt,Qt::RasterOp op=Qt::CopyROP); + RDEditAudio::CuePoints pt); void EraseCursor(int xpos,int ypos,int xsize,int ysize,int chan, int samp,int prev,QColor color,Arrow arrow,int apos); void DrawWave(int xsize,int ysize,int chan,QString label,QPixmap *pix); @@ -155,7 +164,7 @@ class RDEditAudio : public QDialog unsigned edit_sample_rate; unsigned edit_sample_length; unsigned edit_channels; - QPopupMenu *edit_menu; + Q3PopupMenu *edit_menu; QScrollBar *edit_hscroll; QImage edit_left_ref_image; QImage edit_right_ref_image; @@ -168,7 +177,7 @@ class RDEditAudio : public QDialog RDMarkerEdit *edit_cursor_edit[RDEditAudio::LastMarker]; QCursor *edit_arrow_cursor; QCursor *edit_cross_cursor; - QPointArray *edit_wave_array; + Q3PointArray *edit_wave_array; QSpinBox *edit_trim_box; RDMarkerButton *edit_cue_button[RDEditAudio::LastMarker]; QString edit_cue_string; @@ -180,7 +189,7 @@ class RDEditAudio : public QDialog RDTransportButton *edit_pause_button; RDTransportButton *edit_stop_button; RDStereoMeter *edit_meter; - QRangeControl *edit_gain_control; + Q3RangeControl *edit_gain_control; RDMarkerEdit *edit_gain_edit; QTimer *edit_gain_timer; QTimer *edit_meter_timer; diff --git a/lib/rdedit_panel_name.cpp b/lib/rdedit_panel_name.cpp index 122e5ac4..c3f45e73 100644 --- a/lib/rdedit_panel_name.cpp +++ b/lib/rdedit_panel_name.cpp @@ -56,7 +56,7 @@ RDEditPanelName::RDEditPanelName(QString *panelname,QWidget *parent) "panel_name_label"); panel_name_label->setGeometry(10,13,80,19); panel_name_label->setFont(font); - panel_name_label->setAlignment(AlignRight|ShowPrefix); + panel_name_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Ok Button diff --git a/lib/rdemptycart.cpp b/lib/rdemptycart.cpp index 3d542205..b06e63ea 100644 --- a/lib/rdemptycart.cpp +++ b/lib/rdemptycart.cpp @@ -24,6 +24,10 @@ // Icons // #include "../icons/trashcan-32x32.xpm" +//Added by qt3to4: +#include +#include +#include RDEmptyCart::RDEmptyCart(QWidget *parent) : QWidget(parent) diff --git a/lib/rdemptycart.h b/lib/rdemptycart.h index 1f40a4f0..8ab3646c 100644 --- a/lib/rdemptycart.h +++ b/lib/rdemptycart.h @@ -23,6 +23,8 @@ #include #include +//Added by qt3to4: +#include #include diff --git a/lib/rdescape_string.cpp b/lib/rdescape_string.cpp index 59cb4db8..655922cf 100644 --- a/lib/rdescape_string.cpp +++ b/lib/rdescape_string.cpp @@ -79,9 +79,9 @@ QString RDEscapeString(QString const &str) QString orig=str; QString res; - for(unsigned i=0;i +#include #include "rdconf.h" #include "rdcart.h" diff --git a/lib/rdexception_dialog.cpp b/lib/rdexception_dialog.cpp index d38f9ff9..40712f72 100644 --- a/lib/rdexception_dialog.cpp +++ b/lib/rdexception_dialog.cpp @@ -19,7 +19,7 @@ // #include -#include +#include #include #include @@ -40,7 +40,7 @@ RDExceptionDialog::RDExceptionDialog(QString report,QWidget *parent) // // Report Viewer // - report_view=new QTextView(this,"report_view"); + report_view=new Q3TextView(this,"report_view"); report_view->setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-80); report_view->setText(report); @@ -87,7 +87,7 @@ void RDExceptionDialog::saveData() { QString str1; QString str2; - QString filename=QFileDialog::getSaveFileName(RDGetHomeDir(), + QString filename=Q3FileDialog::getSaveFileName(RDGetHomeDir(), tr("Text (*.txt *.TXT)\nAll Files (*.*)"), this,tr("Export File")); if(filename.isEmpty()) { diff --git a/lib/rdexception_dialog.h b/lib/rdexception_dialog.h index 0f271337..58b2046f 100644 --- a/lib/rdexception_dialog.h +++ b/lib/rdexception_dialog.h @@ -22,7 +22,7 @@ #define RDEXCEPTION_DIALOG_H #include -#include +#include class RDExceptionDialog : public QDialog { @@ -38,7 +38,7 @@ class RDExceptionDialog : public QDialog void closeData(); private: - QTextView *report_view; + Q3TextView *report_view; }; diff --git a/lib/rdexport_settings_dialog.cpp b/lib/rdexport_settings_dialog.cpp index 704a9a67..75ccc351 100644 --- a/lib/rdexport_settings_dialog.cpp +++ b/lib/rdexport_settings_dialog.cpp @@ -20,11 +20,13 @@ #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include #include "rdapplication.h" #include "rdexport_settings_dialog.h" @@ -55,7 +57,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings, this,SLOT(formatData(const QString &))); QLabel *lib_format_label=new QLabel(lib_format_box,"Format:",this); lib_format_label->setGeometry(25,10,70,19); - lib_format_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_format_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Default Channels @@ -65,7 +67,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings, QLabel *lib_channels_label= new QLabel(lib_channels_box,tr("&Channels:"),this); lib_channels_label->setGeometry(25,32,70,19); - lib_channels_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Default Sample Rate @@ -77,7 +79,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings, QLabel *lib_samprate_label= new QLabel(lib_samprate_box,tr("&Sample Rate:"),this); lib_samprate_label->setGeometry(25,54,75,19); - lib_samprate_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_samprate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Default Bitrate @@ -88,7 +90,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings, this,SLOT(bitrateData(const QString &))); lib_bitrate_label=new QLabel(lib_bitrate_box,tr("&Bitrate:"),this); lib_bitrate_label->setGeometry(25,76,70,19); - lib_bitrate_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Quality @@ -98,7 +100,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings, lib_quality_spin->setRange(0,10); lib_quality_label=new QLabel(lib_quality_spin,tr("&Quality:"),this); lib_quality_label->setGeometry(25,98,70,19); - lib_quality_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_quality_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button @@ -239,7 +241,7 @@ void RDExportSettingsDialog::okData() case RDSettings::MpegL2: case RDSettings::MpegL2Wav: case RDSettings::MpegL3: - if (lib_bitrate_box && lib_bitrate_box->currentText()){ + if(!lib_bitrate_box->currentText().isEmpty()){ sscanf(lib_bitrate_box->currentText(),"%d",&rate); } if(rate!=0) { diff --git a/lib/rdfeed.cpp b/lib/rdfeed.cpp index a38389e1..50489e67 100644 --- a/lib/rdfeed.cpp +++ b/lib/rdfeed.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -500,7 +500,7 @@ void RDFeed::setMediaLinkMode(RDFeed::MediaLinkMode mode) const QString RDFeed::audioUrl(RDFeed::MediaLinkMode mode, const QString &cgi_hostname,unsigned cast_id) { - QUrl url(baseUrl()); + Q3Url url(baseUrl()); QString ret; RDPodcast *cast; diff --git a/lib/rdformpost.cpp b/lib/rdformpost.cpp index 6eaa0925..6b87fc46 100644 --- a/lib/rdformpost.cpp +++ b/lib/rdformpost.cpp @@ -30,6 +30,8 @@ #include #include +//Added by qt3to4: +#include RDFormPost::RDFormPost(RDFormPost::Encoding encoding,unsigned maxsize, bool auto_delete) @@ -401,7 +403,7 @@ QString RDFormPost::urlEncode(const QString &str) { QString ret; - for(unsigned i=0;iopen(IO_ReadOnly,post_stream)) { + if(!file->open(QIODevice::ReadOnly,post_stream)) { delete file; post_error=RDFormPost::ErrorInternal; return; } - post_text_reader=new QTextStream(file); - post_text_reader->setEncoding(QTextStream::UnicodeUTF8); + post_text_reader=new Q3TextStream(file); + post_text_reader->setEncoding(Q3TextStream::UnicodeUTF8); // // Get Separator Line @@ -563,7 +565,7 @@ bool RDFormPost::GetMimePart(QString *name,QString *value,bool *is_file) if(f0.size()==2) { if(f0[0].lower()=="content-disposition") { QStringList f1=f1.split(";",f0[1]); - for(unsigned i=0;i #include #include -#include +#include #include #include @@ -80,7 +80,7 @@ class RDFormPost QString post_separator; FILE *post_stream; - QTextStream *post_text_reader; + Q3TextStream *post_text_reader; }; diff --git a/lib/rdget_ath.cpp b/lib/rdget_ath.cpp index 5e9e2e16..d8314e12 100644 --- a/lib/rdget_ath.cpp +++ b/lib/rdget_ath.cpp @@ -68,7 +68,7 @@ RDGetAth::RDGetAth(double *ath,QWidget *parent) "ath_ath_label"); ath_ath_label->setGeometry(10,70,40,19); ath_ath_label->setFont(font); - ath_ath_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + ath_ath_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/lib/rdgetpasswd.cpp b/lib/rdgetpasswd.cpp index 45258000..6d2a17c1 100644 --- a/lib/rdgetpasswd.cpp +++ b/lib/rdgetpasswd.cpp @@ -51,7 +51,7 @@ RDGetPasswd::RDGetPasswd(QString *passwd,QWidget *parent) // QLabel *label=new QLabel(tr("Enter password"),this); label->setGeometry(0,5,sizeHint().width(),20); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Password diff --git a/lib/rdgpioselector.cpp b/lib/rdgpioselector.cpp index d1f91c52..35a974f2 100644 --- a/lib/rdgpioselector.cpp +++ b/lib/rdgpioselector.cpp @@ -25,12 +25,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include @@ -53,7 +53,7 @@ RDGpioSelector::RDGpioSelector(QWidget *parent) QLabel *gpio_pin_label=new QLabel(gpio_pin_box,tr("Pin:"),this, "gpio_pin_label"); gpio_pin_label->setGeometry(0,24,55,19); - gpio_pin_label->setAlignment(AlignRight|ShowPrefix); + gpio_pin_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); } diff --git a/lib/rdgroup.cpp b/lib/rdgroup.cpp index b2712795..55692108 100644 --- a/lib/rdgroup.cpp +++ b/lib/rdgroup.cpp @@ -24,6 +24,8 @@ #endif // WIN32 #include +//Added by qt3to4: +#include #include #include @@ -34,18 +36,17 @@ // // Global Classes // -RDGroup::RDGroup(QString name,bool create,QSqlDatabase *db) +RDGroup::RDGroup(QString name,bool create) { RDSqlQuery *q; QString sql; - group_db=db; group_name=name; if(create) { sql=QString("insert into GROUPS set ")+ "NAME=\""+RDEscapeString(group_name)+"\""; - q=new RDSqlQuery(sql,group_db); + q=new RDSqlQuery(sql); delete q; } } @@ -53,7 +54,7 @@ RDGroup::RDGroup(QString name,bool create,QSqlDatabase *db) bool RDGroup::exists() const { - return RDDoesRowExist("GROUPS","NAME",group_name,group_db); + return RDDoesRowExist("GROUPS","NAME",group_name); } @@ -65,7 +66,7 @@ QString RDGroup::name() const QString RDGroup::description() const { - return RDGetSqlValue("GROUPS","NAME",group_name,"DESCRIPTION",group_db). + return RDGetSqlValue("GROUPS","NAME",group_name,"DESCRIPTION"). toString(); } @@ -79,7 +80,7 @@ void RDGroup::setDescription(const QString &desc) const RDCart::Type RDGroup::defaultCartType() const { return (RDCart::Type)RDGetSqlValue("GROUPS","NAME",group_name, - "DEFAULT_CART_TYPE",group_db).toUInt(); + "DEFAULT_CART_TYPE").toUInt(); } @@ -91,7 +92,7 @@ void RDGroup::setDefaultCartType(RDCart::Type type) const unsigned RDGroup::defaultLowCart() const { - return RDGetSqlValue("GROUPS","NAME",group_name,"DEFAULT_LOW_CART",group_db). + return RDGetSqlValue("GROUPS","NAME",group_name,"DEFAULT_LOW_CART"). toUInt(); } @@ -104,7 +105,7 @@ void RDGroup::setDefaultLowCart(unsigned cartnum) const unsigned RDGroup::defaultHighCart() const { - return RDGetSqlValue("GROUPS","NAME",group_name,"DEFAULT_HIGH_CART",group_db). + return RDGetSqlValue("GROUPS","NAME",group_name,"DEFAULT_HIGH_CART"). toUInt(); } @@ -117,7 +118,7 @@ void RDGroup::setDefaultHighCart(unsigned cartnum) const int RDGroup::defaultCutLife() const { - return RDGetSqlValue("GROUPS","NAME",group_name,"DEFAULT_CUT_LIFE",group_db). + return RDGetSqlValue("GROUPS","NAME",group_name,"DEFAULT_CUT_LIFE"). toInt(); } @@ -130,7 +131,7 @@ void RDGroup::setDefaultCutLife(int days) const int RDGroup::cutShelflife() const { - return RDGetSqlValue("GROUPS","NAME",group_name,"CUT_SHELFLIFE",group_db). + return RDGetSqlValue("GROUPS","NAME",group_name,"CUT_SHELFLIFE"). toInt(); } @@ -143,8 +144,8 @@ void RDGroup::setCutShelflife(int days) const bool RDGroup::deleteEmptyCarts() const { - return RDBool(RDGetSqlValue("GROUPS","NAME",group_name,"DELETE_EMPTY_CARTS", - group_db).toString()); + return RDBool(RDGetSqlValue("GROUPS","NAME",group_name,"DELETE_EMPTY_CARTS"). + toString()); } @@ -156,7 +157,7 @@ void RDGroup::setDeleteEmptyCarts(bool state) const QString RDGroup::defaultTitle() const { - return RDGetSqlValue("GROUPS","NAME",group_name,"DEFAULT_TITLE",group_db). + return RDGetSqlValue("GROUPS","NAME",group_name,"DEFAULT_TITLE"). toString(); } @@ -182,8 +183,8 @@ QString RDGroup::generateTitle(const QString &pathname) bool RDGroup::enforceCartRange() const { - return RDBool(RDGetSqlValue("GROUPS","NAME",group_name,"ENFORCE_CART_RANGE", - group_db).toString()); + return RDBool(RDGetSqlValue("GROUPS","NAME",group_name,"ENFORCE_CART_RANGE"). + toString()); } @@ -195,8 +196,8 @@ void RDGroup::setEnforceCartRange(bool state) const bool RDGroup::exportReport(ExportType type) const { - return RDBool(RDGetSqlValue("GROUPS","NAME",group_name,ReportField(type), - group_db).toString()); + return RDBool(RDGetSqlValue("GROUPS","NAME",group_name,ReportField(type)). + toString()); } @@ -208,8 +209,8 @@ void RDGroup::setExportReport(ExportType type,bool state) const bool RDGroup::enableNowNext() const { - return RDBool(RDGetSqlValue("GROUPS","NAME",group_name,"ENABLE_NOW_NEXT", - group_db).toString()); + return RDBool(RDGetSqlValue("GROUPS","NAME",group_name,"ENABLE_NOW_NEXT"). + toString()); } @@ -221,7 +222,7 @@ void RDGroup::setEnableNowNext(bool state) const QColor RDGroup::color() const { - return QColor(RDGetSqlValue("GROUPS","NAME",group_name,"COLOR",group_db). + return QColor(RDGetSqlValue("GROUPS","NAME",group_name,"COLOR"). toString()); } @@ -477,7 +478,7 @@ void RDGroup::SetRow(const QString ¶m,int value) const sql=QString().sprintf("update GROUPS set ")+ param+QString().sprintf("=%d where ",value)+ "NAME=\""+RDEscapeString(group_name)+"\""; - q=new RDSqlQuery(sql,group_db); + q=new RDSqlQuery(sql); delete q; } @@ -490,7 +491,7 @@ void RDGroup::SetRow(const QString ¶m,unsigned value) const sql=QString("update GROUPS set ")+ param+QString().sprintf("=%u where ",value)+ "NAME=\""+RDEscapeString(group_name)+"\""; - q=new RDSqlQuery(sql,group_db); + q=new RDSqlQuery(sql); delete q; } @@ -503,7 +504,7 @@ void RDGroup::SetRow(const QString ¶m,const QString &value) const sql=QString("update GROUPS set ")+ param+"=\""+RDEscapeString(value)+"\" where "+ "NAME=\""+RDEscapeString(group_name)+"\""; - q=new RDSqlQuery(sql,group_db); + q=new RDSqlQuery(sql); delete q; } diff --git a/lib/rdgroup.h b/lib/rdgroup.h index 5a61656c..f79700f8 100644 --- a/lib/rdgroup.h +++ b/lib/rdgroup.h @@ -30,7 +30,7 @@ class RDGroup { public: enum ExportType {None=0,Traffic=1,Music=2}; - RDGroup(QString name,bool create=false,QSqlDatabase *db=0); + RDGroup(QString name,bool create=false); QString name() const; bool exists() const; QString description() const; @@ -78,7 +78,6 @@ class RDGroup void SetRow(const QString ¶m,unsigned value) const; void SetRow(const QString ¶m,const QString &value) const; QString ReportField(ExportType type) const; - QSqlDatabase *group_db; QString group_name; }; diff --git a/lib/rdhotkeylist.cpp b/lib/rdhotkeylist.cpp index 9135c84f..a64a51b7 100644 --- a/lib/rdhotkeylist.cpp +++ b/lib/rdhotkeylist.cpp @@ -107,7 +107,7 @@ void RDHotKeyList::BuildKeyList( ) QString RDHotKeyList::cleanStrings( const QString sent) { QString cleanstring; - for (unsigned i=0 ; i #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include #include "rd.h" #include "rdapplication.h" @@ -81,7 +85,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path, // // Mode Group // - import_mode_group=new QButtonGroup(this); + import_mode_group=new Q3ButtonGroup(this); import_mode_group->hide(); connect(import_mode_group,SIGNAL(clicked(int)), this,SLOT(modeClickedData(int))); @@ -106,7 +110,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path, new QLabel(import_in_filename_edit,tr("Filename:"),this); import_in_filename_label->setGeometry(10,30,70,20); import_in_filename_label->setFont(label_font); - import_in_filename_label->setAlignment(AlignVCenter|AlignRight); + import_in_filename_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Input File Selector Button @@ -133,7 +137,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path, new QLabel(import_channels_box,tr("Channels:"),this); import_channels_label->setGeometry(230,54,75,20); import_channels_label->setFont(label_font); - import_channels_label->setAlignment(AlignRight|AlignVCenter); + import_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Autotrim Check Box @@ -154,11 +158,11 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path, import_autotrim_label=new QLabel(import_autotrim_spin,tr("Level:"),this); import_autotrim_label->setGeometry(185,80,45,20); import_autotrim_label->setFont(label_font); - import_autotrim_label->setAlignment(AlignRight|AlignVCenter); + import_autotrim_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); import_autotrim_unit=new QLabel(tr("dBFS"),this); import_autotrim_unit->setGeometry(280,80,40,20); import_autotrim_unit->setFont(label_font); - import_autotrim_unit->setAlignment(AlignLeft|AlignVCenter); + import_autotrim_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Output Mode Button @@ -180,7 +184,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path, new QLabel(import_out_filename_edit,tr("Filename:"),this); import_out_filename_label->setGeometry(10,140,70,20); import_out_filename_label->setFont(label_font); - import_out_filename_label->setAlignment(AlignVCenter|AlignRight); + import_out_filename_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Output File Selector Button @@ -208,7 +212,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path, import_format_label=new QLabel(import_out_filename_edit,tr("Format:"),this); import_format_label->setGeometry(10,181,70,20); import_format_label->setFont(label_font); - import_format_label->setAlignment(AlignVCenter|AlignRight); + import_format_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Output Format Selector Button @@ -243,11 +247,11 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path, import_normalize_label=new QLabel(import_normalize_spin,tr("Level:"),this); import_normalize_label->setGeometry(110,260,45,20); import_normalize_label->setFont(label_font); - import_normalize_label->setAlignment(AlignRight|AlignVCenter); + import_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); import_normalize_unit=new QLabel(tr("dBFS"),this); import_normalize_unit->setGeometry(205,260,40,20); import_normalize_unit->setFont(label_font); - import_normalize_unit->setAlignment(AlignLeft|AlignVCenter); + import_normalize_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Import Button @@ -414,12 +418,12 @@ void RDImportAudio::selectInputFileData() if(import_in_filename_edit->text().isEmpty()) { filename= - QFileDialog::getOpenFileName(*import_path, + Q3FileDialog::getOpenFileName(*import_path, import_file_filter,this); } else { filename= - QFileDialog::getOpenFileName(import_in_filename_edit->text(), + Q3FileDialog::getOpenFileName(import_in_filename_edit->text(), import_file_filter,this); } if(!filename.isEmpty()) { @@ -438,10 +442,10 @@ void RDImportAudio::selectOutputFileData() if(import_out_filename_edit->text().isEmpty()) { filename= - QFileDialog::getSaveFileName(*import_path,filter,this); + Q3FileDialog::getSaveFileName(*import_path,filter,this); } else { - filename=QFileDialog::getSaveFileName(import_out_filename_edit->text(), + filename=Q3FileDialog::getSaveFileName(import_out_filename_edit->text(), filter,this); } if(!filename.isEmpty()) { @@ -495,13 +499,10 @@ void RDImportAudio::cancelData() void RDImportAudio::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); - p->moveTo(10,110); - p->lineTo(sizeHint().width()-10,110); - p->moveTo(0,215); - p->lineTo(sizeHint().width(),215); - p->moveTo(0,216); - p->lineTo(sizeHint().width(),216); + p->setPen(QColor(Qt::black)); + p->drawLine(10,110,sizeHint().width()-10,110); + p->drawLine(0,215,sizeHint().width(),215); + p->drawLine(0,216,sizeHint().width(),216); p->end(); delete p; } diff --git a/lib/rdimport_audio.h b/lib/rdimport_audio.h index f31917f5..c8d63611 100644 --- a/lib/rdimport_audio.h +++ b/lib/rdimport_audio.h @@ -24,18 +24,21 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include +//Added by qt3to4: +#include +#include #include #include @@ -93,7 +96,7 @@ class RDImportAudio : public QDialog RDSettings *import_default_settings; RDCut *import_clipboard; bool *import_running; - QButtonGroup *import_mode_group; + Q3ButtonGroup *import_mode_group; QRadioButton *import_importmode_button; QRadioButton *import_exportmode_button; QLabel *import_in_filename_label; diff --git a/lib/rdintegerdialog.cpp b/lib/rdintegerdialog.cpp index 83510045..74941d3b 100644 --- a/lib/rdintegerdialog.cpp +++ b/lib/rdintegerdialog.cpp @@ -20,6 +20,8 @@ #include #include +//Added by qt3to4: +#include #include @@ -54,7 +56,7 @@ RDIntegerDialog::RDIntegerDialog(int *value,const QString &lbl,int low,int high, QLabel *label=new QLabel(int_value_box,lbl,this); label->setGeometry(10,10,110,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // OK Button diff --git a/lib/rdintegerdialog.h b/lib/rdintegerdialog.h index 232ee8b8..170507e6 100644 --- a/lib/rdintegerdialog.h +++ b/lib/rdintegerdialog.h @@ -23,6 +23,8 @@ #include #include +//Added by qt3to4: +#include class RDIntegerDialog : public QDialog { diff --git a/lib/rdintegeredit.cpp b/lib/rdintegeredit.cpp index a88ab5f3..248ecb5a 100644 --- a/lib/rdintegeredit.cpp +++ b/lib/rdintegeredit.cpp @@ -20,6 +20,8 @@ #include #include +//Added by qt3to4: +#include RDIntegerEdit::RDIntegerEdit(const QString &lbl,int low,int high, QWidget *parent) @@ -41,13 +43,13 @@ RDIntegerEdit::RDIntegerEdit(const QString &lbl,int low,int high, // // Values List // - edit_values_box=new QListBox(this); + edit_values_box=new Q3ListBox(this); // // Title Label // edit_label=new QLabel(edit_values_box,lbl,this); - edit_label->setAlignment(AlignCenter); + edit_label->setAlignment(Qt::AlignCenter); edit_label->setFont(label_font); // @@ -131,7 +133,7 @@ void RDIntegerEdit::addData() void RDIntegerEdit::deleteData() { - QListBoxItem *item=edit_values_box->selectedItem(); + Q3ListBoxItem *item=edit_values_box->selectedItem(); if(item==NULL) { return; } @@ -139,7 +141,7 @@ void RDIntegerEdit::deleteData() } -QListBoxItem *RDIntegerEdit::GetItem(int value) +Q3ListBoxItem *RDIntegerEdit::GetItem(int value) { for(unsigned i=0;icount();i++) { if(edit_values_box->item(i)->text().toInt()==value) { diff --git a/lib/rdintegeredit.h b/lib/rdintegeredit.h index aaade2e1..b73a0b02 100644 --- a/lib/rdintegeredit.h +++ b/lib/rdintegeredit.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include class RDIntegerEdit : public QWidget @@ -46,9 +46,9 @@ class RDIntegerEdit : public QWidget void deleteData(); private: - QListBoxItem *GetItem(int value); + Q3ListBoxItem *GetItem(int value); QLabel *edit_label; - QListBox *edit_values_box; + Q3ListBox *edit_values_box; QPushButton *edit_add_button; QPushButton *edit_delete_button; int edit_low; diff --git a/lib/rdlabel.cpp b/lib/rdlabel.cpp index d0403836..7522a0d3 100644 --- a/lib/rdlabel.cpp +++ b/lib/rdlabel.cpp @@ -33,14 +33,14 @@ #include -RDLabel::RDLabel(QWidget *parent,WFlags f) +RDLabel::RDLabel(QWidget *parent,Qt::WFlags f) : QLabel(parent,"",f) { label_wrap=false; } -RDLabel::RDLabel(const QString &text,QWidget *parent=0,WFlags f) +RDLabel::RDLabel(const QString &text,QWidget *parent=0,Qt::WFlags f) : QLabel(text,parent,"",f) { label_wrap=false; @@ -49,7 +49,7 @@ RDLabel::RDLabel(const QString &text,QWidget *parent=0,WFlags f) } -RDLabel::RDLabel(QWidget *buddy,const QString &text,QWidget *parent,WFlags f) +RDLabel::RDLabel(QWidget *buddy,const QString &text,QWidget *parent,Qt::WFlags f) : QLabel(buddy,text,parent,"",f) { label_wrap=false; diff --git a/lib/rdlabel.h b/lib/rdlabel.h index a3c97ecf..e48c2286 100644 --- a/lib/rdlabel.h +++ b/lib/rdlabel.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -35,9 +35,9 @@ class RDLabel : public QLabel Q_OBJECT public: - RDLabel(QWidget *parent=0,WFlags f=0); - RDLabel(const QString &text,QWidget *parent,WFlags f=0); - RDLabel(QWidget *buddy,const QString &text,QWidget *parent,WFlags f=0); + RDLabel(QWidget *parent=0,Qt::WFlags f=0); + RDLabel(const QString &text,QWidget *parent,Qt::WFlags f=0); + RDLabel(QWidget *buddy,const QString &text,QWidget *parent,Qt::WFlags f=0); QString text() const; void setFont(const QFont &font); bool wordWrapEnabled() const; diff --git a/lib/rdlicense.cpp b/lib/rdlicense.cpp index 38c02e5c..f5787c6d 100644 --- a/lib/rdlicense.cpp +++ b/lib/rdlicense.cpp @@ -42,10 +42,10 @@ RDLicense::RDLicense(QWidget *parent) QFont button_font=QFont("Helvetica",14,QFont::Bold); button_font.setPixelSize(14); - license_edit=new QTextEdit(this,"license_edit"); + license_edit=new Q3TextEdit(this,"license_edit"); license_edit-> setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-70); - license_edit->setTextFormat(RichText); + license_edit->setTextFormat(Qt::RichText); license_edit->setReadOnly(true); // diff --git a/lib/rdlicense.h b/lib/rdlicense.h index 06dbd4e6..330e74fc 100644 --- a/lib/rdlicense.h +++ b/lib/rdlicense.h @@ -23,7 +23,7 @@ #define RDLICENSE_H #include -#include +#include class RDLicense : public QDialog { @@ -41,7 +41,7 @@ class RDLicense : public QDialog void closeData(); private: - QTextEdit *license_edit; + Q3TextEdit *license_edit; }; diff --git a/lib/rdlineedit.cpp b/lib/rdlineedit.cpp index 66e45ec3..8745f2bc 100644 --- a/lib/rdlineedit.cpp +++ b/lib/rdlineedit.cpp @@ -20,6 +20,8 @@ // #include +//Added by qt3to4: +#include RDLineEdit::RDLineEdit(QWidget *parent) : QLineEdit(parent) diff --git a/lib/rdlineedit.h b/lib/rdlineedit.h index cfd6a19c..ece7cf43 100644 --- a/lib/rdlineedit.h +++ b/lib/rdlineedit.h @@ -25,6 +25,8 @@ #include #include #include +//Added by qt3to4: +#include class RDLineEdit : public QLineEdit { diff --git a/lib/rdlist_groups.cpp b/lib/rdlist_groups.cpp index 3b8fa6cd..637198e6 100644 --- a/lib/rdlist_groups.cpp +++ b/lib/rdlist_groups.cpp @@ -20,6 +20,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -53,16 +55,16 @@ RDListGroups::RDListGroups(QString *groupname,const QString &username, // // Cart List // - group_group_list=new QListView(this,"group_group_list"); - group_group_list->setSelectionMode(QListView::Single); + group_group_list=new Q3ListView(this,"group_group_list"); + group_group_list->setSelectionMode(Q3ListView::Single); group_group_list->setGeometry(10,10, sizeHint().width()-20,sizeHint().height()-80); group_group_list->setAllColumnsShowFocus(true); group_group_list->setItemMargin(5); connect(group_group_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); group_group_list->addColumn(tr("NAME")); group_group_list->setColumnAlignment(0,Qt::AlignHCenter); group_group_list->addColumn(tr("DESCRIPTION")); @@ -109,7 +111,7 @@ QSizePolicy RDListGroups::sizePolicy() const } -void RDListGroups::doubleClickedData(QListViewItem *item,const QPoint &pt, +void RDListGroups::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { okData(); @@ -118,7 +120,7 @@ void RDListGroups::doubleClickedData(QListViewItem *item,const QPoint &pt, void RDListGroups::okData() { - QListViewItem *item=group_group_list->selectedItem(); + Q3ListViewItem *item=group_group_list->selectedItem(); if(item==NULL) { return; } @@ -143,8 +145,8 @@ void RDListGroups::BuildGroupList(const QString &username) { QString sql; RDSqlQuery *q; - QListViewItem *item=NULL; - QListViewItem *cur_item=NULL; + Q3ListViewItem *item=NULL; + Q3ListViewItem *cur_item=NULL; group_group_list->clear(); sql=QString("select ")+ @@ -155,7 +157,7 @@ void RDListGroups::BuildGroupList(const QString &username) "USER_NAME=\""+RDEscapeString(username)+"\""; q=new RDSqlQuery(sql); while(q->next()) { - item=new QListViewItem(group_group_list); + item=new Q3ListViewItem(group_group_list); item->setText(0,q->value(0).toString()); item->setText(1,q->value(1).toString()); if(q->value(0).toString()==*group_name) { diff --git a/lib/rdlist_groups.h b/lib/rdlist_groups.h index 5da4e15a..3e995aed 100644 --- a/lib/rdlist_groups.h +++ b/lib/rdlist_groups.h @@ -22,8 +22,10 @@ #define RDLIST_GROUPS_H #include -#include +#include #include +//Added by qt3to4: +#include class RDListGroups : public QDialog { @@ -35,7 +37,7 @@ class RDListGroups : public QDialog QSizePolicy sizePolicy() const; private slots: - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void okData(); void cancelData(); @@ -45,7 +47,7 @@ class RDListGroups : public QDialog private: void BuildGroupList(const QString &username); QString *group_name; - QListView *group_group_list; + Q3ListView *group_group_list; }; diff --git a/lib/rdlist_logs.cpp b/lib/rdlist_logs.cpp index 5d8977b6..0f6a0810 100644 --- a/lib/rdlist_logs.cpp +++ b/lib/rdlist_logs.cpp @@ -20,6 +20,9 @@ #include #include +//Added by qt3to4: +#include +#include #include "rdapplication.h" #include "rddb.h" @@ -58,14 +61,14 @@ RDListLogs::RDListLogs(QString *logname,RDLogFilter::FilterMode mode, // // Log List // - list_log_list=new QListView(this); + list_log_list=new Q3ListView(this); list_log_list->setAllColumnsShowFocus(true); list_log_list->setItemMargin(5); - list_log_list->setSelectionMode(QListView::Single); + list_log_list->setSelectionMode(Q3ListView::Single); connect(list_log_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); list_log_list->addColumn(tr("NAME")); list_log_list->setColumnAlignment(0,Qt::AlignLeft); list_log_list->addColumn(tr("DESCRIPTION")); @@ -118,7 +121,7 @@ void RDListLogs::filterChangedData(const QString &where_sql) } -void RDListLogs::doubleClickedData(QListViewItem *,const QPoint &,int) +void RDListLogs::doubleClickedData(Q3ListViewItem *,const QPoint &,int) { okButtonData(); } @@ -126,7 +129,7 @@ void RDListLogs::doubleClickedData(QListViewItem *,const QPoint &,int) void RDListLogs::okButtonData() { - QListViewItem *item=list_log_list->selectedItem(); + Q3ListViewItem *item=list_log_list->selectedItem(); if(item==NULL) { return; } @@ -161,8 +164,8 @@ void RDListLogs::RefreshList() { RDSqlQuery *q; QString sql; - QListViewItem *l; - QListViewItem *view_item=NULL; + Q3ListViewItem *l; + Q3ListViewItem *view_item=NULL; QDate current_date=QDate::currentDate(); list_log_list->clear(); @@ -178,7 +181,7 @@ void RDListLogs::RefreshList() q=new RDSqlQuery(sql); while(q->next()) { - l=new QListViewItem(list_log_list); + l=new Q3ListViewItem(list_log_list); l->setText(0,q->value(0).toString()); l->setText(1,q->value(1).toString()); l->setText(2,q->value(2).toString()); diff --git a/lib/rdlist_logs.h b/lib/rdlist_logs.h index 8d51f83c..b7331827 100644 --- a/lib/rdlist_logs.h +++ b/lib/rdlist_logs.h @@ -27,8 +27,11 @@ #define RDLIST_LOGS_H #include -#include +#include #include +//Added by qt3to4: +#include +#include #include @@ -43,7 +46,7 @@ class RDListLogs : public QDialog private slots: void filterChangedData(const QString &where_sql); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void closeEvent(QCloseEvent *); void okButtonData(); void cancelButtonData(); @@ -53,7 +56,7 @@ class RDListLogs : public QDialog private: void RefreshList(); - QListView *list_log_list; + Q3ListView *list_log_list; QString *list_logname; QPushButton *list_ok_button; QPushButton *list_cancel_button; diff --git a/lib/rdlistselector.cpp b/lib/rdlistselector.cpp index 1a20dcc8..840714f8 100644 --- a/lib/rdlistselector.cpp +++ b/lib/rdlistselector.cpp @@ -21,16 +21,18 @@ #include #include #include -#include -#include +#include +#include #include #include #include +//Added by qt3to4: +#include #include RDListSelector::RDListSelector(QWidget *parent) - : QHBox(parent) + : Q3HBox(parent) { QFont font; @@ -42,14 +44,14 @@ RDListSelector::RDListSelector(QWidget *parent) setSpacing(10); - QVBox *source_box=new QVBox(this,"source_box"); + Q3VBox *source_box=new Q3VBox(this,"source_box"); list_source_label=new QLabel(source_box,"list_source_label"); list_source_label->setFont(font); list_source_label->setText(tr("Available Services")); - list_source_label->setAlignment(AlignCenter); - list_source_box=new QListBox(source_box,"list_source_box"); + list_source_label->setAlignment(Qt::AlignCenter); + list_source_box=new Q3ListBox(source_box,"list_source_box"); - QVBox *button_box=new QVBox(this,"button_box"); + Q3VBox *button_box=new Q3VBox(this,"button_box"); list_add_button=new QPushButton(button_box,"list_add_button"); list_add_button->setText(tr("Add >>")); list_add_button->setDisabled(true); @@ -59,12 +61,12 @@ RDListSelector::RDListSelector(QWidget *parent) list_remove_button->setDisabled(true); connect(list_remove_button,SIGNAL(clicked()),this,SLOT(removeData())); - QVBox *dest_box=new QVBox(this,"dest_box"); + Q3VBox *dest_box=new Q3VBox(this,"dest_box"); list_dest_label=new QLabel(dest_box,"list_dest_label"); list_dest_label->setFont(font); list_dest_label->setText(tr("Active Services")); - list_dest_label->setAlignment(AlignCenter); - list_dest_box=new QListBox(dest_box,"list_dest_box"); + list_dest_label->setAlignment(Qt::AlignCenter); + list_dest_box=new Q3ListBox(dest_box,"list_dest_box"); } @@ -196,15 +198,15 @@ void RDListSelector::destSetCurrentItem(int item) } -QListBoxItem *RDListSelector::sourceFindItem(const QString &text, - ComparisonFlags compare) const +Q3ListBoxItem *RDListSelector::sourceFindItem(const QString &text, + Q3ListBox::ComparisonFlags compare) const { return list_source_box->findItem(text,compare); } -QListBoxItem *RDListSelector::destFindItem(const QString &text, - ComparisonFlags compare) const +Q3ListBoxItem *RDListSelector::destFindItem(const QString &text, + Q3ListBox::ComparisonFlags compare) const { return list_dest_box->findItem(text,compare); } diff --git a/lib/rdlistselector.h b/lib/rdlistselector.h index 48769cd9..53c951cd 100644 --- a/lib/rdlistselector.h +++ b/lib/rdlistselector.h @@ -23,12 +23,12 @@ #include #include -#include +#include #include -#include +#include #include -class RDListSelector : public QHBox +class RDListSelector : public Q3HBox { Q_OBJECT @@ -54,10 +54,10 @@ class RDListSelector : public QHBox QString destCurrentText() const; void sourceSetCurrentItem(int item); void destSetCurrentItem(int item); - QListBoxItem *sourceFindItem(const QString &text, - ComparisonFlags compare=ExactMatch) const; - QListBoxItem *destFindItem(const QString &text, - ComparisonFlags compare=ExactMatch) const; + Q3ListBoxItem *sourceFindItem(const QString &text, + Q3ListBox::ComparisonFlags compare=Q3ListBox::ExactMatch) const; + Q3ListBoxItem *destFindItem(const QString &text, + Q3ListBox::ComparisonFlags compare=Q3ListBox::ExactMatch) const; void clear(); private slots: @@ -66,9 +66,9 @@ class RDListSelector : public QHBox private: void CheckButtons(); - QListBox *list_source_box; + Q3ListBox *list_source_box; QLabel *list_source_label; - QListBox *list_dest_box; + Q3ListBox *list_dest_box; QLabel *list_dest_label; QPushButton *list_add_button; QPushButton *list_remove_button; diff --git a/lib/rdlistsvcs.cpp b/lib/rdlistsvcs.cpp index d2451e71..96f12d88 100644 --- a/lib/rdlistsvcs.cpp +++ b/lib/rdlistsvcs.cpp @@ -19,6 +19,8 @@ // #include +//Added by qt3to4: +#include #include #include @@ -50,9 +52,9 @@ RDListSvcs::RDListSvcs(const QString &caption,QWidget *parent) // // Services // - edit_svc_list=new QListBox(this); - connect(edit_svc_list,SIGNAL(doubleClicked(QListBoxItem *)), - this,SLOT(doubleClickedData(QListBoxItem *))); + edit_svc_list=new Q3ListBox(this); + connect(edit_svc_list,SIGNAL(doubleClicked(Q3ListBoxItem *)), + this,SLOT(doubleClickedData(Q3ListBoxItem *))); // // Ok Button @@ -111,7 +113,7 @@ int RDListSvcs::exec(QString *svcname) } -void RDListSvcs::doubleClickedData(QListBoxItem *item) +void RDListSvcs::doubleClickedData(Q3ListBoxItem *item) { okData(); } diff --git a/lib/rdlistsvcs.h b/lib/rdlistsvcs.h index 885ddba1..3b91288b 100644 --- a/lib/rdlistsvcs.h +++ b/lib/rdlistsvcs.h @@ -22,8 +22,10 @@ #define RDLISTSVCS_H #include -#include +#include #include +//Added by qt3to4: +#include class RDListSvcs : public QDialog { @@ -38,7 +40,7 @@ class RDListSvcs : public QDialog int exec(QString *svcname); private slots: - void doubleClickedData(QListBoxItem *item); + void doubleClickedData(Q3ListBoxItem *item); void okData(); void cancelData(); @@ -46,7 +48,7 @@ class RDListSvcs : public QDialog void resizeEvent(QResizeEvent *e); private: - QListBox *edit_svc_list; + Q3ListBox *edit_svc_list; QString *edit_svcname; QPushButton *edit_ok_button; QPushButton *edit_cancel_button; diff --git a/lib/rdlistview.cpp b/lib/rdlistview.cpp index 13f68470..ca5e6e0a 100644 --- a/lib/rdlistview.cpp +++ b/lib/rdlistview.cpp @@ -25,13 +25,13 @@ #include RDListView::RDListView(QWidget *parent) - : QListView(parent) + : Q3ListView(parent) { list_hard_sort_column=-1; connect(this, - SIGNAL(mouseButtonClicked(int,QListViewItem *,const QPoint &,int)), + SIGNAL(mouseButtonClicked(int,Q3ListViewItem *,const QPoint &,int)), this, - SLOT(mouseButtonClickedData(int,QListViewItem *,const QPoint &,int))); + SLOT(mouseButtonClickedData(int,Q3ListViewItem *,const QPoint &,int))); } @@ -62,15 +62,15 @@ void RDListView::setColumnSortType(int column,SortType type) int RDListView::addColumn(const QString &label,int width) { sort_type.push_back(RDListView::NormalSort); - return QListView::addColumn(label,width); + return Q3ListView::addColumn(label,width); } -int RDListView::addColumn(const QIconSet &iconset,const QString &label, +int RDListView::addColumn(const QIcon &iconset,const QString &label, int width) { sort_type.push_back(RDListView::NormalSort); - return QListView::addColumn(iconset,label,width); + return Q3ListView::addColumn(iconset,label,width); } @@ -87,13 +87,13 @@ void RDListView::selectLine(int line) } -void RDListView::mouseButtonClickedData(int button,QListViewItem *item, +void RDListView::mouseButtonClickedData(int button,Q3ListViewItem *item, const QPoint &pt,int col) { - QListViewItem *l; + Q3ListViewItem *l; bool contiguous; - if((selectionMode()!=QListView::Extended)||(item==NULL)||(button!=1)) { + if((selectionMode()!=Q3ListView::Extended)||(item==NULL)||(button!=1)) { return; } diff --git a/lib/rdlistview.h b/lib/rdlistview.h index 4c08ac46..0169b91a 100644 --- a/lib/rdlistview.h +++ b/lib/rdlistview.h @@ -23,10 +23,10 @@ #include -#include +#include #include -class RDListView : public QListView +class RDListView : public Q3ListView { Q_OBJECT @@ -38,11 +38,11 @@ class RDListView : public QListView RDListView::SortType columnSortType(int column) const; void setColumnSortType(int column,SortType type); int addColumn(const QString &label,int width=-1); - int addColumn(const QIconSet &iconset,const QString &label,int width=-1); + int addColumn(const QIcon &iconset,const QString &label,int width=-1); void selectLine(int line); private slots: - void mouseButtonClickedData(int button,QListViewItem *item,const QPoint &pt, + void mouseButtonClickedData(int button,Q3ListViewItem *item,const QPoint &pt, int col); private: diff --git a/lib/rdlistviewitem.cpp b/lib/rdlistviewitem.cpp index 467eb794..1c3c1f0d 100644 --- a/lib/rdlistviewitem.cpp +++ b/lib/rdlistviewitem.cpp @@ -24,8 +24,8 @@ #include #include -RDListViewItem::RDListViewItem(QListView *parent) - : QListViewItem(parent) +RDListViewItem::RDListViewItem(Q3ListView *parent) + : Q3ListViewItem(parent) { item_line=-1; item_id=-1; @@ -130,10 +130,10 @@ void RDListViewItem::paintCell(QPainter *p,const QColorGroup &cg,int column, } } x=listView()->itemMargin(); - if(((align&AlignHCenter)!=0)||((align&AlignCenter)!=0)) { + if(((align&Qt::AlignHCenter)!=0)||((align&Qt::AlignCenter)!=0)) { x=(width-p->fontMetrics().width(text(column)))/2; } - if((align&AlignRight)!=0) { + if((align&Qt::AlignRight)!=0) { x=width-p->fontMetrics().width(text(column))-listView()->itemMargin(); } p->setPen(text_color); @@ -142,10 +142,10 @@ void RDListViewItem::paintCell(QPainter *p,const QColorGroup &cg,int column, else { x=listView()->itemMargin(); y=(height()-pixmap(column)->height())/2; - if((align&AlignRight)!=0) { + if((align&Qt::AlignRight)!=0) { x=width-pixmap(column)->width()-listView()->itemMargin(); } - if(((align&AlignHCenter)!=0)||((align&AlignCenter)!=0)) { + if(((align&Qt::AlignHCenter)!=0)||((align&Qt::AlignCenter)!=0)) { x=(width-pixmap(column)->width())/2; } p->drawPixmap(x,y,*pixmap(column)); @@ -153,7 +153,7 @@ void RDListViewItem::paintCell(QPainter *p,const QColorGroup &cg,int column, } -int RDListViewItem::compare(QListViewItem *i,int col,bool ascending) const +int RDListViewItem::compare(Q3ListViewItem *i,int col,bool ascending) const { int hard_column; int prev_length; @@ -195,7 +195,7 @@ int RDListViewItem::compare(QListViewItem *i,int col,bool ascending) const return 0; case RDListView::NormalSort: - return QListViewItem::compare(i,col,ascending); + return Q3ListViewItem::compare(i,col,ascending); } } if(ascending) { diff --git a/lib/rdlistviewitem.h b/lib/rdlistviewitem.h index d33156d5..247b6f7a 100644 --- a/lib/rdlistviewitem.h +++ b/lib/rdlistviewitem.h @@ -23,15 +23,15 @@ #include -#include +#include #include #include -class RDListViewItem : public QListViewItem +class RDListViewItem : public Q3ListViewItem { public: - RDListViewItem(QListView *parent); + RDListViewItem(Q3ListView *parent); int line() const; void setLine(int line); int id() const; @@ -43,7 +43,7 @@ class RDListViewItem : public QListViewItem void setTextColor(int column,QColor color,int weight); void paintCell(QPainter *p,const QColorGroup &cg,int column, int width,int align); - int compare(QListViewItem *i,int col,bool ascending) const; + int compare(Q3ListViewItem *i,int col,bool ascending) const; private: int item_line; diff --git a/lib/rdlivewire.cpp b/lib/rdlivewire.cpp index b3f71ff1..450d7254 100644 --- a/lib/rdlivewire.cpp +++ b/lib/rdlivewire.cpp @@ -55,7 +55,7 @@ QStringList AString::split(const QString &sep,const QString &esc) const bool escape=false; QChar e=esc.at(0); list.push_back(QString()); - for(unsigned i=0;istart(interval,true); break; - case QSocket::ErrHostNotFound: + case Q3Socket::ErrHostNotFound: emit watchdogStateChanged(live_id,QString().sprintf( "Error on connection to LiveWire node at %s:%d: Host Not Found", (const char *)live_hostname, live_tcp_port)); break; - case QSocket::ErrSocketRead: + case Q3Socket::ErrSocketRead: emit watchdogStateChanged(live_id,QString().sprintf( "Error on connection to LiveWire node at %s:%d: Socket Read Error", (const char *)live_hostname, @@ -583,7 +583,7 @@ void RDLiveWire::ReadVersion(const QString &cmd) if(!live_connected) { f0=AString(cmd).split(" ","\""); - for(unsigned i=0;isetSlotNumber(f0[0].toInt()); - for(unsigned i=1;isetSlotNumber(f0[0].toInt()); - for(unsigned i=1;i #include -#include +#include #include #include @@ -131,7 +131,7 @@ class RDLiveWire : public QObject std::vectorlive_gpi_timers; std::vectorlive_gpo_timers; int live_gpos; - QSocket *live_socket; + Q3Socket *live_socket; char live_buf[RD_LIVEWIRE_MAX_CMD_LENGTH]; int live_ptr; bool live_connected; diff --git a/lib/rdlogfilter.cpp b/lib/rdlogfilter.cpp index e881578f..5d92aba5 100644 --- a/lib/rdlogfilter.cpp +++ b/lib/rdlogfilter.cpp @@ -23,6 +23,9 @@ #include "rd.h" #include "rdescape_string.h" #include "rdlogfilter.h" +//Added by qt3to4: +#include +#include RDLogFilter::RDLogFilter(RDLogFilter::FilterMode mode,QWidget *parent) : QWidget(parent) diff --git a/lib/rdlogfilter.h b/lib/rdlogfilter.h index af21931a..fb76d502 100644 --- a/lib/rdlogfilter.h +++ b/lib/rdlogfilter.h @@ -28,6 +28,8 @@ #include #include #include +//Added by qt3to4: +#include class RDLogFilter : public QWidget { diff --git a/lib/rdlogplay.cpp b/lib/rdlogplay.cpp index 2202dcc4..bc4e1bef 100644 --- a/lib/rdlogplay.cpp +++ b/lib/rdlogplay.cpp @@ -40,7 +40,7 @@ //#define SHOW_SLOTS //#define SHOW_METER_SLOTS -RDLogPlay::RDLogPlay(int id,RDEventPlayer *player,QSocketDevice *nn_sock, +RDLogPlay::RDLogPlay(int id,RDEventPlayer *player,Q3SocketDevice *nn_sock, QString logname,std::vector *rlm_hosts, QObject *parent) : QObject(parent),RDLogEvent(logname) diff --git a/lib/rdlogplay.h b/lib/rdlogplay.h index cc000bf7..bb79fa28 100644 --- a/lib/rdlogplay.h +++ b/lib/rdlogplay.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -53,7 +53,7 @@ class RDLogPlay : public QObject,public RDLogEvent { Q_OBJECT public: - RDLogPlay(int id,RDEventPlayer *player,QSocketDevice *nn_sock,QString logname, + RDLogPlay(int id,RDEventPlayer *player,Q3SocketDevice *nn_sock,QString logname, std::vector *rlm_hosts,QObject *parent=0); QString serviceName() const; void setServiceName(const QString &svcname); @@ -220,7 +220,7 @@ class RDLogPlay : public QObject,public RDLogEvent RDPlayDeck *play_deck[RD_MAX_STREAMS]; bool play_deck_active[RD_MAX_STREAMS]; int next_channel; - QSocketDevice *play_nownext_socket; + Q3SocketDevice *play_nownext_socket; QString play_nownext_string; QHostAddress play_nownext_address; Q_UINT16 play_nownext_port; diff --git a/lib/rdmacro.cpp b/lib/rdmacro.cpp index 2a404bff..a7f344eb 100644 --- a/lib/rdmacro.cpp +++ b/lib/rdmacro.cpp @@ -161,7 +161,7 @@ QString RDMacro::rollupArgs(int n) QString RDMacro::toString() const { QString ret=QChar(((uint16_t)rml_cmd)>>8); - ret+=+QChar(0xFF&((uint16_t)rml_cmd)); + ret+=QChar(0xFF&((uint16_t)rml_cmd)); ret+=" "; ret+=rml_args.join(" "); ret+="!"; @@ -294,7 +294,7 @@ RDMacro RDMacro::fromString(const QString &str,RDMacro::Role role) // // Get Arguments // - for(unsigned i=1;i -#include +#include +//Added by qt3to4: +#include +#include +#include #include @@ -31,7 +35,7 @@ RDMarkerBar::RDMarkerBar(QWidget *parent) } setLineWidth(1); setMidLineWidth(0); - setFrameStyle(QFrame::Box|QFrame::Plain); + setFrameStyle(Q3Frame::Box|Q3Frame::Plain); } @@ -83,14 +87,14 @@ void RDMarkerBar::DrawMap() { QPixmap *pix=new QPixmap(size()); QPainter *p=new QPainter(pix); - QPointArray *pt; + Q3PointArray *pt; p->fillRect(0,0,size().width(),size().height(),backgroundColor()); if(marker_length>0) { p->setPen(RD_CUEEDITOR_START_MARKER); p->setBrush(RD_CUEEDITOR_START_MARKER); p->fillRect(size().width()*marker_pos[RDMarkerBar::Start]/marker_length-2,0, 4,size().height(),RD_CUEEDITOR_START_MARKER); - pt=new QPointArray(3); + pt=new Q3PointArray(3); pt->setPoint(0,size().width()*marker_pos[RDMarkerBar::Start]/marker_length-2, size().height()/2-1); pt->setPoint(1,size().width()*marker_pos[RDMarkerBar::Start]/marker_length-12, diff --git a/lib/rdmarker_button.cpp b/lib/rdmarker_button.cpp index 296de340..c2603c96 100644 --- a/lib/rdmarker_button.cpp +++ b/lib/rdmarker_button.cpp @@ -19,6 +19,8 @@ // #include +//Added by qt3to4: +#include RDMarkerButton::RDMarkerButton(QWidget *parent) : RDPushButton(parent) @@ -32,7 +34,7 @@ RDMarkerButton::RDMarkerButton(const QString &text,QWidget *parent) } -RDMarkerButton::RDMarkerButton(const QIconSet &icon,const QString &text, +RDMarkerButton::RDMarkerButton(const QIcon &icon,const QString &text, QWidget *parent) : RDPushButton(icon,text,parent) { diff --git a/lib/rdmarker_button.h b/lib/rdmarker_button.h index 753f52a5..b610364d 100644 --- a/lib/rdmarker_button.h +++ b/lib/rdmarker_button.h @@ -23,13 +23,15 @@ #include #include +//Added by qt3to4: +#include class RDMarkerButton : public RDPushButton { public: RDMarkerButton(QWidget *parent); RDMarkerButton(const QString &text,QWidget *parent); - RDMarkerButton(const QIconSet &icon,const QString &text,QWidget *parent); + RDMarkerButton(const QIcon &icon,const QString &text,QWidget *parent); protected: void keyPressEvent(QKeyEvent *e); diff --git a/lib/rdmarker_edit.cpp b/lib/rdmarker_edit.cpp index 4a31dc08..ce79c8fe 100644 --- a/lib/rdmarker_edit.cpp +++ b/lib/rdmarker_edit.cpp @@ -20,6 +20,8 @@ // #include +//Added by qt3to4: +#include RDMarkerEdit::RDMarkerEdit(QWidget *parent) : QLineEdit(parent) diff --git a/lib/rdmarker_edit.h b/lib/rdmarker_edit.h index abfaee34..52e89944 100644 --- a/lib/rdmarker_edit.h +++ b/lib/rdmarker_edit.h @@ -25,6 +25,8 @@ #include #include #include +//Added by qt3to4: +#include class RDMarkerEdit : public QLineEdit { diff --git a/lib/rdmulticaster.cpp b/lib/rdmulticaster.cpp index 1932a5af..07f2e3d1 100644 --- a/lib/rdmulticaster.cpp +++ b/lib/rdmulticaster.cpp @@ -30,7 +30,7 @@ RDMulticaster::RDMulticaster(QObject *parent) : QObject(parent) { - multi_socket=new QSocketDevice(QSocketDevice::Datagram); + multi_socket=new Q3SocketDevice(Q3SocketDevice::Datagram); multi_notifier=new QSocketNotifier(multi_socket->socket(), QSocketNotifier::Read,this); connect(multi_notifier,SIGNAL(activated(int)),this,SLOT(activatedData(int))); @@ -66,7 +66,7 @@ void RDMulticaster::subscribe(const QHostAddress &addr) if(setsockopt(multi_socket->socket(),IPPROTO_IP,IP_ADD_MEMBERSHIP, &mreq,sizeof(mreq))<0) { fprintf(stderr,tr("Unable to subscribe to multicast address")+" \""+ - addr.toString()+"\" ["+strerror(errno)+"]"); + addr.toString()+"\" ["+QString(strerror(errno))+"]"); } } } @@ -84,7 +84,7 @@ void RDMulticaster::unsubscribe(const QHostAddress &addr) if(setsockopt(multi_socket->socket(),IPPROTO_IP,IP_DROP_MEMBERSHIP, &mreq,sizeof(mreq))<0) { fprintf(stderr,tr("Unable to subscribe to multicast address")+" \""+ - addr.toString()+"\" ["+strerror(errno)+"]"); + addr.toString()+"\" ["+QString(strerror(errno))+"]"); } } } diff --git a/lib/rdmulticaster.h b/lib/rdmulticaster.h index c3e6c32d..c8df32c5 100644 --- a/lib/rdmulticaster.h +++ b/lib/rdmulticaster.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include class RDMulticaster : public QObject @@ -51,7 +51,7 @@ class RDMulticaster : public QObject private: void GetInterfaces(); - QSocketDevice *multi_socket; + Q3SocketDevice *multi_socket; QSocketNotifier *multi_notifier; std::vector multi_iface_addresses; }; diff --git a/lib/rdnotification.cpp b/lib/rdnotification.cpp index 1183fe36..19c1ca97 100644 --- a/lib/rdnotification.cpp +++ b/lib/rdnotification.cpp @@ -18,6 +18,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#include + #include "rdnotification.h" RDNotification::RDNotification(Type type,Action action,const QVariant &id) diff --git a/lib/rdnownext.cpp b/lib/rdnownext.cpp index db9c2645..c0d1b670 100644 --- a/lib/rdnownext.cpp +++ b/lib/rdnownext.cpp @@ -32,7 +32,7 @@ void RDResolveNowNextDateTime(QString *str,const QString &code, std::vector dts; while((ptr=str->find(code,ptr))>=0) { - for(unsigned i=ptr+3;ilength();i++) { + for(int i=ptr+3;ilength();i++) { if(str->at(i)==')') { dts.push_back(str->mid(ptr+3,i-ptr-3)); ptr+=(i-ptr-3); diff --git a/lib/rdpanel_button.cpp b/lib/rdpanel_button.cpp index a27eeaa8..a6217264 100644 --- a/lib/rdpanel_button.cpp +++ b/lib/rdpanel_button.cpp @@ -23,6 +23,11 @@ #include #include +//Added by qt3to4: +#include +#include +#include +#include #include @@ -548,7 +553,7 @@ QString RDPanelButton::GetNextLine(QString *str,const QFontMetrics &m,int len) { QString ret; - for(unsigned i=0;ilength();i++) { + for(int i=0;ilength();i++) { if(m.width(str->left(i))>len) { int l=i; while((!str->at(l--).isSpace())&&(l>=0)); diff --git a/lib/rdpanel_button.h b/lib/rdpanel_button.h index 11c90172..541d06c5 100644 --- a/lib/rdpanel_button.h +++ b/lib/rdpanel_button.h @@ -26,6 +26,11 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include diff --git a/lib/rdpasswd.cpp b/lib/rdpasswd.cpp index eb256ec8..8b3a43ae 100644 --- a/lib/rdpasswd.cpp +++ b/lib/rdpasswd.cpp @@ -23,12 +23,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include @@ -94,7 +94,7 @@ RDPasswd::RDPasswd(QString *password,QWidget *parent) "passwd_password_1_label"); passwd_password_1_label->setFont(label_font); passwd_password_1_label->setGeometry(10,13,75,19); - passwd_password_1_label->setAlignment(AlignRight|ShowPrefix); + passwd_password_1_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Confirm Password @@ -109,7 +109,7 @@ RDPasswd::RDPasswd(QString *password,QWidget *parent) "passwd_password_2_label"); passwd_password_2_label->setFont(label_font); passwd_password_2_label->setGeometry(10,34,75,19); - passwd_password_2_label->setAlignment(AlignRight|ShowPrefix); + passwd_password_2_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); } @@ -142,7 +142,7 @@ void RDPasswd::okData() else { QMessageBox::warning(this,tr("Password Mismatch"), tr("The passwords don't match,\nplease try again!"), - tr("OK"),0); + tr("OK")); } } diff --git a/lib/rdpasswd.h b/lib/rdpasswd.h index ec2309fd..ee92f88f 100644 --- a/lib/rdpasswd.h +++ b/lib/rdpasswd.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/lib/rdplaymeter.cpp b/lib/rdplaymeter.cpp index 1560b5a2..7c5dab11 100644 --- a/lib/rdplaymeter.cpp +++ b/lib/rdplaymeter.cpp @@ -27,9 +27,11 @@ #include #include #include +//Added by qt3to4: +#include #include #include -#include +#include #include #include @@ -39,7 +41,7 @@ RDPlayMeter::RDPlayMeter(RDSegMeter::Orientation orient,QWidget *parent) : QWidget(parent) { meter_label=QString(""); - setBackgroundColor(black); + setBackgroundColor(Qt::black); orientation=orient; makeFont(); meter=new RDSegMeter(orientation,this); @@ -217,7 +219,7 @@ void RDPlayMeter::paintEvent(QPaintEvent *paintEvent) // QPainter *p=new QPainter(this); p->setFont(label_font); - p->setPen(white); + p->setPen(Qt::white); if(!meter_label.isEmpty()) { switch(orientation) { case RDSegMeter::Left: diff --git a/lib/rdplaymeter.h b/lib/rdplaymeter.h index 3cde7e0a..a0cb72f8 100644 --- a/lib/rdplaymeter.h +++ b/lib/rdplaymeter.h @@ -29,6 +29,8 @@ #include #include #include +//Added by qt3to4: +#include #include diff --git a/lib/rdpodcast.cpp b/lib/rdpodcast.cpp index be2f5014..7f5a40f6 100644 --- a/lib/rdpodcast.cpp +++ b/lib/rdpodcast.cpp @@ -298,7 +298,7 @@ bool RDPodcast::removeAudio(RDFeed *feed,QString *err_text,bool log_debug) const CURL *curl=NULL; struct curl_slist *cmds=NULL; CURLcode err; - QUrl *url; + Q3Url *url; bool ret=true; QString currentdir; char urlstr[1024]; @@ -308,7 +308,7 @@ bool RDPodcast::removeAudio(RDFeed *feed,QString *err_text,bool log_debug) const syslog(LOG_ERR,"unable to initialize curl library\n"); return false; } - url=new QUrl(feed->purgeUrl()); + url=new Q3Url(feed->purgeUrl()); strncpy(urlstr,(const char *)(url->protocol()+"://"+url->host()+"/").utf8(), 1024); curl_easy_setopt(curl,CURLOPT_URL,urlstr); diff --git a/lib/rdprofile.cpp b/lib/rdprofile.cpp index 67f5e647..24640df2 100644 --- a/lib/rdprofile.cpp +++ b/lib/rdprofile.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include @@ -45,11 +45,11 @@ bool RDProfile::setSource(const QString &filename) profile_section.push_back(RDProfileSection()); profile_section.back().setName(""); QFile *file=new QFile(filename); - if(!file->open(IO_ReadOnly)) { + if(!file->open(QIODevice::ReadOnly)) { delete file; return false; } - QTextStream *text=new QTextStream(file); + Q3TextStream *text=new Q3TextStream(file); QString line=text->readLine().stripWhiteSpace(); while(!line.isNull()) { if((line.left(1)!=";")&&(line.left(1)!="#")) { @@ -83,7 +83,7 @@ void RDProfile::setSourceString(const QString &str) profile_section.push_back(RDProfileSection()); profile_section.back().setName(""); lines=lines.split("\n",str); - for(unsigned i=0;i #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include @@ -41,7 +43,7 @@ RDPushButton::RDPushButton(const QString &text,QWidget *parent) Init(); } -RDPushButton::RDPushButton(const QIconSet &icon,const QString &text, +RDPushButton::RDPushButton(const QIcon &icon,const QString &text, QWidget *parent) : QPushButton(text,parent) { @@ -123,15 +125,15 @@ void RDPushButton::setPalette(const QPalette &pal) void RDPushButton::mousePressEvent(QMouseEvent *e) { switch(e->button()) { - case QMouseEvent::LeftButton: + case Qt::LeftButton: QPushButton::mousePressEvent(e); break; - case QMouseEvent::MidButton: + case Qt::MidButton: emit centerPressed(); break; - case QMouseEvent::RightButton: + case Qt::RightButton: emit rightPressed(); break; @@ -144,11 +146,11 @@ void RDPushButton::mousePressEvent(QMouseEvent *e) void RDPushButton::mouseReleaseEvent(QMouseEvent *e) { switch(e->button()) { - case QMouseEvent::LeftButton: + case Qt::LeftButton: QPushButton::mouseReleaseEvent(e); break; - case QMouseEvent::MidButton: + case Qt::MidButton: e->accept(); emit centerReleased(); if((e->x()>=0)&&(e->x()accept(); emit rightReleased(); if((e->x()>=0)&&(e->x() #include #include +//Added by qt3to4: +#include /* * Widget Defaults */ #define RDPUSHBUTTON_DEFAULT_FLASH_PERIOD 300 -#define RDPUSHBUTTON_DEFAULT_FLASH_COLOR blue +#define RDPUSHBUTTON_DEFAULT_FLASH_COLOR Qt::blue class RDPushButton : public QPushButton { @@ -39,7 +41,7 @@ class RDPushButton : public QPushButton enum ClockSource {InternalClock=0,ExternalClock=1}; RDPushButton(QWidget *parent); RDPushButton(const QString &text,QWidget *parent); - RDPushButton(const QIconSet &icon,const QString &text,QWidget *parent); + RDPushButton(const QIcon &icon,const QString &text,QWidget *parent); QColor flashColor() const; void setFlashColor(QColor color); int flashPeriod() const; diff --git a/lib/rdrenderer.cpp b/lib/rdrenderer.cpp index b1cfea98..a34f21ff 100644 --- a/lib/rdrenderer.cpp +++ b/lib/rdrenderer.cpp @@ -263,7 +263,7 @@ bool RDRenderer::renderToFile(const QString &outfile,RDLogEvent *log, // Verify Destination // if((f=fopen(outfile,"w"))==NULL) { - *err_msg=tr("unable to open output file")+" ["+strerror(errno)+"]"; + *err_msg=tr("unable to open output file")+" ["+QString(strerror(errno))+"]"; return false; } fclose(f); diff --git a/lib/rdreport.cpp b/lib/rdreport.cpp index 7d615477..b1a0a72b 100644 --- a/lib/rdreport.cpp +++ b/lib/rdreport.cpp @@ -852,7 +852,7 @@ QString RDReport::leftJustify(const QString &str,int width) { QString ret=str.left(width); - while(ret.length()<(unsigned)width) { + while(ret.length()readBlock(data,1500))>0) { data[n]=0; QString line=QString::fromUtf8(data); - for(unsigned i=0;ireadBlock(buf,256))>0) { - buf[c]=0; - for(int i=0;i #include #include -#include +#include #include #include @@ -81,7 +81,7 @@ class RDRipc : public QObject private: void SendCommand(const QString &cmd); void DispatchCommand(); - QSocket *ripc_socket; + Q3Socket *ripc_socket; QString ripc_user; QString ripc_password; // QString ripc_stationname; diff --git a/lib/rdrlmhost.cpp b/lib/rdrlmhost.cpp index 9d79a622..bd177259 100644 --- a/lib/rdrlmhost.cpp +++ b/lib/rdrlmhost.cpp @@ -35,7 +35,7 @@ RDRLMHost::RDRLMHost(const QString &path,const QString &arg, - QSocketDevice *udp_socket,QObject *parent) + Q3SocketDevice *udp_socket,QObject *parent) : QObject(parent) { plugin_path=RDDateDecode(path,QDate::currentDate(),rda->station(),rda->config()); @@ -341,7 +341,7 @@ void RDRLMHost::ttyReceiveReadyData(int fd) int n; for(unsigned i=0;isocket()==fd) { + if(plugin_tty_devices[i]->fileDescriptor()==fd) { while((n=plugin_tty_devices[i]->readBlock(data,1024))>0) { if(plugin_serial_data_received_sym!=NULL) { plugin_serial_data_received_sym(this,i,data,n); @@ -373,15 +373,15 @@ int RLMOpenSerial(void *ptr,const char *port,int speed,int parity, int word_length) { RDRLMHost *host=(RDRLMHost *)ptr; - host->plugin_tty_devices.push_back(new RDTTYDevice); + host->plugin_tty_devices.push_back(new RDTTYDevice()); host->plugin_tty_devices.back()->setName(port); host->plugin_tty_devices.back()->setSpeed(speed); host->plugin_tty_devices.back()->setParity((RDTTYDevice::Parity)parity); host->plugin_tty_devices.back()->setWordLength(word_length); - if(host->plugin_tty_devices.back()->open(IO_ReadWrite)) { + if(host->plugin_tty_devices.back()->open(QIODevice::ReadWrite)) { host->plugin_tty_notifiers. - push_back(new QSocketNotifier(host->plugin_tty_devices.back()->socket(), + push_back(new QSocketNotifier(host->plugin_tty_devices.back()->fileDescriptor(), QSocketNotifier::Read)); host->connect(host->plugin_tty_notifiers.back(),SIGNAL(activated(int)), host,SLOT(ttyReceiveReadyData(int))); diff --git a/lib/rdrlmhost.h b/lib/rdrlmhost.h index d294b14f..c5e1d02f 100644 --- a/lib/rdrlmhost.h +++ b/lib/rdrlmhost.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include @@ -39,7 +39,7 @@ class RDRLMHost : public QObject { Q_OBJECT public: - RDRLMHost(const QString &path,const QString &arg,QSocketDevice *udp_socket, + RDRLMHost(const QString &path,const QString &arg,Q3SocketDevice *udp_socket, QObject *parent=0); ~RDRLMHost(); QString pluginPath() const; @@ -59,7 +59,7 @@ class RDRLMHost : public QObject private: QString plugin_path; QString plugin_arg; - QSocketDevice *plugin_udp_socket; + Q3SocketDevice *plugin_udp_socket; void *plugin_handle; void (*plugin_start_sym)(void *,const char *); void (*plugin_free_sym)(void *); diff --git a/lib/rdschedcodes_dialog.cpp b/lib/rdschedcodes_dialog.cpp index 8428579b..f22055db 100644 --- a/lib/rdschedcodes_dialog.cpp +++ b/lib/rdschedcodes_dialog.cpp @@ -22,6 +22,10 @@ #include #include +//Added by qt3to4: +#include +#include +#include #include #include "rdschedcodes_dialog.h" @@ -122,11 +126,11 @@ int RDSchedCodesDialog::exec(QStringList *sched_codes,QStringList *remove_codes) remove_codes_sel->show(); } - for(unsigned i=0;isize();i++) { + for(int i=0;isize();i++) { codes_sel->destInsertItem((*edit_sched_codes)[i]); } if(edit_remove_codes!=NULL) { - for(unsigned i=0;isize();i++) { + for(int i=0;isize();i++) { remove_codes_sel->destInsertItem((*remove_codes)[i]); } } @@ -152,9 +156,8 @@ int RDSchedCodesDialog::exec(QStringList *sched_codes,QStringList *remove_codes) void RDSchedCodesDialog::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); - p->moveTo(sizeHint().width(),10); - p->lineTo(sizeHint().width(),210); + p->setPen(QColor(Qt::black)); + p->drawLine(sizeHint().width(),10,sizeHint().width(),210); p->end(); } diff --git a/lib/rdschedcodes_dialog.h b/lib/rdschedcodes_dialog.h index 741855d1..19afedf4 100644 --- a/lib/rdschedcodes_dialog.h +++ b/lib/rdschedcodes_dialog.h @@ -27,6 +27,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include diff --git a/lib/rdsegmeter.cpp b/lib/rdsegmeter.cpp index 2c0b7352..c1fddd8d 100644 --- a/lib/rdsegmeter.cpp +++ b/lib/rdsegmeter.cpp @@ -24,9 +24,12 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include -#include +#include #include #include @@ -36,7 +39,7 @@ RDSegMeter::RDSegMeter(RDSegMeter::Orientation o,QWidget *parent) : QWidget(parent) { orient=o; - setBackgroundColor(black); + setBackgroundColor(Qt::black); dark_low_color=QColor(DEFAULT_DARK_LOW_COLOR); dark_high_color=QColor(DEFAULT_DARK_HIGH_COLOR); dark_clip_color=QColor(DEFAULT_DARK_CLIP_COLOR); diff --git a/lib/rdsegmeter.h b/lib/rdsegmeter.h index 79ff5bd9..c93f33fa 100644 --- a/lib/rdsegmeter.h +++ b/lib/rdsegmeter.h @@ -27,15 +27,17 @@ #include #include #include +//Added by qt3to4: +#include /* * Default Colors */ -#define DEFAULT_LOW_COLOR green +#define DEFAULT_LOW_COLOR Qt::green #define DEFAULT_DARK_LOW_COLOR 0,80,0 -#define DEFAULT_HIGH_COLOR yellow +#define DEFAULT_HIGH_COLOR Qt::yellow #define DEFAULT_DARK_HIGH_COLOR 75,75,0 -#define DEFAULT_CLIP_COLOR red +#define DEFAULT_CLIP_COLOR Qt::red #define DEFAULT_DARK_CLIP_COLOR 85,0,0 /* diff --git a/lib/rdslider.cpp b/lib/rdslider.cpp index a249ce18..ce888d3f 100644 --- a/lib/rdslider.cpp +++ b/lib/rdslider.cpp @@ -2,7 +2,7 @@ // // An audio- and touchscreen-friendly slider widget. // -// (C) Copyright 2009,2016 Fred Gleason +// (C) Copyright 2009,2016-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -17,23 +17,21 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include + +#include "rdslider.h" RDSlider::RDSlider(QWidget *parent=0) - : QWidget(parent),QRangeControl() + : QWidget(parent),Q3RangeControl() { init(RDSlider::Right); update(); @@ -41,7 +39,7 @@ RDSlider::RDSlider(QWidget *parent=0) RDSlider::RDSlider(RDSlider::Orientation orient,QWidget *parent) - : QWidget(parent),QRangeControl() + : QWidget(parent),Q3RangeControl() { init(orient); setOrientation(orient); @@ -50,7 +48,7 @@ RDSlider::RDSlider(RDSlider::Orientation orient,QWidget *parent) RDSlider::RDSlider(int minValue,int maxValue,int pageStep,int value, RDSlider::Orientation orient,QWidget *parent) - : QWidget(parent),QRangeControl() + : QWidget(parent),Q3RangeControl() { init(orient); setOrientation(orient); @@ -92,7 +90,7 @@ void RDSlider::setTickInterval(int i) } -void RDSlider::setTickmarks(QSlider::TickSetting s) +void RDSlider::setTickmarks(RDSlider::TickSetting s) { tick_setting=s; update(); @@ -113,7 +111,7 @@ void RDSlider::setMaxValue(int max_value) void RDSlider::setRange(int min_value,int max_value) { - QRangeControl::setRange(min_value,max_value); + Q3RangeControl::setRange(min_value,max_value); calcKnob(); update(prev_knob); update(curr_knob); @@ -180,7 +178,7 @@ void RDSlider::setValue(int setting) { if(!rdslider_moving) { if(setting!=value()) { - QRangeControl::setValue(setting); + Q3RangeControl::setValue(setting); calcKnob(); update(prev_knob); update(curr_knob); @@ -211,64 +209,59 @@ void RDSlider::paintEvent(QPaintEvent *paintEvent) // The groove // p->setPen(QColor(colorGroup().dark())); - p->moveTo(width()/2,knob_size.height()/2); - p->lineTo(width()/2,height()-knob_size.height()/2); + p->drawLine(width()/2,knob_size.height()/2,width()/2,height()-knob_size.height()/2); p->setPen(QColor(colorGroup().shadow())); - p->moveTo(width()/2-1,height()-knob_size.height()/2+1); - p->lineTo(width()/2-1,knob_size.height()/2-1); - p->lineTo(width()/2+1,knob_size.height()/2-1); + p->drawLine(width()/2-1,height()-knob_size.height()/2+1,width()/2-1,knob_size.height()/2-1); + p->drawLine(width()/2-1,knob_size.height()/2-1,width()/2+1,knob_size.height()/2-1); // // The ticks // switch(rdslider_orient) { - case RDSlider::Up: - if((tick_setting==QSlider::Left)||(tick_setting==QSlider::Both)) { - p->setPen(colorGroup().shadow()); - for(int i=minValue();i<=maxValue();i+=tick_interval) { - tick_y=(geometry().height()-curr_knob.height())- - ((geometry().height()-curr_knob.height())*(i-minValue()))/ - (maxValue()-minValue())+curr_knob.height()/2; - p->moveTo(0,tick_y); - p->lineTo(width()/2-2,tick_y); - } - } - if((tick_setting==QSlider::Right)||(tick_setting==QSlider::Both)) { - p->setPen(colorGroup().shadow()); - for(int i=minValue();i<=maxValue();i+=tick_interval) { - tick_y=(geometry().height()-curr_knob.height())- - ((geometry().height()-curr_knob.height())*(i-minValue()))/ - (maxValue()-minValue())+curr_knob.height()/2; - p->moveTo(width()/2+2,tick_y); - p->lineTo(width(),tick_y); - } - } - break; - case RDSlider::Down: - if((tick_setting==QSlider::Left)||(tick_setting==QSlider::Both)) { - p->setPen(colorGroup().shadow()); - for(int i=minValue();i<=maxValue();i+=tick_interval) { - tick_y=(geometry().height()-curr_knob.height()/2)- - abs((geometry().height()-curr_knob.height())*i)/ - (maxValue()-minValue()); - p->moveTo(0,tick_y); - p->lineTo(width()/2-2,tick_y); - } - } - if((tick_setting==QSlider::Right)||(tick_setting==QSlider::Both)) { - p->setPen(colorGroup().shadow()); - for(int i=minValue();i<=maxValue();i+=tick_interval) { - tick_y=(geometry().height()-curr_knob.height()/2)- - abs((geometry().height()-curr_knob.height())*i)/ - (maxValue()-minValue()); - p->moveTo(width()/2+2,tick_y); - p->lineTo(width(),tick_y); - } - } - break; + case RDSlider::Up: + if((tick_setting==RDSlider::TicksLeft)||(tick_setting==RDSlider::TicksBothSides)) { + p->setPen(colorGroup().shadow()); + for(int i=minValue();i<=maxValue();i+=tick_interval) { + tick_y=(geometry().height()-curr_knob.height())- + ((geometry().height()-curr_knob.height())*(i-minValue()))/ + (maxValue()-minValue())+curr_knob.height()/2; + p->drawLine(0,tick_y,width()/2-2,tick_y); + } + } + if((tick_setting==RDSlider::TicksRight)||(tick_setting==RDSlider::TicksBothSides)) { + p->setPen(colorGroup().shadow()); + for(int i=minValue();i<=maxValue();i+=tick_interval) { + tick_y=(geometry().height()-curr_knob.height())- + ((geometry().height()-curr_knob.height())*(i-minValue()))/ + (maxValue()-minValue())+curr_knob.height()/2; + p->drawLine(width()/2+2,tick_y,width(),tick_y); + } + } + break; - default: - break; + case RDSlider::Down: + if((tick_setting==RDSlider::TicksLeft)||(tick_setting==RDSlider::TicksBothSides)) { + p->setPen(colorGroup().shadow()); + for(int i=minValue();i<=maxValue();i+=tick_interval) { + tick_y=(geometry().height()-curr_knob.height()/2)- + abs((geometry().height()-curr_knob.height())*i)/ + (maxValue()-minValue()); + p->drawLine(0,tick_y,width()/2-2,tick_y); + } + } + if((tick_setting==RDSlider::TicksRight)||(tick_setting==RDSlider::TicksBothSides)) { + p->setPen(colorGroup().shadow()); + for(int i=minValue();i<=maxValue();i+=tick_interval) { + tick_y=(geometry().height()-curr_knob.height()/2)- + abs((geometry().height()-curr_knob.height())*i)/ + (maxValue()-minValue()); + p->drawLine(width()/2+2,tick_y,width(),tick_y); + } + } + break; + + default: + break; } } if((rdslider_orient==RDSlider::Left)||(rdslider_orient==RDSlider::Right)) { @@ -276,60 +269,56 @@ void RDSlider::paintEvent(QPaintEvent *paintEvent) // The groove // p->setPen(QColor(colorGroup().light())); - p->moveTo(knob_size.width()/2,height()/2+1); - p->lineTo(width()-knob_size.width()/2,height()/2+1); + p->drawLine(knob_size.width()/2,height()/2+1, + width()-knob_size.width()/2,height()/2+1); p->setPen(QColor(colorGroup().dark())); - p->moveTo(knob_size.width()/2,height()/2); - p->lineTo(width()-knob_size.width()/2,height()/2); + p->drawLine(knob_size.width()/2,height()/2, + width()-knob_size.width()/2,height()/2); p->setPen(QColor(colorGroup().shadow())); - p->moveTo(width()-knob_size.width()/2+1,height()/2-1); - p->lineTo(knob_size.width()/2-1,height()/2-1); + p->drawLine(width()-knob_size.width()/2+1,height()/2-1, + knob_size.width()/2-1,height()/2-1); // // The ticks // switch(rdslider_orient) { case RDSlider::Left: - if((tick_setting==QSlider::Above)||(tick_setting==QSlider::Both)) { + if((tick_setting==RDSlider::TicksAbove)||(tick_setting==RDSlider::TicksBothSides)) { p->setPen(colorGroup().shadow()); for(int i=minValue();i<=maxValue();i+=tick_interval) { tick_x=(geometry().width()-curr_knob.width())- ((geometry().width()-curr_knob.width())*(i-minValue()))/ (maxValue()-minValue())+curr_knob.width()/2; - p->moveTo(tick_x,0); - p->lineTo(tick_x,height()/2-2); + p->drawLine(tick_x,0,tick_x,height()/2-2); } } - if((tick_setting==QSlider::Below)||(tick_setting==QSlider::Both)) { + if((tick_setting==RDSlider::TicksBelow)||(tick_setting==RDSlider::TicksBothSides)) { p->setPen(colorGroup().shadow()); for(int i=minValue();i<=maxValue();i+=tick_interval) { tick_x=(geometry().width()-curr_knob.width())- ((geometry().width()-curr_knob.width())*(i-minValue()))/ (maxValue()-minValue())+curr_knob.width()/2; - p->moveTo(tick_x,height()/2+2); - p->lineTo(tick_x,height()); + p->drawLine(tick_x,height()/2+2,tick_x,height()); } } break; case RDSlider::Right: - if((tick_setting==QSlider::Above)||(tick_setting==QSlider::Both)) { + if((tick_setting==RDSlider::TicksAbove)||(tick_setting==RDSlider::TicksBothSides)) { p->setPen(colorGroup().shadow()); for(int i=minValue();i<=maxValue();i+=tick_interval) { tick_x=(geometry().width()-curr_knob.width()/2)- abs((geometry().width()-curr_knob.width())*i)/ (maxValue()-minValue()); - p->moveTo(tick_x,0); - p->lineTo(tick_x,height()/2-2); + p->drawLine(tick_x,0,tick_x,height()/2-2); } } - if((tick_setting==QSlider::Below)||(tick_setting==QSlider::Both)) { + if((tick_setting==RDSlider::TicksBelow)||(tick_setting==RDSlider::TicksBothSides)) { p->setPen(colorGroup().shadow()); for(int i=minValue();i<=maxValue();i+=tick_interval) { tick_x=(geometry().width()-curr_knob.width()/2)- abs((geometry().width()-curr_knob.width())*i)/ (maxValue()-minValue()); - p->moveTo(tick_x,height()/2+2); - p->lineTo(tick_x,height()); + p->drawLine(tick_x,height()/2+2,tick_x,height()); } } break; @@ -362,7 +351,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) switch(rdslider_orient) { case RDSlider::Up: if(value()!=maxValue()) { - QRangeControl::setValue(maxValue()); + Q3RangeControl::setValue(maxValue()); if(tracking_enabled) { emit valueChanged(value()); } @@ -373,7 +362,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) break; case RDSlider::Down: if(value()!=minValue()) { - QRangeControl::setValue(minValue()); + Q3RangeControl::setValue(minValue()); if(tracking_enabled) { emit valueChanged(value()); } @@ -399,7 +388,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) switch(rdslider_orient) { case RDSlider::Up: if(value()!=minValue()) { - QRangeControl::setValue(minValue()); + Q3RangeControl::setValue(minValue()); if(tracking_enabled) { emit valueChanged(value()); } @@ -410,7 +399,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) break; case RDSlider::Down: if(value()!=maxValue()) { - QRangeControl::setValue(maxValue()); + Q3RangeControl::setValue(maxValue()); if(tracking_enabled) { emit valueChanged(value()); } @@ -447,7 +436,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) (geometry().height()-curr_knob.height()) +minValue(); if(value()!=knob_value) { - QRangeControl::setValue(knob_value); + Q3RangeControl::setValue(knob_value); if(tracking_enabled) { emit valueChanged(value()); } @@ -463,7 +452,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) (curr_knob.height()-geometry().height()) +minValue(); if(value()!=knob_value) { - QRangeControl::setValue(knob_value); + Q3RangeControl::setValue(knob_value); if(tracking_enabled) { emit valueChanged(value()); } @@ -488,7 +477,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) switch(rdslider_orient) { case RDSlider::Left: if(value()!=maxValue()) { - QRangeControl::setValue(maxValue()); + Q3RangeControl::setValue(maxValue()); if(tracking_enabled) { emit valueChanged(value()); } @@ -499,7 +488,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) break; case RDSlider::Right: if(value()!=minValue()) { - QRangeControl::setValue(minValue()); + Q3RangeControl::setValue(minValue()); if(tracking_enabled) { emit valueChanged(value()); } @@ -525,7 +514,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) switch(rdslider_orient) { case RDSlider::Left: if(value()!=minValue()) { - QRangeControl::setValue(minValue()); + Q3RangeControl::setValue(minValue()); if(tracking_enabled) { emit valueChanged(value()); } @@ -536,7 +525,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) break; case RDSlider::Right: if(value()!=maxValue()) { - QRangeControl::setValue(maxValue()); + Q3RangeControl::setValue(maxValue()); if(tracking_enabled) { emit valueChanged(value()); } @@ -573,7 +562,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) (geometry().width()-curr_knob.width()) +minValue(); if(value()!=knob_value) { - QRangeControl::setValue(knob_value); + Q3RangeControl::setValue(knob_value); if(tracking_enabled) { emit valueChanged(value()); } @@ -588,7 +577,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) (curr_knob.width()-geometry().width()) +minValue(); if(value()!=knob_value) { - QRangeControl::setValue(knob_value); + Q3RangeControl::setValue(knob_value); if(tracking_enabled) { emit valueChanged(value()); } @@ -611,7 +600,7 @@ void RDSlider::mouseMoveEvent(QMouseEvent *mouse) void RDSlider::mousePressEvent(QMouseEvent *mouse) { - if(mouse->button()==QMouseEvent::LeftButton) { + if(mouse->button()==Qt::LeftButton) { if(curr_knob.contains(mouse->x(),mouse->y())) { base_x=mouse->x(); base_y=mouse->y(); @@ -635,7 +624,7 @@ void RDSlider::mousePressEvent(QMouseEvent *mouse) void RDSlider::mouseReleaseEvent(QMouseEvent *mouse) { - if(mouse->button()==QMouseEvent::LeftButton) { + if(mouse->button()==Qt::LeftButton) { rdslider_moving=false; if(deferred_change) { emit valueChanged(value()); @@ -657,7 +646,7 @@ void RDSlider::init(RDSlider::Orientation orient) tracking_enabled=true; deferred_change=false; tick_interval=10; - tick_setting=QSlider::NoMarks; + tick_setting=RDSlider::NoTicks; setRange(0,100); knob_size=QSize(geometry().width(),10); } @@ -735,32 +724,28 @@ void RDSlider::calcKnob(int x,int y,int w,int h) // The outline // p.setPen(knob_color.light()); - p.moveTo(0,curr_knob.height()-1); - p.lineTo(0,0); - p.lineTo(curr_knob.width()-1,0); - p.moveTo(1,curr_knob.height()-1); - p.lineTo(1,1); - p.lineTo(curr_knob.width()-1,1); + p.drawLine(0,curr_knob.height()-1,0,0); + p.drawLine(0,0,curr_knob.width()-1,0); + p.drawLine(1,curr_knob.height()-1,1,1); + p.drawLine(1,1,curr_knob.width()-1,1); p.setPen(knob_color.dark()); - p.lineTo(curr_knob.width()-1,curr_knob.height()-1); - p.lineTo(0,curr_knob.height()-1); - p.moveTo(curr_knob.width()-2,1); - p.lineTo(curr_knob.width()-2,curr_knob.height()-2); - p.lineTo(0,curr_knob.height()-2); + p.drawLine(curr_knob.width()-1,1,curr_knob.width()-1,curr_knob.height()-1); + p.drawLine(curr_knob.width()-1,curr_knob.height()-1,0,curr_knob.height()-1); + p.drawLine(curr_knob.width()-2,1,curr_knob.width()-2,curr_knob.height()-2); + p.drawLine(curr_knob.width()-2,curr_knob.height()-2,0,curr_knob.height()-2); // // The centerline // if(curr_knob.height()>=40) { p.setPen(knob_color.dark()); - p.moveTo(2,curr_knob.height()/2); - p.lineTo(curr_knob.width()-2,curr_knob.height()/2); + p.drawLine(2,curr_knob.height()/2,curr_knob.width()-2,curr_knob.height()/2); p.setPen(knob_color.shadow()); - p.moveTo(2,curr_knob.height()/2-1); - p.lineTo(curr_knob.width()-2,curr_knob.height()/2-1); + p.drawLine(2,curr_knob.height()/2-1, + curr_knob.width()-2,curr_knob.height()/2-1); p.setPen(knob_color.light()); - p.moveTo(2,curr_knob.height()/2+1); - p.lineTo(curr_knob.width()-2,curr_knob.height()/2+1); + p.drawLine(2,curr_knob.height()/2+1, + curr_knob.width()-2,curr_knob.height()/2+1); } p.end(); } @@ -818,32 +803,29 @@ void RDSlider::calcKnob(int x,int y,int w,int h) // The outline // p.setPen(knob_color.light()); - p.moveTo(0,curr_knob.height()-1); - p.lineTo(0,0); - p.lineTo(curr_knob.width()-1,0); - p.moveTo(1,curr_knob.height()-1); - p.lineTo(1,1); - p.lineTo(curr_knob.width()-1,1); + p.drawLine(0,curr_knob.height()-1,0,0); + p.drawLine(0,0,curr_knob.width()-1,0); + p.drawLine(1,curr_knob.height()-1,1,1); + p.drawLine(1,1,curr_knob.width()-1,1); p.setPen(knob_color.dark()); - p.lineTo(curr_knob.width()-1,curr_knob.height()-1); - p.lineTo(0,curr_knob.height()-1); - p.moveTo(curr_knob.width()-2,1); - p.lineTo(curr_knob.width()-2,curr_knob.height()-2); - p.lineTo(0,curr_knob.height()-2); + p.drawLine(curr_knob.width()-1,1,curr_knob.width()-1,curr_knob.height()-1); + p.drawLine(curr_knob.width()-1,curr_knob.height()-1,0,curr_knob.height()-1); + p.drawLine(curr_knob.width()-2,1,curr_knob.width()-2,curr_knob.height()-2); + p.drawLine(curr_knob.width()-2,curr_knob.height()-2,0,curr_knob.height()-2); // // The centerline // if(curr_knob.width()>=40) { p.setPen(knob_color.dark()); - p.moveTo(curr_knob.width()/2,2); - p.lineTo(curr_knob.width()/2,curr_knob.height()-2); + p.drawLine(curr_knob.width()/2,2, + curr_knob.width()/2,curr_knob.height()-2); p.setPen(knob_color.shadow()); - p.moveTo(curr_knob.width()/2-1,2); - p.lineTo(curr_knob.width()/2-1,curr_knob.height()-2); + p.drawLine(curr_knob.width()/2-1,2, + curr_knob.width()/2-1,curr_knob.height()-2); p.setPen(knob_color.light()); - p.moveTo(curr_knob.width()/2+1,2); - p.lineTo(curr_knob.width()/2+1,curr_knob.height()-2); + p.drawLine(curr_knob.width()/2+1,2, + curr_knob.width()/2+1,curr_knob.height()-2); } p.end(); } diff --git a/lib/rdslider.h b/lib/rdslider.h index 14aae3d9..aafb58b3 100644 --- a/lib/rdslider.h +++ b/lib/rdslider.h @@ -21,18 +21,22 @@ #ifndef RDSLIDER_H #define RDSLIDER_H -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -class RDSlider : public QWidget,public QRangeControl +class RDSlider : public QWidget,public Q3RangeControl { Q_OBJECT public: + enum TickSetting {NoTicks=0,TicksLeft=1,TicksRight=2,TicksAbove=3, + TicksBelow=4,TicksBothSides=5}; enum Orientation {Left=0,Right=1,Up=2,Down=3}; RDSlider(QWidget *parent); RDSlider(RDSlider::Orientation orient,QWidget *parent); @@ -43,7 +47,7 @@ class RDSlider : public QWidget,public QRangeControl void setTracking(bool enable); bool tracking() const; void setTickInterval(int i); - void setTickmarks(QSlider::TickSetting s); + void setTickmarks(TickSetting s); void setMinValue(int min_value); void setMaxValue(int max_value); void setRange(int min_value,int max_value); @@ -91,7 +95,7 @@ class RDSlider : public QWidget,public QRangeControl bool tracking_enabled; bool deferred_change; int tick_interval; - QSlider::TickSetting tick_setting; + TickSetting tick_setting; }; diff --git a/lib/rdslotbox.cpp b/lib/rdslotbox.cpp index 4aece788..f4c4468a 100644 --- a/lib/rdslotbox.cpp +++ b/lib/rdslotbox.cpp @@ -19,6 +19,13 @@ // #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include #include "rdconf.h" #include "rdplay_deck.h" @@ -98,9 +105,9 @@ RDSlotBox::RDSlotBox(RDPlayDeck *deck,RDAirPlayConf *conf,QWidget *parent) line_text_palette=palette(); line_text_palette.setColor(QPalette::Active,QColorGroup::Foreground, - QColor(black)); + QColor(Qt::black)); line_text_palette.setColor(QPalette::Inactive,QColorGroup::Foreground, - QColor(black)); + QColor(Qt::black)); // // Audio Meter @@ -130,7 +137,7 @@ RDSlotBox::RDSlotBox(RDPlayDeck *deck,RDAirPlayConf *conf,QWidget *parent) // // Position Slider // - line_position_bar=new QProgressBar(this); + line_position_bar=new Q3ProgressBar(this); line_position_bar->setGeometry(115,69,sizeHint().width()-190,13); line_position_bar->setPercentageVisible(false); line_position_bar->hide(); @@ -579,7 +586,7 @@ void RDSlotBox::SetColor(QColor color) line_talktime_label->setPalette(line_text_palette); line_up_label->setBackgroundColor(color); line_up_label->setPalette(line_text_palette); - line_position_bar->setBackgroundColor(QColor(lightGray)); + line_position_bar->setBackgroundColor(QColor(Qt::lightGray)); line_down_label->setBackgroundColor(color); line_down_label->setPalette(line_text_palette); line_icon_label->setBackgroundColor(color); diff --git a/lib/rdslotbox.h b/lib/rdslotbox.h index 5e6f6328..2236e802 100644 --- a/lib/rdslotbox.h +++ b/lib/rdslotbox.h @@ -25,10 +25,15 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -89,7 +94,7 @@ class RDSlotBox : public QWidget QLabel *line_talktime_label; QLabel *line_up_label; QLabel *line_down_label; - QProgressBar *line_position_bar; + Q3ProgressBar *line_position_bar; QTime line_end_time; int log_id; RDLogLine *line_logline; diff --git a/lib/rdslotdialog.cpp b/lib/rdslotdialog.cpp index e6ff1b44..0f4eff1d 100644 --- a/lib/rdslotdialog.cpp +++ b/lib/rdslotdialog.cpp @@ -19,6 +19,9 @@ // #include +//Added by qt3to4: +#include +#include #include #include diff --git a/lib/rdslotdialog.h b/lib/rdslotdialog.h index 9e2bccf5..9e698f0f 100644 --- a/lib/rdslotdialog.h +++ b/lib/rdslotdialog.h @@ -25,6 +25,8 @@ #include #include #include +//Added by qt3to4: +#include #include diff --git a/lib/rdsocket.cpp b/lib/rdsocket.cpp index 8b0c25a3..b85c88fc 100644 --- a/lib/rdsocket.cpp +++ b/lib/rdsocket.cpp @@ -21,12 +21,12 @@ #include #include #include -#include +#include #include RDSocket::RDSocket(int id,QObject *parent) - : QSocket(parent) + : Q3Socket(parent) { id_num=id; connect(this,SIGNAL(hostFound()),this,SLOT(hostFoundData())); diff --git a/lib/rdsocket.h b/lib/rdsocket.h index d16a3787..453a5336 100644 --- a/lib/rdsocket.h +++ b/lib/rdsocket.h @@ -22,9 +22,9 @@ #define RDSOCKET_H #include -#include +#include -class RDSocket : public QSocket +class RDSocket : public Q3Socket { Q_OBJECT public: diff --git a/lib/rdsound_panel.cpp b/lib/rdsound_panel.cpp index 816b6e0c..0095aad9 100644 --- a/lib/rdsound_panel.cpp +++ b/lib/rdsound_panel.cpp @@ -149,7 +149,7 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, panel_reset_button->setFont(button_font); panel_reset_button->setText(tr("Reset")); panel_reset_button->setFlashColor(QColor(RDPANEL_RESET_FLASH_COLOR)); - panel_reset_button->setFocusPolicy(QWidget::NoFocus); + panel_reset_button->setFocusPolicy(Qt::NoFocus); connect(panel_reset_button,SIGNAL(clicked()),this,SLOT(resetClickedData())); // @@ -163,7 +163,7 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, panel_all_button->setFont(button_font); panel_all_button->setText(tr("All")); panel_all_button->setFlashColor(QColor(RDPANEL_RESET_FLASH_COLOR)); - panel_all_button->setFocusPolicy(QWidget::NoFocus); + panel_all_button->setFocusPolicy(Qt::NoFocus); panel_all_button->hide(); connect(panel_all_button,SIGNAL(clicked()),this,SLOT(allClickedData())); @@ -178,7 +178,7 @@ RDSoundPanel::RDSoundPanel(int cols,int rows,int station_panels, panel_setup_button->setFont(button_font); panel_setup_button->setText(tr("Setup")); panel_setup_button->setFlashColor(QColor(RDPANEL_SETUP_FLASH_COLOR)); - panel_setup_button->setFocusPolicy(QWidget::NoFocus); + panel_setup_button->setFocusPolicy(Qt::NoFocus); connect(panel_setup_button,SIGNAL(clicked()),this,SLOT(setupClickedData())); // diff --git a/lib/rdstatus.cpp b/lib/rdstatus.cpp index 3f477c20..8f19d41c 100644 --- a/lib/rdstatus.cpp +++ b/lib/rdstatus.cpp @@ -25,6 +25,8 @@ #include #include +//Added by qt3to4: +#include #include "rdstatus.h" @@ -67,23 +69,21 @@ bool RDDbValid(RDConfig *config,int *schema) QSqlQuery *q; bool ret=false; - QSqlDatabase *db=QSqlDatabase::addDatabase(config->mysqlDriver()); - if(db) { - db->setDatabaseName(config->mysqlDbname()); - db->setUserName(config->mysqlUsername()); - db->setPassword(config->mysqlPassword()); - db->setHostName(config->mysqlHostname()); - if(db->open()) { - ret=true; - sql="select DB from VERSION"; - q=new QSqlQuery(sql); - if(q->first()) { - *schema=q->value(0).toInt(); - } - delete q; - db->close(); + QSqlDatabase db=QSqlDatabase::addDatabase(config->mysqlDriver()); + db.setDatabaseName(config->mysqlDbname()); + db.setUserName(config->mysqlUsername()); + db.setPassword(config->mysqlPassword()); + db.setHostName(config->mysqlHostname()); + if(db.open()) { + ret=true; + sql="select DB from VERSION"; + q=new QSqlQuery(sql); + if(q->first()) { + *schema=q->value(0).toInt(); } - QSqlDatabase::removeDatabase(db); + delete q; + db.close(); } + return ret; } diff --git a/lib/rdstereometer.cpp b/lib/rdstereometer.cpp index 493b9a13..40672446 100644 --- a/lib/rdstereometer.cpp +++ b/lib/rdstereometer.cpp @@ -27,9 +27,12 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include -#include +#include #include #include @@ -44,7 +47,7 @@ RDStereoMeter::RDStereoMeter(QWidget *parent) clip_light_on=false; label_x=0; meter_label=QString(""); - setBackgroundColor(black); + setBackgroundColor(Qt::black); left_meter=new RDSegMeter(RDSegMeter::Right,this); left_meter->setGeometry(25,10,300,10); left_meter->setRange(-4600,-800); @@ -284,8 +287,8 @@ void RDStereoMeter::paintEvent(QPaintEvent *paintEvent) QPixmap pix(this->size()); pix.fill(this,0,0); QPainter *p=new QPainter(&pix); - p->setBrush(QColor(white)); - p->setPen(QColor(white)); + p->setBrush(QColor(Qt::white)); + p->setPen(QColor(Qt::white)); p->setFont(meter_scale_font); p->drawText(10,20,tr("L")); p->drawText(10,50,tr("R")); diff --git a/lib/rdstereometer.h b/lib/rdstereometer.h index aeb5a885..ba574ea9 100644 --- a/lib/rdstereometer.h +++ b/lib/rdstereometer.h @@ -27,9 +27,11 @@ #include #include #include +//Added by qt3to4: +#include #include -#define CLIP_LIGHT_COLOR red +#define CLIP_LIGHT_COLOR Qt::red class RDStereoMeter : public QWidget { diff --git a/lib/rdstringlist.cpp b/lib/rdstringlist.cpp index 0dea5bef..0ef00707 100644 --- a/lib/rdstringlist.cpp +++ b/lib/rdstringlist.cpp @@ -38,7 +38,7 @@ RDStringList::RDStringList(const QStringList &lhs) } -RDStringList RDStringList::split(const QString &sep,const QString &str, +RDStringList RDStringList::split(const QChar &sep,const QString &str, const QString &esc) { if(esc.isEmpty()) { @@ -48,7 +48,7 @@ RDStringList RDStringList::split(const QString &sep,const QString &str, bool escape=false; QChar e=esc.at(0); list.push_back(QString()); - for(unsigned i=0;ientryList(QDir::Files); - for(unsigned i=0;iremove(files[i]); } temp_dir->rmdir(temp_dir->path()); diff --git a/lib/rdtextfile.cpp b/lib/rdtextfile.cpp index 6eb61a23..58ee2c2c 100644 --- a/lib/rdtextfile.cpp +++ b/lib/rdtextfile.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include "rdconf.h" #include "rd.h" @@ -62,7 +62,7 @@ bool RDTextFile(const QString &data) QStringList args; args+=editor; args+=tempfile; - QProcess *proc=new QProcess(args); + Q3Process *proc=new Q3Process(args); proc->launch(""); delete proc; #else @@ -75,7 +75,7 @@ bool RDTextFile(const QString &data) write(fd,data.utf8(),data.utf8().length()); ::close(fd); if(fork()==0) { - system(editor+" "+tmpfile); + system(editor+" "+QString(tmpfile)); unlink(tmpfile); exit(0); } diff --git a/lib/rdtimeedit.cpp b/lib/rdtimeedit.cpp index 7eb218bb..952fd22a 100644 --- a/lib/rdtimeedit.cpp +++ b/lib/rdtimeedit.cpp @@ -19,21 +19,28 @@ // #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include #include RDTimeEdit::RDTimeEdit(QWidget *parent) - : QFrame(parent) + : Q3Frame(parent) { edit_display=0; edit_section=0; edit_read_only=false; edit_digit=0; GetSizeHint(); - setFrameStyle(QFrame::StyledPanel|QFrame::Sunken); + setFrameStyle(Q3Frame::StyledPanel|Q3Frame::Sunken); setLineWidth(1); setMidLineWidth(3); - setFocusPolicy(QWidget::StrongFocus); + setFocusPolicy(Qt::StrongFocus); QPalette p=palette(); p.setColor(QPalette::Active,QColorGroup::Background, p.color(QPalette::Active,QColorGroup::Base)); @@ -53,10 +60,10 @@ RDTimeEdit::RDTimeEdit(QWidget *parent) edit_sep_labels[2]=new QLabel(".",this); edit_sep_labels[2]->setAlignment(Qt::AlignCenter); edit_up_button=new RDTransportButton(RDTransportButton::Up,this); - edit_up_button->setFocusPolicy(QWidget::NoFocus); + edit_up_button->setFocusPolicy(Qt::NoFocus); connect(edit_up_button,SIGNAL(clicked()),this,SLOT(upClickedData())); edit_down_button=new RDTransportButton(RDTransportButton::Down,this); - edit_down_button->setFocusPolicy(QWidget::NoFocus); + edit_down_button->setFocusPolicy(Qt::NoFocus); connect(edit_down_button,SIGNAL(clicked()),this,SLOT(downClickedData())); setDisplay(RDTimeEdit::Hours|RDTimeEdit::Minutes|RDTimeEdit::Seconds); } @@ -106,7 +113,7 @@ bool RDTimeEdit::isReadOnly() const void RDTimeEdit::setFont(const QFont &f) { - QFrame::setFont(f); + Q3Frame::setFont(f); GetSizeHint(); } @@ -147,7 +154,7 @@ void RDTimeEdit::setDisplay(uint disp) void RDTimeEdit::setGeometry(int x,int y,int w,int h) { - QFrame::setGeometry(x,y,w,h); + Q3Frame::setGeometry(x,y,w,h); QFontMetrics fm(font()); int fy=h-fm.height(); int fx=contentsRect().x()+fy; @@ -199,10 +206,10 @@ void RDTimeEdit::setTime(const QTime &time) void RDTimeEdit::setReadOnly(bool state) { if(state) { - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(Qt::NoFocus); } else { - setFocusPolicy(QWidget::StrongFocus); + setFocusPolicy(Qt::StrongFocus); } edit_read_only=state; } @@ -219,7 +226,7 @@ void RDTimeEdit::setFocus() p.setColor(QPalette::Active,QColorGroup::Foreground, p.color(QPalette::Active,QColorGroup::HighlightedText)); edit_labels[edit_section]->setPalette(p); - QFrame::setFocus(); + Q3Frame::setFocus(); } @@ -420,18 +427,18 @@ void RDTimeEdit::keyPressEvent(QKeyEvent *e) void RDTimeEdit::focusInEvent(QFocusEvent *e) { - QFrame::focusInEvent(e); + Q3Frame::focusInEvent(e); } void RDTimeEdit::focusOutEvent(QFocusEvent *e) { - QFrame::focusOutEvent(e); + Q3Frame::focusOutEvent(e); QPalette p=palette(); for(int i=0;i<4;i++) { edit_labels[i]->setPalette(p); } - QFrame::focusOutEvent(e); + Q3Frame::focusOutEvent(e); } diff --git a/lib/rdtimeedit.h b/lib/rdtimeedit.h index ac82202a..2f7b5b39 100644 --- a/lib/rdtimeedit.h +++ b/lib/rdtimeedit.h @@ -21,13 +21,18 @@ #ifndef RDTIMEEDIT_H #define RDTIMEEDIT_H -#include +#include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include -class RDTimeEdit : public QFrame +class RDTimeEdit : public Q3Frame { Q_OBJECT public: diff --git a/lib/rdtransportbutton.cpp b/lib/rdtransportbutton.cpp index 0b20f714..644d9e80 100644 --- a/lib/rdtransportbutton.cpp +++ b/lib/rdtransportbutton.cpp @@ -2,7 +2,7 @@ // // An audio transport button widget. // -// (C) Copyright 2002,2016 Fred Gleason +// (C) Copyright 2002,2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -17,18 +17,16 @@ // License along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// -#include -#include -#include +#include #include -#include -#include +#include #include +#include +#include +#include -#include - +#include "rdtransportbutton.h" RDTransportButton::RDTransportButton(RDTransportButton::TransType type, QWidget *parent) @@ -214,7 +212,7 @@ void RDTransportButton::updateCaps() void RDTransportButton::drawMask(QPixmap *cap) { - QPointArray triangle=QPointArray(3); + Q3PointArray triangle=Q3PointArray(3); QPainter b; QBitmap *bitmap=new QBitmap(size()); int edge; @@ -227,110 +225,125 @@ void RDTransportButton::drawMask(QPixmap *cap) } cap->resize(size()); b.begin(bitmap); - b.fillRect(0,0,size().width(),size().height(),QColor(color0)); - b.setPen(QColor(color1)); - b.setBrush(QColor(color1)); + b.fillRect(0,0,size().width(),size().height(),QColor(Qt::color0)); + b.setPen(QColor(Qt::color1)); + b.setBrush(QColor(Qt::color1)); switch(button_type) { - case RDTransportButton::Play: - triangle.setPoint(0,width()/2-(3*edge)/10,height()/2-(3*edge)/10); - triangle.setPoint(1,width()/2+(3*edge)/10,height()/2); - triangle.setPoint(2,width()/2-(3*edge)/10,height()/2+(3*edge)/10); - b.drawPolygon(triangle); - break; - case RDTransportButton::Stop: - b.fillRect(width()/2-edge*3/10,height()/2-edge*3/10, - edge*3/5,edge*3/5,QColor(color1)); - break; - case RDTransportButton::Record: - b.drawEllipse(width()/2-(3*edge)/10,height()/2-(3*edge)/10, - (3*edge)/5,(3*edge)/5); - break; - case RDTransportButton::FastForward: - triangle.setPoint(0,width()/2-(3*edge)/10,height()/2-(3*edge)/10); - triangle.setPoint(1,width()/2,height()/2); - triangle.setPoint(2,width()/2-(3*edge)/10,height()/2+(3*edge)/10); - b.drawPolygon(triangle); - triangle.setPoint(0,width()/2,height()/2-(3*edge)/10); - triangle.setPoint(1,width()/2+(3*edge)/10,height()/2); - triangle.setPoint(2,width()/2,height()/2+(3*edge)/10); - b.drawPolygon(triangle); - break; - case RDTransportButton::Rewind: - triangle.setPoint(0,width()/2+(3*edge)/10,height()/2-(3*edge)/10); - triangle.setPoint(1,width()/2,height()/2); - triangle.setPoint(2,width()/2+(3*edge)/10,height()/2+(3*edge)/10); - b.drawPolygon(triangle); - triangle.setPoint(0,width()/2,height()/2-(3*edge)/10); - triangle.setPoint(1,width()/2-(3*edge)/10,height()/2); - triangle.setPoint(2,width()/2,height()/2+(3*edge)/10); - b.drawPolygon(triangle); - break; - case RDTransportButton::Eject: - triangle.setPoint(0,width()/2,height()/2-(3*edge)/10); - triangle.setPoint(1,width()/2+(3*edge)/10,height()/2); - triangle.setPoint(2,width()/2-(3*edge)/10,height()/2); - b.drawPolygon(triangle); - b.fillRect(width()/2-(3*edge)/10,height()/2+edge/10, - (3*edge)/5,edge/5,QColor(color1)); - break; - case RDTransportButton::Pause: - b.fillRect(width()/2-(3*edge)/10,height()/2-(3*edge)/10, - (3*edge)/15,(3*edge)/5,QColor(color1)); - b.fillRect(width()/2+(3*edge)/30,height()/2-(3*edge)/10, - (3*edge)/15,(3*edge)/5,QColor(color1)); - break; - case RDTransportButton::PlayFrom: - b.fillRect(width()/2-(3*edge)/10,height()/2-(3*edge)/10, - 3,(3*edge)/5,QBrush(color1)); - triangle.setPoint(0,width()/2-(2*edge)/10+1,height()/2-(3*edge)/10); - triangle.setPoint(1,width()/2+(3*edge)/10+1,height()/2); - triangle.setPoint(2,width()/2-(2*edge)/10+1,height()/2+(3*edge)/10); - b.drawPolygon(triangle); - break; - case RDTransportButton::PlayBetween: - b.fillRect(width()/2-(3*edge)/10,height()/2-(3*edge)/10, - 3,(3*edge)/5,QBrush(color1)); - b.fillRect(width()/2+(3*edge)/10,height()/2-(3*edge)/10, - 3,(3*edge)/5,QBrush(color1)); - triangle.setPoint(0,width()/2-(2*edge)/10+1,height()/2-(3*edge)/10); - triangle.setPoint(1,width()/2+(2*edge)/10+1,height()/2); - triangle.setPoint(2,width()/2-(2*edge)/10+1,height()/2+(3*edge)/10); - b.drawPolygon(triangle); - break; - case RDTransportButton::Loop: - b.moveTo(width()/2-(2*edge)/10+1,height()/2+(edge)/4); - b.moveTo(width()/2+(edge)/10+1,height()/2-edge/10); - b.moveTo(width()/2-(2*edge)/10+1,height()/2+(edge)/4); - b.drawArc(width()/6,height()/2-edge/9,2*width()/3, - height()/3+edge/10,1440,5760); - triangle.setPoint(0,width()/2-(2*edge)/10+1,height()/2-(edge)/4); - triangle.setPoint(1,width()/2+(edge)/10+1,height()/2-edge/10); - triangle.setPoint(2,width()/2-(2*edge)/10+1,height()/2+edge/20); - b.drawPolygon(triangle); - break; - case RDTransportButton::Up: - triangle.setPoint(0,width()/2,(3*edge)/10); - triangle.setPoint(1,width()/2+(3*edge)/10,height()-(3*edge)/10); - triangle.setPoint(2,width()/2-(3*edge)/10,height()-(3*edge)/10); - b.drawPolygon(triangle); - break; - case RDTransportButton::Down: - triangle.setPoint(0,width()/2,height()-(3*edge)/10); - triangle.setPoint(1,width()/2+(3*edge)/10,(3*edge)/10); - triangle.setPoint(2,width()/2-(3*edge)/10,(3*edge)/10); - b.drawPolygon(triangle); - break; - case RDTransportButton::PlayTo: - b.fillRect(width()/2+(3*edge)/10,height()/2-(3*edge)/10, - 3,(3*edge)/5,QBrush(color1)); - triangle.setPoint(0,width()/2-(3*edge)/10,height()/2-(3*edge)/10); - triangle.setPoint(1,width()/2+(2*edge)/10+1,height()/2); - triangle.setPoint(2,width()/2-(3*edge)/10,height()/2+(3*edge)/10); - b.drawPolygon(triangle); - break; - default: - b.fillRect(0,0,width(),height(),QColor(color1)); + case RDTransportButton::Play: + triangle.setPoint(0,width()/2-(3*edge)/10,height()/2-(3*edge)/10); + triangle.setPoint(1,width()/2+(3*edge)/10,height()/2); + triangle.setPoint(2,width()/2-(3*edge)/10,height()/2+(3*edge)/10); + b.drawPolygon(triangle); + break; + + case RDTransportButton::Stop: + b.fillRect(width()/2-edge*3/10,height()/2-edge*3/10, + edge*3/5,edge*3/5,QColor(Qt::color1)); + break; + + case RDTransportButton::Record: + b.drawEllipse(width()/2-(3*edge)/10,height()/2-(3*edge)/10, + (3*edge)/5,(3*edge)/5); + break; + + case RDTransportButton::FastForward: + triangle.setPoint(0,width()/2-(3*edge)/10,height()/2-(3*edge)/10); + triangle.setPoint(1,width()/2,height()/2); + triangle.setPoint(2,width()/2-(3*edge)/10,height()/2+(3*edge)/10); + b.drawPolygon(triangle); + triangle.setPoint(0,width()/2,height()/2-(3*edge)/10); + triangle.setPoint(1,width()/2+(3*edge)/10,height()/2); + triangle.setPoint(2,width()/2,height()/2+(3*edge)/10); + b.drawPolygon(triangle); + break; + + case RDTransportButton::Rewind: + triangle.setPoint(0,width()/2+(3*edge)/10,height()/2-(3*edge)/10); + triangle.setPoint(1,width()/2,height()/2); + triangle.setPoint(2,width()/2+(3*edge)/10,height()/2+(3*edge)/10); + b.drawPolygon(triangle); + triangle.setPoint(0,width()/2,height()/2-(3*edge)/10); + triangle.setPoint(1,width()/2-(3*edge)/10,height()/2); + triangle.setPoint(2,width()/2,height()/2+(3*edge)/10); + b.drawPolygon(triangle); + break; + + case RDTransportButton::Eject: + triangle.setPoint(0,width()/2,height()/2-(3*edge)/10); + triangle.setPoint(1,width()/2+(3*edge)/10,height()/2); + triangle.setPoint(2,width()/2-(3*edge)/10,height()/2); + b.drawPolygon(triangle); + b.fillRect(width()/2-(3*edge)/10,height()/2+edge/10, + (3*edge)/5,edge/5,QColor(Qt::color1)); + break; + + case RDTransportButton::Pause: + b.fillRect(width()/2-(3*edge)/10,height()/2-(3*edge)/10, + (3*edge)/15,(3*edge)/5,QColor(Qt::color1)); + b.fillRect(width()/2+(3*edge)/30,height()/2-(3*edge)/10, + (3*edge)/15,(3*edge)/5,QColor(Qt::color1)); + break; + + case RDTransportButton::PlayFrom: + b.fillRect(width()/2-(3*edge)/10,height()/2-(3*edge)/10, + 3,(3*edge)/5,QBrush(Qt::color1)); + triangle.setPoint(0,width()/2-(2*edge)/10+1,height()/2-(3*edge)/10); + triangle.setPoint(1,width()/2+(3*edge)/10+1,height()/2); + triangle.setPoint(2,width()/2-(2*edge)/10+1,height()/2+(3*edge)/10); + b.drawPolygon(triangle); + break; + + case RDTransportButton::PlayBetween: + b.fillRect(width()/2-(3*edge)/10,height()/2-(3*edge)/10, + 3,(3*edge)/5,QBrush(Qt::color1)); + b.fillRect(width()/2+(3*edge)/10,height()/2-(3*edge)/10, + 3,(3*edge)/5,QBrush(Qt::color1)); + triangle.setPoint(0,width()/2-(2*edge)/10+1,height()/2-(3*edge)/10); + triangle.setPoint(1,width()/2+(2*edge)/10+1,height()/2); + triangle.setPoint(2,width()/2-(2*edge)/10+1,height()/2+(3*edge)/10); + b.drawPolygon(triangle); + break; + + case RDTransportButton::Loop: + /* + b.moveTo(width()/2-(2*edge)/10+1,height()/2+(edge)/4); + b.moveTo(width()/2+(edge)/10+1,height()/2-edge/10); + b.moveTo(width()/2-(2*edge)/10+1,height()/2+(edge)/4); + */ + b.drawArc(width()/6,height()/2-edge/9,2*width()/3, + height()/3+edge/10,1440,5760); + triangle.setPoint(0,width()/2-(2*edge)/10+1,height()/2-(edge)/4); + triangle.setPoint(1,width()/2+(edge)/10+1,height()/2-edge/10); + triangle.setPoint(2,width()/2-(2*edge)/10+1,height()/2+edge/20); + b.drawPolygon(triangle); + break; + + case RDTransportButton::Up: + triangle.setPoint(0,width()/2,(3*edge)/10); + triangle.setPoint(1,width()/2+(3*edge)/10,height()-(3*edge)/10); + triangle.setPoint(2,width()/2-(3*edge)/10,height()-(3*edge)/10); + b.drawPolygon(triangle); + break; + + case RDTransportButton::Down: + triangle.setPoint(0,width()/2,height()-(3*edge)/10); + triangle.setPoint(1,width()/2+(3*edge)/10,(3*edge)/10); + triangle.setPoint(2,width()/2-(3*edge)/10,(3*edge)/10); + b.drawPolygon(triangle); + break; + + case RDTransportButton::PlayTo: + b.fillRect(width()/2+(3*edge)/10,height()/2-(3*edge)/10, + 3,(3*edge)/5,QBrush(Qt::color1)); + triangle.setPoint(0,width()/2-(3*edge)/10,height()/2-(3*edge)/10); + triangle.setPoint(1,width()/2+(2*edge)/10+1,height()/2); + triangle.setPoint(2,width()/2-(3*edge)/10,height()/2+(3*edge)/10); + b.drawPolygon(triangle); + break; + + default: + b.fillRect(0,0,width(),height(),QColor(Qt::color1)); } b.end(); cap->setMask(*bitmap); @@ -342,7 +355,7 @@ void RDTransportButton::drawMask(QPixmap *cap) void RDTransportButton::drawOnCap() { QPainter p; - QPointArray triangle=QPointArray(3); + Q3PointArray triangle=Q3PointArray(3); int edge; if(height() #include #include +//Added by qt3to4: +#include -#define RDTRANSPORTBUTTON_DEFAULT_ON_COLOR green +#define RDTRANSPORTBUTTON_DEFAULT_ON_COLOR Qt::green class RDTransportButton : public QPushButton { diff --git a/lib/rdtrimaudio.cpp b/lib/rdtrimaudio.cpp index 34ec2e0c..38c1322e 100644 --- a/lib/rdtrimaudio.cpp +++ b/lib/rdtrimaudio.cpp @@ -231,7 +231,7 @@ bool RDTrimAudio::ParseXml(const QString &xml) bool ret=false; QStringList list=list.split("\n",xml); - for(unsigned i=0;i=2) { @@ -255,7 +255,7 @@ int RDTrimAudio::ParsePoint(const QString &tag,const QString &xml) // a proper XML parser. // QStringList list=list.split("\n",xml); - for(unsigned i=0;i=2) { diff --git a/lib/rdttydevice.cpp b/lib/rdttydevice.cpp index 35c6d400..40df6b3d 100644 --- a/lib/rdttydevice.cpp +++ b/lib/rdttydevice.cpp @@ -1,8 +1,9 @@ -// rdttydevice.cpp +// rdttydevice.cpp // -// A Qt driver for tty ports on Linux. +// A Qt driver for tty ports. // -// (C) Copyright 2002,2016 Fred Gleason +// (C) Copyright 2010-1018 Fred Gleason +// All Rights Reserved. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -22,59 +23,80 @@ #include #include #include +#include #include -#include -#include +#include "rdttydevice.h" -RDTTYDevice::RDTTYDevice() : QIODevice() +RDTTYDevice::RDTTYDevice(QObject *parent) + : QIODevice(parent) { - Init(); + tty_speed=9600; + tty_length=8; + tty_parity=RDTTYDevice::None; + tty_flow_control=RDTTYDevice::FlowNone; + tty_open=false; + tty_notifier=NULL; + + tty_write_timer=new QTimer(this); + tty_write_timer->setSingleShot(false); + connect(tty_write_timer,SIGNAL(timeout()),this,SLOT(writeTtyData())); } RDTTYDevice::~RDTTYDevice() { - if(tty_open) { - close(); - } + close(); + delete tty_write_timer; } -bool RDTTYDevice::open(int mode) + +bool RDTTYDevice::open(QIODevice::OpenMode mode) { int flags=O_NONBLOCK|O_NOCTTY; struct termios term; tty_mode=mode; - if((mode&IO_ReadWrite)==IO_ReadWrite) { + if((mode&QIODevice::ReadWrite)==QIODevice::ReadWrite) { flags|=O_RDWR; } else { - if(((mode&IO_WriteOnly)!=0)) { + if(((mode&QIODevice::WriteOnly)!=0)) { flags|=O_WRONLY; } - if(((mode&IO_ReadOnly)!=0)) { + if(((mode&QIODevice::ReadOnly)!=0)) { flags|=O_RDONLY; } } - if((mode&IO_Append)!=0) { + if((mode&QIODevice::Append)!=0) { flags|=O_APPEND; } - if((mode&IO_Truncate)!=0) { + if((mode&QIODevice::Truncate)!=0) { flags|=O_TRUNC; } - if((tty_fd=::open((const char *)tty_name,flags))<0) { - tty_status=IO_OpenError; + if((tty_fd=::open(tty_name.toAscii(),flags))<0) { return false; } tty_open=true; - tty_status=IO_Ok; tcgetattr(tty_fd,&term); - cfsetispeed(&term,B0); + + // + // Set Speed + // + //cfsetispeed(&term,B0); + cfsetispeed(&term,tty_speed); cfsetospeed(&term,tty_speed); + + // + // Set Mode + // cfmakeraw(&term); term.c_iflag |= IGNBRK; + + // + // Set Parity + // switch(tty_parity) { case RDTTYDevice::None: term.c_iflag |= IGNPAR; @@ -88,8 +110,59 @@ bool RDTTYDevice::open(int mode) term.c_cflag |= PARENB|PARODD; break; } + + // + // Set Word Length + // + //term.c_cflag &= ~CSIZE; + switch(tty_length) { + case 5: + term.c_cflag |= CS5; + break; + + case 6: + term.c_cflag |= CS6; + break; + + case 7: + term.c_cflag |= CS7; + break; + + case 8: + term.c_cflag |= CS8; + break; + } + + // + // Set Flow Control + // + switch(tty_flow_control) { + case RDTTYDevice::FlowNone: + term.c_cflag &= ~CRTSCTS; + term.c_iflag &= ~IXON; + term.c_iflag &= ~IXOFF; + break; + + case RDTTYDevice::FlowRtsCts: + term.c_cflag |= CRTSCTS; + term.c_iflag &= ~IXON; + term.c_iflag &= ~IXOFF; + break; + + case RDTTYDevice::FlowXonXoff: + term.c_cflag &= ~CRTSCTS; + term.c_iflag |= IXON; + term.c_iflag |= IXOFF; + break; + } + tcsetattr(tty_fd,TCSADRAIN,&term); + tty_notifier=new QSocketNotifier(tty_fd,QSocketNotifier::Read,this); + connect(tty_notifier,SIGNAL(activated(int)),this,SLOT(readTtyData(int))); + + tty_write_timer->start(10); + return true; } @@ -97,220 +170,143 @@ bool RDTTYDevice::open(int mode) void RDTTYDevice::close() { if(tty_open) { + emit aboutToClose(); + tty_write_timer->stop(); + delete tty_notifier; + tty_notifier=NULL; ::close(tty_fd); + if((tty_mode&QIODevice::ReadOnly)!=0) { + emit readChannelFinished(); + } } tty_open=false; } -int RDTTYDevice::socket() +QString RDTTYDevice::name() const { - return tty_fd; + return tty_name; } -void RDTTYDevice::flush() +void RDTTYDevice::setName(const QString &str) { + tty_name=str; } -Q_LONG RDTTYDevice::readBlock(char *data,Q_ULONG maxlen) +qint64 RDTTYDevice::read(char *data,qint64 maxlen) { - Q_LONG n; - - if((n=read(tty_fd,data,(size_t)maxlen))<0) { - if(errno!=EAGAIN) { - tty_status=IO_ReadError; - return -1; - } - return 0; - } - tty_status=IO_Ok; - return n; + return readData(data,maxlen); } -Q_LONG RDTTYDevice::writeBlock(const char *data,Q_ULONG len) +QByteArray RDTTYDevice::read(qint64 maxlen) { - Q_LONG n; - - if((n=write(tty_fd,data,(size_t)len))<0) { - tty_status=IO_WriteError; - return n; - } - tty_status=IO_Ok; - return n; + qint64 n=0; + char *data=new char[maxlen]; + n=readData(data,maxlen); + QByteArray ret(data,n); + delete data; + return ret; } -int RDTTYDevice::getch() +QByteArray RDTTYDevice::readAll() { - char c; - int n; - - if((n=readBlock(&c,1))<0) { - tty_status=IO_ReadError; - return -1; - } - return (int)c; + return read(bytesAvailable()); } -int RDTTYDevice::putch(int ch) +qint64 RDTTYDevice::readBlock(char *data,qint64 maxlen) { - char c; - int n; - - c=(char)ch; - if((n=writeBlock(&c,1))<0) { - tty_status=IO_WriteError; - return -1; - } - return ch; + return readData(data,maxlen); } -int RDTTYDevice::ungetch(int ch) +qint64 RDTTYDevice::write(const char *data,qint64 len) { - tty_status=IO_WriteError; - return -1; + return writeData(data,len); } -QIODevice::Offset RDTTYDevice::size() const +qint64 RDTTYDevice::write(const QByteArray &array) { - return 0; + return write(array.constData(),array.size()); } -int RDTTYDevice::flags() const +bool RDTTYDevice::getChar(char *ch) { - return tty_mode|state(); + return readData(ch,1)==1; } -int RDTTYDevice::mode() const +bool RDTTYDevice::putChar(char ch) { - return tty_mode; + return writeData(&ch,1)==1; } -int RDTTYDevice::state() const +qint64 RDTTYDevice::size() const { + return bytesAvailable(); +} + + +qint64 RDTTYDevice::bytesAvailable() const +{ + int val=0; if(tty_open) { - return IO_Open; + ioctl(tty_fd,FIONREAD,&val); } - return 0; + return val; } -bool RDTTYDevice::isDirectAccess() const +qint64 RDTTYDevice::bytesToWrite() const { - return false; + int val=0; + if(tty_open) { + ioctl(tty_fd,TIOCOUTQ,&val); + } + return val; } -bool RDTTYDevice::isSequentialAccess() const +bool RDTTYDevice::isSequential() const { return true; } -bool RDTTYDevice::isCombinedAccess() const -{ - return false; -} - - -bool RDTTYDevice::isBuffered() const -{ - return false; -} - - -bool RDTTYDevice::isRaw() const -{ - return true; -} - - -bool RDTTYDevice::isSynchronous() const -{ - return true; -} - - -bool RDTTYDevice::isAsynchronous() const -{ - return false; -} - - -bool RDTTYDevice::isTranslated() const -{ - return false; -} - - bool RDTTYDevice::isReadable() const { - if(((tty_mode&IO_ReadOnly)!=0)||((tty_mode&IO_ReadWrite)!=0)) { - return true; - } - return false; + return((tty_mode&QIODevice::ReadOnly)!=0)|| + ((tty_mode&QIODevice::ReadWrite)!=0); } bool RDTTYDevice::isWritable() const { - if(((tty_mode&IO_WriteOnly)!=0)||((tty_mode&IO_ReadWrite)!=0)) { - return true; - } - return false; -} - - -bool RDTTYDevice::isReadWrite() const -{ - if((tty_mode&IO_ReadWrite)!=0) { - return true; - } - return false; - -} - - -bool RDTTYDevice::isInactive() const -{ - if(!tty_open) { - return true; - } - return false; + return ((tty_mode&QIODevice::WriteOnly)!=0)|| + ((tty_mode&QIODevice::ReadWrite)!=0); } bool RDTTYDevice::isOpen() const { - if(tty_open) { - return true; - } - return false; + return tty_open; } -int RDTTYDevice::status() const +QString RDTTYDevice::deviceName() const { - return tty_status; + return tty_name; } -void RDTTYDevice::resetStatus() -{ - tty_status=IO_Ok; -} - - -void RDTTYDevice::setName(QString name) +void RDTTYDevice::setDeviceName(QString name) { tty_name=name; } @@ -482,8 +478,6 @@ void RDTTYDevice::setSpeed(int speed) tty_speed=B9600; break; } - - } @@ -548,10 +542,68 @@ void RDTTYDevice::setParity(Parity parity) } -void RDTTYDevice::Init() +RDTTYDevice::FlowControl RDTTYDevice::flowControl() const { - tty_speed=9600; - tty_length=8; - tty_parity=RDTTYDevice::None; - tty_open=false; + return tty_flow_control; +} + + +void RDTTYDevice::setFlowControl(FlowControl ctrl) +{ + tty_flow_control=ctrl; +} + + +int RDTTYDevice::fileDescriptor() const +{ + return tty_fd; +} + + +qint64 RDTTYDevice::readData(char *data,qint64 maxlen) +{ + qint64 n; + + if((n=::read(tty_fd,data,(size_t)maxlen))<0) { + return 0; + } + return n; +} + + +qint64 RDTTYDevice::writeData(const char *data,qint64 len) +{ + for(qint64 i=0;i +// (C) Copyright 2010-2018 Fred Gleason +// All Rights Reserved // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -21,255 +22,78 @@ #ifndef RDTTYDEVICE_H #define RDTTYDEVICE_H -#define WIN32_BUFFER_SIZE 130 - #ifdef WIN32 #include #else #include #include #endif // WIN32 + +#include + #include -#include +#include +#include - -/** - * @short A QIODevice-compatible class for serial ports. - * @author Fred Gleason - * - * This class implements an QIODevice-compatible class for dealing - * with serial ports. - **/ +#define WIN32_BUFFER_SIZE 130 class RDTTYDevice : public QIODevice { + Q_OBJECT; public: - enum Parity {None=0,Even=1,Odd=2}; - - /** - * Create an RDTTYDevice object - **/ - RDTTYDevice(); - - /** - * Destroy an RDTTYDevice object - **/ + enum Parity {None=0,Even=1,Odd=2}; + enum FlowControl {FlowNone=0,FlowRtsCts=1,FlowXonXoff=2}; + RDTTYDevice(QObject *parent=0); ~RDTTYDevice(); - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool open(int mode); - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ + QString name() const; + void setName(const QString &str); + bool open(QIODevice::OpenMode mode); void close(); - -#ifndef WIN32 - int socket(); -#endif // WIN32 - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - void flush(); - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - Q_LONG readBlock(char *data,Q_ULONG maxlen); - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - Q_LONG writeBlock(const char *data,Q_ULONG len); - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - int getch(); - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - int putch(int ch); - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - int ungetch(int ch); - - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - QIODevice::Offset size() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - int flags() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - int mode() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - int state() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool isDirectAccess() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool isSequentialAccess() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool isCombinedAccess() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool isBuffered() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool isRaw() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool isSynchronous() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool isAsynchronous() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool isTranslated() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ + qint64 read(char *data,qint64 maxlen); + QByteArray read(qint64 maxlen); + QByteArray readAll(); + qint64 readBlock(char *data,qint64 maxlen); + qint64 write(const char *data,qint64 len); + qint64 write(const QByteArray &array); + bool getChar(char *ch); + bool putChar(char ch); + qint64 size() const; + qint64 bytesAvailable() const; + qint64 bytesToWrite() const; + bool isSequential() const; bool isReadable() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ bool isWritable() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool isReadWrite() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - bool isInactive() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ bool isOpen() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - int status() const; - - /** - * This method is reimplemented from the QIODevice class, the API is - * unaffected. - **/ - void resetStatus(); - - /** - * Set the name of the tty device to use. - * @param name Name of tty device to use. - **/ - void setName(QString name); - - /** - * Returns the speed of the tty device, in bits per second. - **/ + QString deviceName() const; + void setDeviceName(QString name); int speed() const; - - /** - * Set the speed of the tty device. - * @param speed Speed of the tty device, in bits per second. - **/ void setSpeed(int speed); - - /** - * Returns the word length of the tty device. - **/ int wordLength() const; - - /** - * Set the word length of the tty device. - * @param length Word length in bits. Legal values are 5, 6, 7 or 8. - **/ void setWordLength(int length); - - /** - * Returns the parity coding of the tty device. - **/ RDTTYDevice::Parity parity() const; - - /** - * Set the parity coding of the tty device. - * @param parity Parity coding. - **/ void setParity(Parity); + RDTTYDevice::FlowControl flowControl() const; + void setFlowControl(FlowControl ctrl); + int fileDescriptor() const; + + signals: + void readChannelFinished(); + + protected: + qint64 readData(char *data,qint64 maxlen); + qint64 writeData(const char *data,qint64 len); + + private slots: + void readTtyData(int sock); + void writeTtyData(); private: - void Init(); Parity tty_parity; + FlowControl tty_flow_control; QString tty_name; bool tty_open; int tty_flags; - int tty_mode; - int tty_status; + QIODevice::OpenMode tty_mode; #ifdef WIN32 HANDLE tty_fd; int tty_speed; @@ -279,6 +103,9 @@ class RDTTYDevice : public QIODevice speed_t tty_speed; tcflag_t tty_length; #endif // WIN32 + QSocketNotifier *tty_notifier; + std::queue tty_write_queue; + QTimer *tty_write_timer; }; diff --git a/lib/rdttydevice_win32.cpp b/lib/rdttydevice_win32.cpp index f5b7bb56..540507cf 100644 --- a/lib/rdttydevice_win32.cpp +++ b/lib/rdttydevice_win32.cpp @@ -50,14 +50,14 @@ bool RDTTYDevice::open(int mode) COMMTIMEOUTS timeouts; tty_mode=mode; - if((mode&IO_ReadWrite)==IO_ReadWrite) { + if((mode&QIODevice::ReadWrite)==QIODevice::ReadWrite) { flags|=GENERIC_WRITE|GENERIC_READ; } else { - if(((mode&IO_WriteOnly)!=0)) { + if(((mode&QIODevice::WriteOnly)!=0)) { flags|=GENERIC_WRITE; } - if(((mode&IO_ReadOnly)!=0)) { + if(((mode&QIODevice::ReadOnly)!=0)) { flags|=GENERIC_READ; } } @@ -182,7 +182,7 @@ int RDTTYDevice::ungetch(int ch) } -QIODevice::Offset RDTTYDevice::size() const +qlonglong RDTTYDevice::size() const { return 0; } @@ -259,7 +259,7 @@ bool RDTTYDevice::isTranslated() const bool RDTTYDevice::isReadable() const { - if(((tty_mode&IO_ReadOnly)!=0)||((tty_mode&IO_ReadWrite)!=0)) { + if(((tty_mode&QIODevice::ReadOnly)!=0)||((tty_mode&QIODevice::ReadWrite)!=0)) { return true; } return false; @@ -268,7 +268,7 @@ bool RDTTYDevice::isReadable() const bool RDTTYDevice::isWritable() const { - if(((tty_mode&IO_WriteOnly)!=0)||((tty_mode&IO_ReadWrite)!=0)) { + if(((tty_mode&QIODevice::WriteOnly)!=0)||((tty_mode&QIODevice::ReadWrite)!=0)) { return true; } return false; @@ -277,7 +277,7 @@ bool RDTTYDevice::isWritable() const bool RDTTYDevice::isReadWrite() const { - if((tty_mode&IO_ReadWrite)!=0) { + if((tty_mode&QIODevice::ReadWrite)!=0) { return true; } return false; diff --git a/lib/rdttyout.cpp b/lib/rdttyout.cpp index eed98c52..a8ca2e3d 100644 --- a/lib/rdttyout.cpp +++ b/lib/rdttyout.cpp @@ -34,7 +34,7 @@ bool RDTtyOut(const QString &station,unsigned port_id,const QString &str) tty_device->setSpeed(tty_entry->baudRate()); tty_device->setWordLength(tty_entry->dataBits()); tty_device->setParity(tty_entry->parity()); - if(!tty_device->open(IO_Raw|IO_WriteOnly)) { + if(!tty_device->open(QIODevice::Unbuffered|QIODevice::WriteOnly)) { delete tty_device; delete tty_entry; return false; diff --git a/lib/rdupload.h b/lib/rdupload.h index 6f2801f4..ff77b4cf 100644 --- a/lib/rdupload.h +++ b/lib/rdupload.h @@ -22,7 +22,7 @@ #define RDUPLOAD_H #include -#include +#include class RDUpload : public QObject { @@ -55,7 +55,7 @@ class RDUpload : public QObject friend int UploadProgressCallback(void *clientp,double dltotal,double dlnow, double ultotal,double ulnow); QString conv_src_filename; - QUrl conv_dst_url; + Q3Url conv_dst_url; bool conv_aborting; uint conv_src_size; }; diff --git a/lib/rdurl.cpp b/lib/rdurl.cpp index 2267a239..591b4a91 100644 --- a/lib/rdurl.cpp +++ b/lib/rdurl.cpp @@ -21,13 +21,13 @@ #include RDUrl::RDUrl() - : QUrl() + : Q3Url() { } RDUrl::RDUrl(const QString &url) - : QUrl(url) + : Q3Url(url) { } diff --git a/lib/rdurl.h b/lib/rdurl.h index 5071901f..c4f5a87d 100644 --- a/lib/rdurl.h +++ b/lib/rdurl.h @@ -22,9 +22,9 @@ #ifndef RDURL_H #define RDURL_H -#include +#include -class RDUrl : public QUrl +class RDUrl : public Q3Url { public: RDUrl(); diff --git a/lib/rdwavedata_dialog.cpp b/lib/rdwavedata_dialog.cpp index 0121a943..360c5a6c 100644 --- a/lib/rdwavedata_dialog.cpp +++ b/lib/rdwavedata_dialog.cpp @@ -19,6 +19,10 @@ // #include +//Added by qt3to4: +#include +#include +#include #include "rdwavedata_dialog.h" diff --git a/lib/rdwavedata_dialog.h b/lib/rdwavedata_dialog.h index b6ecc9be..6cf6b5bf 100644 --- a/lib/rdwavedata_dialog.h +++ b/lib/rdwavedata_dialog.h @@ -27,6 +27,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include diff --git a/lib/rdwavefile.cpp b/lib/rdwavefile.cpp index 2a98e72a..9590fdfb 100644 --- a/lib/rdwavefile.cpp +++ b/lib/rdwavefile.cpp @@ -43,6 +43,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -214,7 +216,7 @@ bool RDWaveFile::openWave(RDWaveData *data) unsigned char tmc_buffer[4]; wave_data=data; - if(!wave_file.open(IO_ReadOnly)) { + if(!wave_file.open(QIODevice::ReadOnly)) { return false; } @@ -538,7 +540,7 @@ bool RDWaveFile::createWave(RDWaveData *data,unsigned ptr_offset) return false; } prev_mask = umask(0113); // Set umask so files are user and group writable. - rc=wave_file.open(IO_ReadWrite|IO_Truncate); + rc=wave_file.open(QIODevice::ReadWrite|QIODevice::Truncate); unlink((wave_file.name()+".energy").ascii()); umask(prev_mask); if(rc==false) { @@ -585,7 +587,7 @@ bool RDWaveFile::createWave(RDWaveData *data,unsigned ptr_offset) vorbis_encode_ctl(&vorbis_inf,OV_ECTL_RATEMANAGE_SET,NULL); prev_mask = umask(0113); // Set umask so files are user and group writable. - rc=wave_file.open(IO_ReadWrite|IO_Truncate); + rc=wave_file.open(QIODevice::ReadWrite|QIODevice::Truncate); umask(prev_mask); if(rc==false) { vorbis_info_clear(&vorbis_inf); @@ -2326,7 +2328,7 @@ bool RDWaveFile::IsFlac(int fd) #ifdef HAVE_FLAC char buffer[5]; - ID3_Tag id3_tag(QCString().sprintf("%s",(const char *)wave_file.name().utf8())); + ID3_Tag id3_tag(Q3CString().sprintf("%s",(const char *)wave_file.name().utf8())); lseek(fd,id3_tag.GetPrependedBytes(),SEEK_SET); if(read(fd,buffer,4)!=4) { return false; @@ -3306,7 +3308,7 @@ void RDWaveFile::ReadTmcTag(const QString tag,const QString value) wave_data->setMetadataFound(true); } if(tag=="END") { - wave_data->setEndType((RDWaveData::EndType)((char)value[0])); + wave_data->setEndType((RDWaveData::EndType)((char)value.at(0).toAscii())); wave_data->setMetadataFound(true); } if(tag=="TMCIREF") { @@ -3356,7 +3358,7 @@ void RDWaveFile::ReadId3Metadata() return; } ID3_Frame *frame=NULL; - ID3_Tag id3_tag(QCString().sprintf("%s",(const char *)wave_file.name().utf8())); + ID3_Tag id3_tag(Q3CString().sprintf("%s",(const char *)wave_file.name().utf8())); if((frame=id3_tag.Find(ID3FID_USERTEXT,ID3FN_DESCRIPTION,"rdxl"))!=NULL) { rdxl_contents=ID3_GetString(frame,ID3FN_TEXT); if(wave_data!=NULL) { @@ -3988,7 +3990,7 @@ bool RDWaveFile::GetFlacStreamInfo() { #if HAVE_FLAC FLAC__StreamMetadata sinfo; - if(!FLAC__metadata_get_streaminfo(QCString().sprintf("%s",(const char *)wave_file.name().utf8()),&sinfo)) { + if(!FLAC__metadata_get_streaminfo(Q3CString().sprintf("%s",(const char *)wave_file.name().utf8()),&sinfo)) { return false; } samples_per_sec=sinfo.data.stream_info.sample_rate; @@ -4010,7 +4012,7 @@ void RDWaveFile::ReadFlacMetadata() QString artist; QString composer; FLAC__StreamMetadata* tags; - if(!FLAC__metadata_get_tags(QCString(). + if(!FLAC__metadata_get_tags(Q3CString(). sprintf("%s",(const char *)wave_file.name().utf8()),&tags)) { return; } @@ -4600,19 +4602,19 @@ unsigned RDWaveFile::LoadEnergy() bool RDWaveFile::ReadEnergyFile(QString wave_file_name) { if(has_energy && energy_loaded) return true; - + /* QFile energy_file; QString str; unsigned char frame[50]; energy_file.setName(wave_file_name+".energy"); - if(!energy_file.open(IO_ReadOnly)) + if(!energy_file.open(QIODevice::ReadOnly)) return false; if(energy_file.readLine(str,20) <= 0) return false; normalize_level=str.toDouble(); energy_file.close(); - if(!energy_file.open(IO_ReadOnly)) + if(!energy_file.open(QIODevice::ReadOnly)) return false; read(energy_file.handle(),frame,str.length()); int i=0; @@ -4626,20 +4628,27 @@ bool RDWaveFile::ReadEnergyFile(QString wave_file_name) energy_loaded=true; has_energy=true; return true; + */ + return false; } bool RDWaveFile::ReadNormalizeLevel(QString wave_file_name) { QFile energy_file; - QString str; + char str[21]; + int n; + // + // FIXME: This is really evil! + // energy_file.setName(wave_file_name+".energy"); - if(!energy_file.open(IO_ReadOnly)) + if(!energy_file.open(QIODevice::ReadOnly)) return false; - if(energy_file.readLine(str,20) <= 0) + if((n=energy_file.readLine(str,20)) <= 0) return false; - normalize_level=str.toDouble(); + str[n]=0; + normalize_level=QString(str).toDouble(); energy_file.close(); return true; } diff --git a/lib/rdwavepainter.cpp b/lib/rdwavepainter.cpp index 13b9da8a..dce5aed6 100644 --- a/lib/rdwavepainter.cpp +++ b/lib/rdwavepainter.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include @@ -29,7 +29,7 @@ #include -RDWavePainter::RDWavePainter(const QPaintDevice *pd,RDCut *cut, +RDWavePainter::RDWavePainter(QPaintDevice *pd,RDCut *cut, RDStation *station,RDUser *user,RDConfig *config) : QPainter(pd) { @@ -67,7 +67,7 @@ void RDWavePainter::nameWave(RDCut *cut) } -bool RDWavePainter::begin(const QPaintDevice *pd,RDCut *cut) +bool RDWavePainter::begin(QPaintDevice *pd,RDCut *cut) { wave_cut=cut; LoadWave(); @@ -75,7 +75,7 @@ bool RDWavePainter::begin(const QPaintDevice *pd,RDCut *cut) } -bool RDWavePainter::begin(const QPaintDevice *pd) +bool RDWavePainter::begin(QPaintDevice *pd) { return QPainter::begin(pd); } @@ -124,7 +124,7 @@ void RDWavePainter::drawWaveBySamples(int x,int w,int startsamp,int endsamp, resetXForm(); setPen(color); setBrush(color); - QPointArray array(w+2); + Q3PointArray array(w+2); array.setPoint(0,0,center); array.setPoint(w+1,w+1,center); switch(effective_channel) { diff --git a/lib/rdwavepainter.h b/lib/rdwavepainter.h index 32921742..d5c02e81 100644 --- a/lib/rdwavepainter.h +++ b/lib/rdwavepainter.h @@ -33,13 +33,13 @@ class RDWavePainter : public QPainter { public: enum Channel {Mono=0,Left=1,Right=2}; - RDWavePainter(const QPaintDevice *pd,RDCut *cut,RDStation *station, + RDWavePainter(QPaintDevice *pd,RDCut *cut,RDStation *station, RDUser *user,RDConfig *config); RDWavePainter(RDStation *station,RDUser *user,RDConfig *config); ~RDWavePainter(); void nameWave(RDCut *cut); - bool begin(const QPaintDevice *pd,RDCut *cut); - bool begin(const QPaintDevice *pd); + bool begin(QPaintDevice *pd,RDCut *cut); + bool begin(QPaintDevice *pd); void drawWaveBySamples(int x,int w,int startsamp,int endsamp,int gain, Channel channel,const QColor &color, int startclip=-1,int endclip=-1); diff --git a/lib/rdweb.cpp b/lib/rdweb.cpp index 481dcd23..f130da7b 100644 --- a/lib/rdweb.cpp +++ b/lib/rdweb.cpp @@ -830,7 +830,7 @@ bool RDParsePost(std::map *vars) fields=fields.split(";",headers["content-disposition"]); if(fields.size()>0) { if(fields[0].lower().stripWhiteSpace()=="form-data") { - for(unsigned i=1;i"+RDXmlDate(value)+"\n"; + } + return RDXmlField(tag); +} + + QString RDXmlField(const QString &tag,const QTime &value,const QString &attrs) { QString str=""; @@ -1071,8 +1085,8 @@ QString RDUrlUnescape(const QString &str) */ QString ret=""; - for(unsigned i=0;i -## based on work by Fred Gleason and from -## libpam-ldap-178 -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License version 2 as -## published by the Free Software Foundation. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public -## License along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -## -## Use automake to process this into a Makefile.in - -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" -fPIC @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib -MOC = @QT_MOC@ - -# The dependency for qt's Meta Object Compiler (moc) -moc_%.cpp: %.h - $(MOC) $< -o $@ - -inst_prefix_dir=$(DESTDIR) -inst_lib_LTLIBRARIES = pam_rd.la -##inst_libdir=$(prefix)/@RD_LIB_PATH@/security -inst_libdir=/@RD_LIB_PATH@/security -dist_pam_rd_la_SOURCES = pam_rd.cpp -pam_rd_la_LDFLAGS = -module -shared -Xlinker -x -avoid-version -export-dynamic -pam_rd_la_LIBADD = @LIB_RDLIBS@ -lpam @LIBVORBIS@ - -CLEANFILES = *~\ - *.qm\ - moc_* - -DISTCLEANFILES = Makefile.in diff --git a/pam_rd/pam_rd.cpp b/pam_rd/pam_rd.cpp deleted file mode 100644 index 60f7a04b..00000000 --- a/pam_rd/pam_rd.cpp +++ /dev/null @@ -1,329 +0,0 @@ -// pam_rd.c : The PAM authentication module of Rivendell -// -// (C) Copyright 2006 Federico Grau -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// -// created 2006-06-16 grauf@rfa.org -// - -// ideas borrowed from: -// pam_permit.c from Linux-PAM -// by Andrew Morgan 1996/3/11 -// pam_deny.c from Linux-PAM -// by Andrew Morgan 1996/3/11 -// pam_mysql.c -// by James O'Kane and others -// pam_winbind.c -// by Andrew Bartlett 2002 and others -// Rivendell by Fred Gleason - -/* - * include and definitions - */ -#define PAM_SM_AUTH - -#include -/* note: _pam_macros.h is for _drop_reply() macros. This is specific to - * Linux-PAM and not generally distributed by Sun. */ -#include - -#include -#define SYSLOG_IDENT "pam_rd" -#define SYSLOG_FACILITY LOG_AUTHPRIV - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -// The pam module name, this should be unique amongst pam modules. -#define MODULE_NAME SYSLOG_IDENT - - - -/* - * utility functions and related definitions - */ - -#define PAM_RD_DEBUG (1<<0) -#define PAM_RD_TRY_FIRST_PASS (1<<1) -#define PAM_RD_USE_FIRST_PASS (1<<2) -#define PAM_RD_KILL_RD_DAEMONS (1<<3) -#define PAM_RD_IGNORE_PASS (1<<4) -#define PAM_RD_FAIL_DEFAULT_USER (1<<5) - -/* utility function to parse module arguements and return an int with bits set - * to corresponding options */ -static int parse_args(int argc, const char **argv, char **tmp_user) -{ - int ctrl; - /* step through arguments */ - for (ctrl = 0; argc-- > 0; ++argv) { - /* generic options */ - if (!strcmp(*argv,"debug")) { - ctrl |= PAM_RD_DEBUG; - } - else if (!strcasecmp(*argv, "use_first_pass")) { - ctrl |= PAM_RD_USE_FIRST_PASS; - } - else if (!strcasecmp(*argv, "try_first_pass")) { - ctrl |= PAM_RD_TRY_FIRST_PASS; - } - /* pam_rd specific options */ - else if (!strcasecmp(*argv, "kill_rd_daemons")) { - /* kill any previously running rivendell daemons */ - ctrl |= PAM_RD_KILL_RD_DAEMONS; - } - else if (!strcasecmp(*argv, "ignore_pass")) { - /* log the user into rivendell, ignoring any password check. the - * idea is to "trust" the network logon credentials and ignore the - * rivendell credentials */ - ctrl |= PAM_RD_IGNORE_PASS; - } - else if (!strncasecmp(*argv, "fail_default_user=", 18)) { - /* the Rivendell user account is set to the the user specified by - * this option if there is a failure authenticating */ - *tmp_user = strdup(18+*argv); - if (*tmp_user != NULL) { -syslog(LOG_NOTICE, "DEBUG ... read fail_default_user|%s|", *tmp_user); - ctrl |= PAM_RD_FAIL_DEFAULT_USER; - } else { - syslog(LOG_ERR, - "parse_args(): invalid fail_default_user specified - ignored"); - } - } else { - syslog(LOG_ERR, "parse_args(): ignoring unknown option; %s", *argv); - } - } - return ctrl; -} - - -/* utility function to be used for PAM conversation callback */ -int converse(pam_handle_t *pamh, - int nargs, - struct pam_message **message, - struct pam_response **response) -{ - int retval; - struct pam_conv *conv; - - retval = pam_get_item(pamh, PAM_CONV, (const void **) &conv); - if (retval == PAM_SUCCESS) { - retval = conv->conv(nargs, - (const struct pam_message **) message, - response, conv->appdata_ptr); - if ((retval != PAM_SUCCESS) && (retval != PAM_CONV_AGAIN)) - syslog(LOG_ERR, "conversation failure [%s]", - pam_strerror(pamh, retval)); - } else { - syslog(LOG_ERR, "couldn't obtain coversation function [%s]", - pam_strerror(pamh, retval)); - } - - return retval; /* propagate error status */ -} - - -/* utility function to setup PAM conversation callback */ -int ask_passwd(pam_handle_t *pamh, int pwtype) -{ - struct pam_message msg[1], *mesg[1]; - struct pam_response *resp = NULL; - int i = 0; - int retval; - - msg[i].msg = "Password: "; - msg[i].msg_style = PAM_PROMPT_ECHO_OFF; - mesg[i] = &msg[i]; - - retval = converse(pamh, ++i, mesg, &resp); - - if (retval != PAM_SUCCESS) { - if (resp != NULL) - _pam_drop_reply(resp,i); - return ((retval == PAM_CONV_AGAIN) - ? PAM_INCOMPLETE : PAM_AUTHINFO_UNAVAIL); - } - - /* we have a password so set AUTHTOK - */ - retval=pam_set_item(pamh, pwtype, resp->resp); - _pam_drop_reply(resp,i); - return retval; -} - - - - - - -/* PAM authentication management functions */ - -/* Performs the task of authenticating the user. */ -PAM_EXTERN int pam_sm_authenticate (pam_handle_t *pamh, - int flags, - int argc, - const char **argv) -{ - int retval; - int ctrl = 0; - const char *username=NULL; - char *password=NULL; - char *tmp_buf=NULL; // Temporary buffer to get default_username option. - const char *fail_default_username=RD_USER_LOGIN_NAME; // Initialize default value. - RDConfig *login_config; - RDStation *login_station; - RDUser * login_user; - QSqlDatabase *login_db; - - openlog(SYSLOG_IDENT, LOG_CONS|LOG_PID, SYSLOG_FACILITY); - - /* parse arguments */ - ctrl = parse_args(argc, argv, &tmp_buf); - if (ctrl & PAM_RD_DEBUG) syslog(LOG_DEBUG, "pam_sm_authenticate called."); - if (ctrl & PAM_RD_DEBUG) { - syslog(LOG_DEBUG, "argument flags ctrl:%d (0x%x)", ctrl, ctrl); - } - if (ctrl & PAM_RD_FAIL_DEFAULT_USER) { - fail_default_username = tmp_buf; - } - - /* get username */ - retval = pam_get_user(pamh, &username, NULL); - if ((retval != PAM_SUCCESS) - || (username == NULL) - || (*username == '\0')) { - syslog(LOG_ERR, "get username returned error: %s", - pam_strerror(pamh, retval)); - return retval; - } - if (ctrl & PAM_RD_DEBUG) syslog(LOG_DEBUG, "got user:%s", username); - - if (ctrl & ~PAM_RD_IGNORE_PASS) { - /* get password */ - if ((ctrl & PAM_RD_TRY_FIRST_PASS) || (ctrl & PAM_RD_USE_FIRST_PASS)) { - retval = pam_get_item(pamh, PAM_AUTHTOK, (const void **) &password); - } - - /* if no password yet, and not configured to only use the first - * password, then ask */ - if ((password == NULL) && (ctrl & ~PAM_RD_USE_FIRST_PASS)) { - retval = ask_passwd(pamh, PAM_AUTHTOK); - } - retval = pam_get_item(pamh, PAM_AUTHTOK, (const void **)&password); - - if (password == NULL) { - syslog(LOG_ERR, "Could not retrieve user's password"); - return PAM_AUTHINFO_UNAVAIL; - } - if (ctrl & PAM_RD_DEBUG) syslog(LOG_DEBUG, "got password"); - } - - /* Load configs */ - login_config=new RDConfig(RD_CONF_FILE); - login_config->load(); - login_config->setModuleName("pam_rd"); - - /* kill daemons if requested */ - if (ctrl & PAM_RD_KILL_RD_DAEMONS) { - if (ctrl & PAM_RD_DEBUG) syslog(LOG_DEBUG, "killing RD daemons"); - RDKillDaemons(); - } - - /* authenticate the user */ - login_station=new RDStation(login_config->stationName()); - - // Initialize QT application, without the gui. Much like the database - // connection, while not used here, it is used by underlying functions. - QApplication a(argc, (char **) argv, false); // FIXME: in QT4 there is a QCoreApplication object that could be used here better. - - // Open Database. - // NOTE: while the database connection is not used in this module/file - // directly, it is required by the underlying functions, ex: - // login_user->checkPassword() - login_db=QSqlDatabase::addDatabase(login_config->mysqlDriver()); - if(!login_db) { - syslog(LOG_ERR, QString().sprintf("Unable to load QSql driver: %s", - login_config->mysqlDriver().ascii())); - return PAM_AUTHINFO_UNAVAIL; - } - login_db->setDatabaseName(login_config->mysqlDbname()); - login_db->setUserName(login_config->mysqlUsername()); - login_db->setPassword(login_config->mysqlPassword()); - login_db->setHostName(login_config->mysqlHostname()); - if(!login_db->open()) { - syslog(LOG_ERR, "Unable to connet to mySQL server"); - login_db->removeDatabase(login_config->mysqlDbname()); - return PAM_AUTHINFO_UNAVAIL; - } - if (ctrl & PAM_RD_DEBUG) syslog(LOG_DEBUG, "connected to database"); - - login_user = new RDUser(username); - if (ctrl & PAM_RD_IGNORE_PASS) { - // Ignore password, simply check if corresponding user exists. - if (login_user->exists()) { - login_station->setDefaultName(username); - syslog(LOG_NOTICE, - "ignoring password. RD Default User set to: %s", username); - } else { - login_station->setDefaultName(fail_default_username); - syslog(LOG_NOTICE, - "ignoring password. RDUser not found, defaulting to: %s", - fail_default_username); - } - } else { - // Check password. - if ( login_user->checkPassword(QString(password), false) ) { - login_station->setDefaultName(username); - syslog(LOG_NOTICE, - "authenticated. RD Default User set to: %s", username); - } else { - login_station->setDefaultName(fail_default_username); - syslog(LOG_NOTICE, - "authentication failed. RDUser defaulting to: %s", - fail_default_username); - } - } - - /* cleanup */ - delete login_user; - login_db->removeDatabase(login_config->mysqlDbname()); - delete login_station; - delete login_config; - -syslog(LOG_NOTICE, "DEBUG ... end pam_rd"); - return PAM_SUCCESS; -} - -/* Performs setting of credentials (after the user is authenticated). In the - * case of Rivendell, the "credential" is registering with the database. */ -PAM_EXTERN -int pam_sm_setcred(pam_handle_t *pamh,int flags,int argc - ,const char **argv) -{ - return PAM_SUCCESS; -} - diff --git a/rdadmin/Makefile.am b/rdadmin/Makefile.am index 8cf35e55..86b6aeae 100644 --- a/rdadmin/Makefile.am +++ b/rdadmin/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/rdadmin ## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +20,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ CWRAP = ../helpers/cwrap @@ -38,8 +38,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdadmin_*.qm all: - @QT_BIN@/lupdate rdadmin.pro - @QT_BIN@/lrelease rdadmin.pro + lupdate rdadmin.pro + lrelease rdadmin.pro bin_PROGRAMS = rdadmin @@ -196,7 +196,7 @@ nodist_rdadmin_SOURCES = moc_add_feed.cpp\ moc_view_adapters.cpp\ moc_view_node_info.cpp -rdadmin_LDADD = @LIB_RDLIBS@ -lsamplerate @LIBVORBIS@ +rdadmin_LDADD = @LIB_RDLIBS@ -lsamplerate @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = info_banner1.xpm\ info_banner2.xpm\ diff --git a/rdadmin/add_feed.cpp b/rdadmin/add_feed.cpp index 47b6c185..b9a15a14 100644 --- a/rdadmin/add_feed.cpp +++ b/rdadmin/add_feed.cpp @@ -68,7 +68,7 @@ AddFeed::AddFeed(unsigned *id,QString *keyname,QWidget *parent) QLabel *label=new QLabel(feed_users_box,tr("Enable Feed for All Users"),this); label->setGeometry(60,38,sizeHint().width()-60,19); label->setFont(user_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Text Validator @@ -85,7 +85,7 @@ AddFeed::AddFeed(unsigned *id,QString *keyname,QWidget *parent) label=new QLabel(feed_keyname_edit,tr("&New Feed Name:"),this); label->setGeometry(10,11,130,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button diff --git a/rdadmin/add_group.cpp b/rdadmin/add_group.cpp index aa61c1ab..e356eb1c 100644 --- a/rdadmin/add_group.cpp +++ b/rdadmin/add_group.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -75,7 +75,7 @@ AddGroup::AddGroup(QString *group,QWidget *parent) QLabel *label=new QLabel(group_name_edit,tr("&New Group Name:"),this); label->setGeometry(10,11,130,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Enable Users Checkbox @@ -86,7 +86,7 @@ AddGroup::AddGroup(QString *group,QWidget *parent) label=new QLabel(group_users_box,tr("Enable Group for All Users"),this); label->setGeometry(60,38,sizeHint().width()-60,19); label->setFont(user_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Enable Services Checkbox @@ -97,7 +97,7 @@ AddGroup::AddGroup(QString *group,QWidget *parent) label=new QLabel(group_svcs_box,tr("Enable Group for All Services"),this); label->setGeometry(60,58,sizeHint().width()-60,19); label->setFont(user_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/rdadmin/add_hostvar.cpp b/rdadmin/add_hostvar.cpp index 0c77c8d7..366a285b 100644 --- a/rdadmin/add_hostvar.cpp +++ b/rdadmin/add_hostvar.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -75,7 +75,7 @@ AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, QLabel *label=new QLabel(add_name_edit,tr("Variable Name:"),this); label->setGeometry(10,11,110,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Variable Value @@ -86,7 +86,7 @@ AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, label=new QLabel(add_varvalue_edit,tr("Variable Value:"),this); label->setGeometry(10,33,110,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Remark @@ -97,7 +97,7 @@ AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, label=new QLabel(add_remark_edit,tr("Remark:"),this); label->setGeometry(10,55,110,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/rdadmin/add_hostvar.h b/rdadmin/add_hostvar.h index be7cd92c..743b61bb 100644 --- a/rdadmin/add_hostvar.h +++ b/rdadmin/add_hostvar.h @@ -22,8 +22,8 @@ #define ADD_HOSTVAR_H #include -#include -#include +#include +#include #include #include #include diff --git a/rdadmin/add_matrix.cpp b/rdadmin/add_matrix.cpp index e96dc163..7ab3b89b 100644 --- a/rdadmin/add_matrix.cpp +++ b/rdadmin/add_matrix.cpp @@ -22,6 +22,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/rdadmin/add_replicator.cpp b/rdadmin/add_replicator.cpp index d65aaa1c..ab2ab775 100644 --- a/rdadmin/add_replicator.cpp +++ b/rdadmin/add_replicator.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -76,7 +76,7 @@ AddReplicator::AddReplicator(QString *rname,QWidget *parent) QLabel *label=new QLabel(repl_name_edit,tr("&New Replicator Name:"),this); label->setGeometry(10,11,130,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button diff --git a/rdadmin/add_report.cpp b/rdadmin/add_report.cpp index 502107b5..0b497d96 100644 --- a/rdadmin/add_report.cpp +++ b/rdadmin/add_report.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -77,7 +77,7 @@ AddReport::AddReport(QString *rptname,QWidget *parent) QLabel *label=new QLabel(add_name_edit,tr("&Report Name:"),this); label->setGeometry(10,10,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button diff --git a/rdadmin/add_schedcodes.cpp b/rdadmin/add_schedcodes.cpp index 3da78344..112e4f87 100644 --- a/rdadmin/add_schedcodes.cpp +++ b/rdadmin/add_schedcodes.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -77,7 +77,7 @@ AddSchedCode::AddSchedCode(QString *schedCode,QWidget *parent) QLabel *label=new QLabel(schedCode_name_edit,tr("&New Code:"),this); label->setGeometry(10,11,90,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button diff --git a/rdadmin/add_station.cpp b/rdadmin/add_station.cpp index 2d1f00c6..82be6dc0 100644 --- a/rdadmin/add_station.cpp +++ b/rdadmin/add_station.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -75,7 +75,7 @@ AddStation::AddStation(QString *stationname,QWidget *parent) QLabel *label=new QLabel(add_name_edit,tr("New &Host Name:"),this); label->setGeometry(10,10,115,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Exemplar @@ -85,7 +85,7 @@ AddStation::AddStation(QString *stationname,QWidget *parent) label=new QLabel(add_exemplar_box,tr("Base Host On:"),this); label->setGeometry(10,35,115,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button diff --git a/rdadmin/add_station.h b/rdadmin/add_station.h index 2d65c815..d250905e 100644 --- a/rdadmin/add_station.h +++ b/rdadmin/add_station.h @@ -22,8 +22,8 @@ #define ADD_STATION_H #include -#include -#include +#include +#include #include #include #include diff --git a/rdadmin/add_svc.cpp b/rdadmin/add_svc.cpp index 68df9df9..b7582315 100644 --- a/rdadmin/add_svc.cpp +++ b/rdadmin/add_svc.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -76,7 +76,7 @@ AddSvc::AddSvc(QString *svcname,QWidget *parent) new QLabel(svc_name_edit,tr("&New Service Name:"),this); svc_name_label->setGeometry(10,11,140,19); svc_name_label->setFont(font); - svc_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + svc_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Exemplar @@ -87,7 +87,7 @@ AddSvc::AddSvc(QString *svcname,QWidget *parent) new QLabel(svc_exemplar_box,tr("Base Service On:"),this); svc_exemplar_label->setGeometry(10,36,140,19); svc_exemplar_label->setFont(font); - svc_exemplar_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + svc_exemplar_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button diff --git a/rdadmin/add_svc.h b/rdadmin/add_svc.h index 0703cb4f..707e73ce 100644 --- a/rdadmin/add_svc.h +++ b/rdadmin/add_svc.h @@ -22,8 +22,8 @@ #define ADD_SVC_H #include -#include -#include +#include +#include #include #include #include diff --git a/rdadmin/add_user.cpp b/rdadmin/add_user.cpp index 839e8610..58b53015 100644 --- a/rdadmin/add_user.cpp +++ b/rdadmin/add_user.cpp @@ -23,14 +23,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -68,7 +68,7 @@ AddUser::AddUser(QString *username,QWidget *parent) QLabel *user_name_label=new QLabel(user_name_edit,tr("&New User Name:"),this); user_name_label->setGeometry(10,13,110,19); user_name_label->setFont(font); - user_name_label->setAlignment(AlignRight|ShowPrefix); + user_name_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Ok Button diff --git a/rdadmin/add_user.h b/rdadmin/add_user.h index 6de32a3f..1c48e80b 100644 --- a/rdadmin/add_user.h +++ b/rdadmin/add_user.h @@ -22,8 +22,8 @@ #define ADD_USER_H #include -#include -#include +#include +#include #include #include #include diff --git a/rdadmin/autofill_carts.cpp b/rdadmin/autofill_carts.cpp index 858e0bd8..11cb7a7c 100644 --- a/rdadmin/autofill_carts.cpp +++ b/rdadmin/autofill_carts.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -69,19 +69,19 @@ AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent) // // Cart List // - svc_cart_list=new QListView(this); + svc_cart_list=new Q3ListView(this); svc_cart_list-> setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-110); svc_cart_list->setAllColumnsShowFocus(true); svc_cart_list->setItemMargin(5); svc_cart_list->addColumn(tr("Cart")); - svc_cart_list->setColumnAlignment(0,AlignCenter); + svc_cart_list->setColumnAlignment(0,Qt::AlignCenter); svc_cart_list->addColumn(tr("Length")); - svc_cart_list->setColumnAlignment(1,AlignRight); + svc_cart_list->setColumnAlignment(1,Qt::AlignRight); svc_cart_list->addColumn(tr("Title")); - svc_cart_list->setColumnAlignment(2,AlignLeft); + svc_cart_list->setColumnAlignment(2,Qt::AlignLeft); svc_cart_list->addColumn(tr("Artist")); - svc_cart_list->setColumnAlignment(3,AlignLeft); + svc_cart_list->setColumnAlignment(3,Qt::AlignLeft); svc_cart_list->setSortColumn(1); // @@ -151,7 +151,7 @@ void AutofillCarts::addData() return; } RDCart *rdcart=new RDCart(cart); - QListViewItem *item=new QListViewItem(svc_cart_list); + Q3ListViewItem *item=new Q3ListViewItem(svc_cart_list); item->setText(0,QString().sprintf("%06d",cart)); item->setText(1,RDGetTimeLength(rdcart->forcedLength(),false,true)); item->setText(2,rdcart->title()); @@ -164,7 +164,7 @@ void AutofillCarts::addData() void AutofillCarts::deleteData() { - QListViewItem *item=svc_cart_list->selectedItem(); + Q3ListViewItem *item=svc_cart_list->selectedItem(); if(item==NULL) { return; } @@ -178,7 +178,7 @@ void AutofillCarts::okData() "SERVICE=\""+RDEscapeString(svc_svc->name())+"\""; RDSqlQuery *q=new RDSqlQuery(sql); delete q; - QListViewItem *item=svc_cart_list->firstChild(); + Q3ListViewItem *item=svc_cart_list->firstChild(); while(item!=NULL) { sql=QString("insert into AUTOFILLS set ")+ "SERVICE=\""+RDEscapeString(svc_svc->name())+"\","+ @@ -199,7 +199,7 @@ void AutofillCarts::cancelData() void AutofillCarts::RefreshList() { - QListViewItem *item; + Q3ListViewItem *item; svc_cart_list->clear(); QString sql=QString("select ")+ @@ -211,7 +211,7 @@ void AutofillCarts::RefreshList() "SERVICE=\""+RDEscapeString(svc_svc->name())+"\""; RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { - item=new QListViewItem(svc_cart_list); + item=new Q3ListViewItem(svc_cart_list); item->setText(0,QString().sprintf("%06u",q->value(0).toUInt())); item->setText(1,RDGetTimeLength(q->value(1).toInt(),false,true)); item->setText(2,q->value(2).toString()); diff --git a/rdadmin/autofill_carts.h b/rdadmin/autofill_carts.h index 8964d842..21dea46e 100644 --- a/rdadmin/autofill_carts.h +++ b/rdadmin/autofill_carts.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include @@ -45,7 +45,7 @@ class AutofillCarts : public QDialog private: void RefreshList(); RDSvc *svc_svc; - QListView *svc_cart_list; + Q3ListView *svc_cart_list; QString svc_cart_filter; QString svc_cart_group; }; diff --git a/rdadmin/edit_audios.cpp b/rdadmin/edit_audios.cpp index 565359b1..8bed8d36 100644 --- a/rdadmin/edit_audios.cpp +++ b/rdadmin/edit_audios.cpp @@ -20,14 +20,17 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include #include @@ -61,13 +64,13 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent) // edit_card_box=new QComboBox(this); edit_card_box->setGeometry(75,10,60,26); - edit_card_box->setInsertionPolicy(QComboBox::NoInsertion); + edit_card_box->setInsertionPolicy(QComboBox::NoInsert); connect(edit_card_box,SIGNAL(activated(int)), this,SLOT(cardSelectedData(int))); QLabel *label=new QLabel(edit_card_box,tr("Card:"),this); label->setGeometry(10,16,60,22); label->setFont(font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); // // Card Driver @@ -78,18 +81,18 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent) label=new QLabel(edit_card_box,tr("Card Driver:"),this); label->setGeometry(140,16,80,22); label->setFont(font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); // // Clock Selector // edit_clock_box=new QComboBox(this); edit_clock_box->setGeometry(500,10,150,26); - edit_clock_box->setInsertionPolicy(QComboBox::NoInsertion); + edit_clock_box->setInsertionPolicy(QComboBox::NoInsert); edit_clock_label=new QLabel(edit_clock_box,tr("Clock Source:"),this); edit_clock_label->setGeometry(395,16,100,22); edit_clock_label->setFont(font); - edit_clock_label->setAlignment(AlignRight); + edit_clock_label->setAlignment(Qt::AlignRight); // for(int j=0;jsetGeometry(50+170*i,55+j*180,170,22); label->setFont(font); - label->setAlignment(AlignHCenter); + label->setAlignment(Qt::AlignHCenter); QSignalMapper *mapper=new QSignalMapper(this); connect(mapper,SIGNAL(mapped(int)),this,SLOT(inputMapData(int))); edit_type_box[j*4+i]=new QComboBox(this); @@ -113,7 +116,7 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent) connect(edit_type_box[j*4+i],SIGNAL(activated(int)),mapper,SLOT(map())); edit_type_label[j*4+i]=new QLabel(edit_type_box[j*4+i],tr("Type:"),this); edit_type_label[j*4+i]->setGeometry(50+170*i,81+j*180,40,22); - edit_type_label[j*4+i]->setAlignment(AlignRight); + edit_type_label[j*4+i]->setAlignment(Qt::AlignRight); edit_mode_box[j*4+i]=new QComboBox(this); edit_mode_box[j*4+i]->setGeometry(95+170*i,105+j*180,110,26); // NOTE: this drop down list box is populated to match RDCae::ChannelMode @@ -125,7 +128,7 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent) connect(edit_mode_box[j*4+i],SIGNAL(activated(int)),mapper,SLOT(map())); edit_mode_label[j*4+i]=new QLabel(edit_type_box[j*4+i],tr("Mode:"),this); edit_mode_label[j*4+i]->setGeometry(50+170*i,111+j*180,40,22); - edit_mode_label[j*4+i]->setAlignment(AlignRight); + edit_mode_label[j*4+i]->setAlignment(Qt::AlignRight); edit_input_box[j*4+i]=new QSpinBox(this); edit_input_box[j*4+i]->setGeometry(95+170*i,135+j*180,60,24); @@ -134,7 +137,7 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent) edit_input_label[j*4+i]= new QLabel(edit_type_box[j*4+i],tr("Ref. Level:"),this); edit_input_label[j*4+i]->setGeometry(10+170*i,140+j*180,80,22); - edit_input_label[j*4+i]->setAlignment(AlignRight); + edit_input_label[j*4+i]->setAlignment(Qt::AlignRight); // // Output Port Controls @@ -143,7 +146,7 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent) label=new QLabel(str+QString().sprintf(" %d",j*4+i),this); label->setGeometry(50+170*i,170+j*180,170,22); label->setFont(font); - label->setAlignment(AlignHCenter); + label->setAlignment(Qt::AlignHCenter); edit_output_box[j*4+i]=new QSpinBox(this); edit_output_box[j*4+i]->setGeometry(95+170*i,190+j*180,60,24); @@ -152,7 +155,7 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent) edit_output_label[j*4+i]= new QLabel(edit_type_box[j*4+i],tr("Ref. Level:"),this); edit_output_label[j*4+i]->setGeometry(10+170*i,195+j*180,80,22); - edit_output_label[j*4+i]->setAlignment(AlignRight); + edit_output_label[j*4+i]->setAlignment(Qt::AlignRight); } } diff --git a/rdadmin/edit_audios.h b/rdadmin/edit_audios.h index c01c8954..e5b13505 100644 --- a/rdadmin/edit_audios.h +++ b/rdadmin/edit_audios.h @@ -28,6 +28,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/rdadmin/edit_backup.cpp b/rdadmin/edit_backup.cpp index 8fdb37a4..a717c906 100644 --- a/rdadmin/edit_backup.cpp +++ b/rdadmin/edit_backup.cpp @@ -23,6 +23,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -70,11 +72,11 @@ EditBackup::EditBackup(RDStation *station,QWidget *parent) new QLabel(edit_life_box,tr("Keep Backups For:"),this); edit_life_box_label->setGeometry(10,10,140,19); edit_life_box_label->setFont(small_font); - edit_life_box_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_life_box_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); QLabel *edit_life_box_unit=new QLabel(tr("days"),this); edit_life_box_unit->setGeometry(200,10,120,19); edit_life_box_unit->setFont(small_font); - edit_life_box_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + edit_life_box_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(edit_life_box,SIGNAL(valueChanged(int)), this,SLOT(lifeChangedData(int))); @@ -87,7 +89,7 @@ EditBackup::EditBackup(RDStation *station,QWidget *parent) edit_path_label=new QLabel(edit_life_box,tr("Backup Directory:"),this); edit_path_label->setGeometry(10,35,140,19); edit_path_label->setFont(small_font); - edit_path_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_path_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/rdadmin/edit_cartslots.cpp b/rdadmin/edit_cartslots.cpp index af30597f..5316e4ca 100644 --- a/rdadmin/edit_cartslots.cpp +++ b/rdadmin/edit_cartslots.cpp @@ -19,6 +19,9 @@ // #include +//Added by qt3to4: +#include +#include #include #include @@ -66,7 +69,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, QLabel *label=new QLabel(tr("Global Settings"),this); label->setGeometry(10,10,sizeHint().width()-20,20); label->setFont(title_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Slot Columns @@ -79,7 +82,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, label=new QLabel(edit_slot_columns_spin,tr("Slot Columns:"),this); label->setGeometry(10,32,112,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Slot Rows @@ -92,7 +95,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, label=new QLabel(edit_slot_rows_spin,tr("Slot Rows:"),this); label->setGeometry(10,54,112,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Slot Selector @@ -116,7 +119,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, label=new QLabel(tr("Channel Assignments"),this); label->setGeometry(10,123,sizeHint().width()-20,20); label->setFont(label_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Card Selector @@ -130,7 +133,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, label=new QLabel(edit_card_spin,tr("Card:"),this); label->setGeometry(10,145,112,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Input Port Selector @@ -142,7 +145,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, label=new QLabel(edit_input_spin,tr("Input Port:"),this); label->setGeometry(10,167,112,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Output Port Selector @@ -154,7 +157,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, label=new QLabel(edit_output_spin,tr("Output Port:"),this); label->setGeometry(10,189,112,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Default Settings @@ -162,7 +165,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, label=new QLabel(tr("Default Settings"),this); label->setGeometry(10,218,sizeHint().width()-20,20); label->setFont(label_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Service diff --git a/rdadmin/edit_cartslots.h b/rdadmin/edit_cartslots.h index 3ab02dd6..0829d44b 100644 --- a/rdadmin/edit_cartslots.h +++ b/rdadmin/edit_cartslots.h @@ -27,6 +27,8 @@ #include #include #include +//Added by qt3to4: +#include #include diff --git a/rdadmin/edit_channelgpios.cpp b/rdadmin/edit_channelgpios.cpp index c776393e..b479be7e 100644 --- a/rdadmin/edit_channelgpios.cpp +++ b/rdadmin/edit_channelgpios.cpp @@ -19,6 +19,9 @@ // #include +//Added by qt3to4: +#include +#include EditChannelGpios::EditChannelGpios(RDAirPlayConf *conf, RDAirPlayConf::Channel chan,QWidget *parent) diff --git a/rdadmin/edit_channelgpios.h b/rdadmin/edit_channelgpios.h index 78625fea..8a3e7442 100644 --- a/rdadmin/edit_channelgpios.h +++ b/rdadmin/edit_channelgpios.h @@ -26,6 +26,8 @@ #include #include #include +//Added by qt3to4: +#include #include diff --git a/rdadmin/edit_decks.cpp b/rdadmin/edit_decks.cpp index 7a0d3680..3ed30fe0 100644 --- a/rdadmin/edit_decks.cpp +++ b/rdadmin/edit_decks.cpp @@ -20,15 +20,18 @@ #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include +//Added by qt3to4: +#include +#include #include #include @@ -72,13 +75,13 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent) // edit_record_deck_box=new QComboBox(this); edit_record_deck_box->setGeometry(140,10,60,24); - edit_record_deck_box->setInsertionPolicy(QComboBox::NoInsertion); + edit_record_deck_box->setInsertionPolicy(QComboBox::NoInsert); connect(edit_record_deck_box,SIGNAL(activated(int)), this,SLOT(recordDeckActivatedData(int))); QLabel *label=new QLabel(edit_record_deck_box,tr("Record Deck"),this); label->setFont(small_font); label->setGeometry(35,14,100,22); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); // // Settings Label @@ -106,7 +109,7 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent) this,SLOT(monitorPortChangedData(int))); edit_monitor_label=new QLabel(edit_monitor_box,tr("Monitor Port:"),this); edit_monitor_label->setGeometry(10,112,112,19); - edit_monitor_label->setAlignment(AlignRight|AlignVCenter); + edit_monitor_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_default_on_box=new QComboBox(this); edit_default_on_box->setGeometry(305,112,60,19); @@ -115,39 +118,39 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent) edit_default_on_label= new QLabel(edit_default_on_box,tr("Monitor defaults to"),this); edit_default_on_label->setGeometry(195,112,105,19); - edit_default_on_label->setAlignment(AlignRight|AlignVCenter); + edit_default_on_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Format // edit_format_box=new QComboBox(this); edit_format_box->setGeometry(125,136,150,24); - edit_format_box->setInsertionPolicy(QComboBox::NoInsertion); + edit_format_box->setInsertionPolicy(QComboBox::NoInsert); connect(edit_format_box,SIGNAL(activated(int)), this,SLOT(formatActivatedData(int))); label=new QLabel(edit_format_box,tr("Format:"),this); label->setGeometry(10,136,110,24); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Bit Rate // edit_bitrate_box=new QComboBox(this,"edit_bitrate_box"); edit_bitrate_box->setGeometry(125,160,140,24); - edit_bitrate_box->setInsertionPolicy(QComboBox::NoInsertion); + edit_bitrate_box->setInsertionPolicy(QComboBox::NoInsert); edit_bitrate_label=new QLabel(edit_bitrate_box,tr("Bit Rate:"),this); edit_bitrate_label->setGeometry(10,160,110,24); - edit_bitrate_label->setAlignment(AlignRight|AlignVCenter); + edit_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Switcher Station // edit_swstation_box=new QComboBox(this); edit_swstation_box->setGeometry(125,190,250,24); - edit_swstation_box->setInsertionPolicy(QComboBox::NoInsertion); + edit_swstation_box->setInsertionPolicy(QComboBox::NoInsert); edit_swstation_label=new QLabel(edit_swstation_box,tr("Switcher Host:"),this); edit_swstation_label->setGeometry(10,190,110,24); - edit_swstation_label->setAlignment(AlignRight|AlignVCenter); + edit_swstation_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_swstation_box,SIGNAL(activated(const QString &)), this,SLOT(stationActivatedData(const QString &))); @@ -156,11 +159,11 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent) // edit_swmatrix_box=new QComboBox(this); edit_swmatrix_box->setGeometry(125,214,250,24); - edit_swmatrix_box->setInsertionPolicy(QComboBox::NoInsertion); + edit_swmatrix_box->setInsertionPolicy(QComboBox::NoInsert); edit_swmatrix_box->setDisabled(true); edit_swmatrix_label=new QLabel(edit_swmatrix_box,tr("Switcher Matrix:"),this); edit_swmatrix_label->setGeometry(10,214,110,24); - edit_swmatrix_label->setAlignment(AlignRight|AlignVCenter); + edit_swmatrix_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_swmatrix_label->setDisabled(true); connect(edit_swmatrix_box,SIGNAL(activated(const QString &)), this,SLOT(matrixActivatedData(const QString &))); @@ -170,11 +173,11 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent) // edit_swoutput_box=new QComboBox(this); edit_swoutput_box->setGeometry(125,238,250,24); - edit_swoutput_box->setInsertionPolicy(QComboBox::NoInsertion); + edit_swoutput_box->setInsertionPolicy(QComboBox::NoInsert); edit_swoutput_box->setDisabled(true); edit_swoutput_label=new QLabel(edit_swoutput_box,tr("Switcher Output:"),this); edit_swoutput_label->setGeometry(10,238,110,24); - edit_swoutput_label->setAlignment(AlignRight|AlignVCenter); + edit_swoutput_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_swoutput_label->setDisabled(true); // @@ -186,11 +189,11 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent) edit_swdelay_box->setDisabled(true); edit_swdelay_label=new QLabel(edit_swdelay_box,tr("Switcher Delay:"),this); edit_swdelay_label->setGeometry(10,262,110,24); - edit_swdelay_label->setAlignment(AlignRight|AlignVCenter); + edit_swdelay_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_swdelay_label->setDisabled(true); edit_swdelay_unit=new QLabel(edit_swdelay_box,tr("1/10 sec"),this); edit_swdelay_unit->setGeometry(170,262,60,24); - edit_swdelay_unit->setAlignment(AlignLeft|AlignVCenter); + edit_swdelay_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_swdelay_unit->setDisabled(true); edit_swdelay_box->hide(); edit_swdelay_label->hide(); @@ -208,10 +211,10 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent) // edit_channels_box=new QComboBox(this); edit_channels_box->setGeometry(125,300,60,24); - edit_channels_box->setInsertionPolicy(QComboBox::NoInsertion); + edit_channels_box->setInsertionPolicy(QComboBox::NoInsert); label=new QLabel(edit_channels_box,tr("Channels:"),this); label->setGeometry(10,300,110,24); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Default Autotrim Threshold @@ -222,7 +225,7 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent) edit_threshold_box->setRange(-100,0); label=new QLabel(edit_threshold_box,tr("Trim Threshold:"),this); label->setGeometry(10,324,110,24); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Host-Wide Settings Label @@ -235,20 +238,20 @@ EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent) edit_errorrml_edit->setGeometry(125,393,248,24); label=new QLabel(edit_errorrml_edit,tr("Error RML:"),this); label->setGeometry(10,393,110,24); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Play Deck Selector // edit_play_deck_box=new QComboBox(this); edit_play_deck_box->setGeometry(475,10,60,24); - edit_play_deck_box->setInsertionPolicy(QComboBox::NoInsertion); + edit_play_deck_box->setInsertionPolicy(QComboBox::NoInsert); connect(edit_play_deck_box,SIGNAL(activated(int)), this,SLOT(playDeckActivatedData(int))); label=new QLabel(edit_play_deck_box,tr("Play Deck"),this); label->setFont(small_font); label->setGeometry(390,14,80,22); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); // // Play Deck Card Selector @@ -545,9 +548,8 @@ void EditDecks::closeData() void EditDecks::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); - p->moveTo(385,10); - p->lineTo(385,sizeHint().height()-10); + p->setPen(QColor(Qt::black)); + p->drawLine(385,10,385,sizeHint().height()-10); p->end(); } diff --git a/rdadmin/edit_decks.h b/rdadmin/edit_decks.h index 3ab69b19..e593aa3a 100644 --- a/rdadmin/edit_decks.h +++ b/rdadmin/edit_decks.h @@ -30,6 +30,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/rdadmin/edit_dropbox.cpp b/rdadmin/edit_dropbox.cpp index 7268f9da..bd890af1 100644 --- a/rdadmin/edit_dropbox.cpp +++ b/rdadmin/edit_dropbox.cpp @@ -23,16 +23,18 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -82,7 +84,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) QLabel *label=new QLabel(box_group_name_box,tr("Default Group:"),this); label->setGeometry(10,10,105,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Path @@ -93,7 +95,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) label=new QLabel(box_path_edit,tr("&Path Spec:"),this); label->setGeometry(10,32,105,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QPushButton *button= new QPushButton(tr("Select"),this); button->setGeometry(sizeHint().width()-60,30,50,23); @@ -110,7 +112,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) label=new QLabel(box_to_cart_edit,tr("To &Cart:"),this); label->setGeometry(10,54,105,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); box_select_cart_button= new QPushButton(tr("Select"),this); box_select_cart_button->setGeometry(190,52,50,23); @@ -127,7 +129,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) new QLabel(box_delete_cuts_box,tr("Delete cuts before importing"),this); box_delete_cuts_label->setGeometry(280,54,sizeHint().width()-150,20); box_delete_cuts_label->setFont(font); - box_delete_cuts_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + box_delete_cuts_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Metadata Format @@ -138,7 +140,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) label=new QLabel(box_metadata_pattern_edit,tr("&Metadata Pattern:"),this); label->setGeometry(10,76,105,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // User Defined Field @@ -149,7 +151,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) label=new QLabel(box_user_defined_edit,tr("&User Defined:"),this); label->setGeometry(10,98,105,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Log Path @@ -161,7 +163,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) new QLabel(box_log_path_edit,tr("&Log File:"),this); label->setGeometry(10,120,105,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(tr("Select"),this); button->setGeometry(sizeHint().width()-60,118,50,23); button->setFont(normal_font); @@ -184,7 +186,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) this); label->setGeometry(110,175,sizeHint().width()-120,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Force To Mono @@ -194,7 +196,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) label=new QLabel(box_force_to_mono_box,tr("Force to Monaural"),this); label->setGeometry(110,197,sizeHint().width()-120,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Normalization @@ -204,17 +206,17 @@ EditDropbox::EditDropbox(int id,QWidget *parent) label=new QLabel(box_normalization_box,tr("Normalize Levels"),this); label->setGeometry(110,219,100,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); box_normalization_level_spin=new QSpinBox(this); box_normalization_level_spin->setGeometry(275,219,50,20); box_normalization_level_spin->setRange(-100,-1); box_normalization_level_label=new QLabel(tr("Level:"),this); box_normalization_level_label->setGeometry(210,219,60,20); box_normalization_level_label->setFont(font); - box_normalization_level_label->setAlignment(AlignVCenter|AlignRight); + box_normalization_level_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); box_normalization_level_unit=new QLabel(tr("dBFS"),this); box_normalization_level_unit->setGeometry(330,219,60,20); - box_normalization_level_unit->setAlignment(AlignVCenter|AlignLeft); + box_normalization_level_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); connect(box_normalization_box,SIGNAL(toggled(bool)), this,SLOT(normalizationToggledData(bool))); @@ -226,17 +228,17 @@ EditDropbox::EditDropbox(int id,QWidget *parent) label=new QLabel(box_autotrim_box,tr("Autotrim Cuts"),this); label->setGeometry(110,243,100,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); box_autotrim_level_spin=new QSpinBox(this); box_autotrim_level_spin->setGeometry(275,243,50,20); box_autotrim_level_spin->setRange(-100,-1); box_autotrim_level_label=new QLabel(tr("Level:"),this); box_autotrim_level_label->setGeometry(210,243,60,20); box_autotrim_level_label->setFont(font); - box_autotrim_level_label->setAlignment(AlignVCenter|AlignRight); + box_autotrim_level_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); box_autotrim_level_unit=new QLabel(tr("dBFS"),this); box_autotrim_level_unit->setGeometry(330,243,60,20); - box_autotrim_level_unit->setAlignment(AlignVCenter|AlignLeft); + box_autotrim_level_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); connect(box_autotrim_box,SIGNAL(toggled(bool)), this,SLOT(autotrimToggledData(bool))); @@ -249,7 +251,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) this); label->setGeometry(110,269,sizeHint().width()-40,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); box_segue_level_spin= new QSpinBox(this); box_segue_level_spin->setGeometry(300,295,50,20); @@ -259,11 +261,11 @@ EditDropbox::EditDropbox(int id,QWidget *parent) this); box_segue_level_label->setGeometry(120,295,160,20); box_segue_level_label->setFont(font); - box_segue_level_label->setAlignment(AlignVCenter|AlignRight); + box_segue_level_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); box_segue_level_unit= new QLabel(box_segue_level_spin,("dBFS"),this); box_segue_level_unit->setGeometry(360,296,60,20); - box_segue_level_unit->setAlignment(AlignVCenter|AlignLeft); + box_segue_level_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); box_segue_length_spin=new QSpinBox(this); box_segue_length_spin->setGeometry(300,320,70,20); @@ -273,11 +275,11 @@ EditDropbox::EditDropbox(int id,QWidget *parent) this); box_segue_length_label->setGeometry(120,320,160,20); box_segue_length_label->setFont(font); - box_segue_length_label->setAlignment(AlignVCenter|AlignRight); + box_segue_length_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); box_segue_length_unit= new QLabel(box_segue_length_spin,("msec"),this); box_segue_length_unit->setGeometry(375,321,60,20); - box_segue_length_unit->setAlignment(AlignVCenter|AlignLeft); + box_segue_length_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); connect(box_segue_box,SIGNAL(toggled(bool)), this,SLOT(segueToggledData(bool))); @@ -290,7 +292,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) tr("Get cart number from CartChunk CutID"),this); label->setGeometry(110,348,sizeHint().width()-40,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Title from CartChunk ID @@ -301,7 +303,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) tr("Get cart title from CartChunk CutID"),this); label->setGeometry(110,372,sizeHint().width()-40,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Fix Broken Formats @@ -312,7 +314,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) tr("Attempt to work around malformatted input files"),this); label->setGeometry(110,396,sizeHint().width()-40,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Start Date Offset @@ -324,11 +326,11 @@ EditDropbox::EditDropbox(int id,QWidget *parent) label=new QLabel(box_startoffset_spin,tr("Offset start date by"),this); label->setGeometry(90,422,120,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); label=new QLabel(box_startoffset_spin,tr("days"),this); label->setGeometry(275,424,100,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // End Date Offset @@ -340,11 +342,11 @@ EditDropbox::EditDropbox(int id,QWidget *parent) label=new QLabel(box_endoffset_spin,tr("Offset end date by"),this); label->setGeometry(90,446,120,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); label=new QLabel(box_endoffset_spin,tr("days"),this); label->setGeometry(275,446,100,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Create Dates @@ -355,7 +357,7 @@ EditDropbox::EditDropbox(int id,QWidget *parent) this); label->setGeometry(110,468,sizeHint().width()-40,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); box_create_startdate_offset_spin= new QSpinBox(this); box_create_startdate_offset_spin->setGeometry(300,494,50,20); @@ -365,11 +367,11 @@ EditDropbox::EditDropbox(int id,QWidget *parent) this); box_create_startdate_label->setGeometry(120,494,160,20); box_create_startdate_label->setFont(font); - box_create_startdate_label->setAlignment(AlignVCenter|AlignRight); + box_create_startdate_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); box_create_startdate_unit= new QLabel(box_create_startdate_offset_spin,("days"),this); box_create_startdate_unit->setGeometry(360,495,60,20); - box_create_startdate_unit->setAlignment(AlignVCenter|AlignLeft); + box_create_startdate_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); box_create_enddate_offset_spin=new QSpinBox(this); box_create_enddate_offset_spin->setGeometry(300,524,50,20); box_create_enddate_offset_spin->setRange(-180,180); @@ -378,11 +380,11 @@ EditDropbox::EditDropbox(int id,QWidget *parent) this); box_create_enddate_label->setGeometry(120,524,160,20); box_create_enddate_label->setFont(font); - box_create_enddate_label->setAlignment(AlignVCenter|AlignRight); + box_create_enddate_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); box_create_enddate_unit= new QLabel(box_create_enddate_offset_spin,("days"),this); box_create_enddate_unit->setGeometry(360,524,60,20); - box_create_enddate_unit->setAlignment(AlignVCenter|AlignLeft); + box_create_enddate_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); connect(box_create_dates_box,SIGNAL(toggled(bool)), this,SLOT(createDatesToggledData(bool))); @@ -488,7 +490,7 @@ QSizePolicy EditDropbox::sizePolicy() const void EditDropbox::selectPathData() { QString path=box_path_edit->text(); - path=QFileDialog::getExistingDirectory(path,this); + path=Q3FileDialog::getExistingDirectory(path,this); if(!path.isEmpty()) { box_path_edit->setText(path); } @@ -509,7 +511,7 @@ void EditDropbox::selectCartData() void EditDropbox::selectLogPathData() { QString path=box_log_path_edit->text(); - path=QFileDialog::getSaveFileName(path,QString::null,this); + path=Q3FileDialog::getSaveFileName(path,QString::null,this); if(!path.isEmpty()) { box_log_path_edit->setText(path); } @@ -648,7 +650,7 @@ void EditDropbox::okData() QString().sprintf("DROPBOX_ID=%d",box_dropbox->id()); q=new RDSqlQuery(sql); delete q; - for(unsigned i=0;iid())+ "SCHED_CODE=\""+RDEscapeString(box_schedcodes[i])+"\""; diff --git a/rdadmin/edit_dropbox.h b/rdadmin/edit_dropbox.h index 4fc9c8ef..7a640f73 100644 --- a/rdadmin/edit_dropbox.h +++ b/rdadmin/edit_dropbox.h @@ -22,8 +22,8 @@ #define EDIT_DROPBOX_H #include -#include -#include +#include +#include #include #include #include diff --git a/rdadmin/edit_endpoint.cpp b/rdadmin/edit_endpoint.cpp index d030cc3f..36ab9e01 100644 --- a/rdadmin/edit_endpoint.cpp +++ b/rdadmin/edit_endpoint.cpp @@ -19,6 +19,8 @@ // #include +//Added by qt3to4: +#include #include @@ -81,7 +83,7 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, QLabel *label=new QLabel(edit_endpoint_edit,tr("Name: "),this); label->setGeometry(10,13,60,20); label->setFont(bold_font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); // // Unity Feed @@ -92,7 +94,7 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, label=new QLabel(edit_feed_edit,tr("Feed: "),this); label->setGeometry(10,43,60,20); label->setFont(bold_font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); if((edit_type!=RDMatrix::Unity4000)||(edit_endpoint!=RDMatrix::Input)) { edit_feed_edit->hide(); label->hide(); @@ -112,7 +114,7 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, label->setGeometry(130,43,60,20); } label->setFont(bold_font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); if(((edit_type!=RDMatrix::Unity4000)&&(edit_type!=RDMatrix::StarGuideIII))|| (edit_endpoint!=RDMatrix::Input)) { edit_mode_box->hide(); @@ -133,7 +135,7 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, } label->setGeometry(10,36,120,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); if((edit_type!=RDMatrix::LogitekVguest)&& ((edit_type!=RDMatrix::StarGuideIII)||(edit_endpoint!=RDMatrix::Input))) { edit_enginenum_edit->hide(); @@ -151,7 +153,7 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, } label->setGeometry(10,62,120,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); if((edit_type!=RDMatrix::LogitekVguest)&& ((edit_type!=RDMatrix::StarGuideIII)||(edit_endpoint!=RDMatrix::Input))) { edit_devicenum_edit->hide(); diff --git a/rdadmin/edit_feed.cpp b/rdadmin/edit_feed.cpp index ff8662d5..ba78d41d 100644 --- a/rdadmin/edit_feed.cpp +++ b/rdadmin/edit_feed.cpp @@ -26,7 +26,10 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -67,14 +70,14 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) QLabel *feed_keyname_label=new QLabel(feed_keyname_edit,tr("Key Name:"),this); feed_keyname_label->setGeometry(10,11,100,19); feed_keyname_label->setFont(font); - feed_keyname_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_keyname_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Channel Section // feed_channel_section_label=new QLabel(tr("CHANNEL VALUES"),this); feed_channel_section_label->setGeometry(30,41,130,20); - feed_channel_section_label->setAlignment(AlignCenter); + feed_channel_section_label->setAlignment(Qt::AlignCenter); feed_channel_section_label->setFont(font); // @@ -87,7 +90,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_channel_title_edit,tr("Title:"),this); feed_channel_title_label->setGeometry(20,60,90,19); feed_channel_title_label->setFont(font); - feed_channel_title_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_channel_title_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Channel Category @@ -100,7 +103,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_channel_category_label->setGeometry(20,82,90,19); feed_channel_category_label->setFont(font); feed_channel_category_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Channel Link @@ -112,7 +115,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_channel_link_edit,tr("Link:"),this); feed_channel_link_label->setGeometry(20,104,90,19); feed_channel_link_label->setFont(font); - feed_channel_link_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_channel_link_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Channel Copyright @@ -125,7 +128,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_channel_copyright_label->setGeometry(20,126,90,19); feed_channel_copyright_label->setFont(font); feed_channel_copyright_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Channel Webmaster @@ -138,7 +141,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_channel_webmaster_label->setGeometry(20,148,90,19); feed_channel_webmaster_label->setFont(font); feed_channel_webmaster_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Channel Language @@ -152,12 +155,12 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_channel_language_label->setGeometry(20,170,90,19); feed_channel_language_label->setFont(font); feed_channel_language_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Channel Description // - feed_channel_description_edit=new QTextEdit(this); + feed_channel_description_edit=new Q3TextEdit(this); feed_channel_description_edit-> setGeometry(115,192,375,76); feed_channel_description_label= @@ -165,7 +168,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_channel_description_label->setGeometry(20,192,90,19); feed_channel_description_label->setFont(font); feed_channel_description_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Purge Audio URL @@ -179,7 +182,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_purge_url_edit,tr("Audio Upload URL:"),this); feed_purge_url_label->setGeometry(20,280,130,19); feed_purge_url_label->setFont(font); - feed_purge_url_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_purge_url_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Purge Username @@ -193,7 +196,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_purge_username_edit,tr("Username:"),this); feed_purge_username_label->setGeometry(40,302,180,19); feed_purge_username_label->setFont(font); - feed_purge_username_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_purge_username_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Purge Password @@ -206,7 +209,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_purge_password_edit,tr("Password:"),this); feed_purge_password_label->setGeometry(320,302,70,19); feed_purge_password_label->setFont(font); - feed_purge_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_purge_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Audio Format @@ -217,7 +220,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_format_label=new QLabel(feed_format_edit,tr("Upload Format:"),this); feed_format_label->setGeometry(5,324,145,20); feed_format_label->setFont(font); - feed_format_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_format_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); feed_format_button=new QPushButton(this); feed_format_button->setGeometry(450,324,40,24); feed_format_button->setFont(small_font); @@ -234,7 +237,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_normalize_box,tr("Normalize"),this); feed_normalize_check_label->setGeometry(175,346,83,20); feed_normalize_check_label->setFont(font); - feed_normalize_check_label->setAlignment(AlignLeft|AlignVCenter); + feed_normalize_check_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(feed_normalize_box,SIGNAL(toggled(bool)), this,SLOT(normalizeCheckData(bool))); @@ -247,11 +250,11 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_normalize_label=new QLabel(feed_normalize_spin,tr("Level:"),this); feed_normalize_label->setGeometry(245,346,45,20); feed_normalize_label->setFont(font); - feed_normalize_label->setAlignment(AlignRight|AlignVCenter); + feed_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); feed_normalize_unit_label=new QLabel(tr("dBFS"),this); feed_normalize_unit_label->setGeometry(340,346,40,20); feed_normalize_unit_label->setFont(font); - feed_normalize_unit_label->setAlignment(AlignLeft|AlignVCenter); + feed_normalize_unit_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Base Audio URL @@ -263,7 +266,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_base_url_edit,tr("Audio Download URL:"),this); feed_base_url_label->setGeometry(20,368,130,19); feed_base_url_label->setFont(font); - feed_base_url_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_base_url_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Keep Expired Metadata Checkbox @@ -274,7 +277,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_keep_metadata_box,tr("Keep Expired Metadata"),this); feed_keep_metadata_label->setGeometry(175,390,180,19); feed_keep_metadata_label->setFont(font); - feed_keep_metadata_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + feed_keep_metadata_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // AutoPost Checkbox @@ -285,7 +288,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_autopost_box,tr("Enable AutoPost"),this); feed_autopost_label->setGeometry(385,390,200,19); feed_autopost_label->setFont(font); - feed_autopost_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + feed_autopost_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Enclosure Preamble @@ -297,7 +300,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_base_preamble_edit,tr("Enclosure Preamble:"),this); feed_base_preamble_label->setGeometry(20,412,130,19); feed_base_preamble_label->setFont(font); - feed_base_preamble_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_base_preamble_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Audio File Extension @@ -309,7 +312,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_extension_edit,tr("Audio Extension:"),this); feed_extension_label->setGeometry(20,434,130,19); feed_extension_label->setFont(font); - feed_extension_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_extension_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Maximum Shelf Life @@ -323,13 +326,13 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_max_shelf_life_label->setGeometry(20,456,130,19); feed_max_shelf_life_label->setFont(font); feed_max_shelf_life_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); feed_max_shelf_life_unit_label= new QLabel(feed_max_shelf_life_spin,tr("days"),this); feed_max_shelf_life_unit_label->setGeometry(220,456,50,19); feed_max_shelf_life_unit_label->setFont(font); feed_max_shelf_life_unit_label-> - setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Episode Order @@ -342,7 +345,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_castorder_box,tr("Episode Sort Order:"),this); feed_castorder_label->setGeometry(20,478,130,19); feed_castorder_label->setFont(font); - feed_castorder_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_castorder_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Media Link Mode @@ -356,7 +359,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_media_link_mode_box,tr("Media Link Mode:"),this); feed_media_link_mode_label->setGeometry(20,500,130,19); feed_media_link_mode_label->setFont(font); - feed_media_link_mode_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_media_link_mode_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Feed Redirection @@ -367,31 +370,31 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) new QLabel(feed_redirect_check,tr("Enable Feed Redirection"),this); label->setGeometry(40,532,200,19); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); feed_redirect_edit=new QLineEdit(this); feed_redirect_edit->setGeometry(85,552,405,20); feed_redirect_label=new QLabel(feed_redirect_edit,tr("URL:"),this); feed_redirect_label->setGeometry(40,552,40,19); feed_redirect_label->setFont(font); - feed_redirect_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + feed_redirect_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Header XML // - feed_header_xml_edit=new QTextEdit(this); + feed_header_xml_edit=new Q3TextEdit(this); feed_header_xml_edit-> setGeometry(615,10,365,76); feed_header_xml_label=new QLabel(feed_header_xml_edit,tr("Header XML:"),this); feed_header_xml_label->setGeometry(520,10,90,19); feed_header_xml_label->setFont(font); feed_header_xml_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Channel XML // - feed_channel_xml_edit=new QTextEdit(this); + feed_channel_xml_edit=new Q3TextEdit(this); feed_channel_xml_edit-> setGeometry(615,88,365,176); feed_channel_xml_label= @@ -399,18 +402,18 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_channel_xml_label->setGeometry(520,88,90,19); feed_channel_xml_label->setFont(font); feed_channel_xml_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Item XML // - feed_item_xml_edit=new QTextEdit(this); + feed_item_xml_edit=new Q3TextEdit(this); feed_item_xml_edit->setGeometry(615,270,365,250); feed_item_xml_label=new QLabel(feed_item_xml_edit,tr("Item XML:"),this); feed_item_xml_label->setGeometry(520,270,90,19); feed_item_xml_label->setFont(font); feed_item_xml_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button @@ -494,7 +497,7 @@ QSizePolicy EditFeed::sizePolicy() const void EditFeed::purgeUrlChangedData(const QString &str) { - QUrl url(str); + Q3Url url(str); QString protocol=url.protocol(); if(((protocol=="ftp")||(protocol=="sftp"))&& (!feed_redirect_check->isChecked())) { @@ -611,11 +614,10 @@ void EditFeed::cancelData() void EditFeed::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->moveTo(10,50); - p->lineTo(sizeHint().width()/2,50); - p->lineTo(sizeHint().width()/2,272); - p->lineTo(10,272); - p->lineTo(10,50); + p->drawLine(10,50,sizeHint().width()/2,50); + p->drawLine(sizeHint().width()/2,50,sizeHint().width()/2,272); + p->drawLine(sizeHint().width()/2,272,10,272); + p->drawLine(10,272,10,50); delete p; } diff --git a/rdadmin/edit_feed.h b/rdadmin/edit_feed.h index 7df761f7..07f4c83e 100644 --- a/rdadmin/edit_feed.h +++ b/rdadmin/edit_feed.h @@ -22,7 +22,7 @@ #define EDIT_FEED_H #include -#include +#include #include #include #include @@ -30,6 +30,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -60,7 +62,7 @@ class EditFeed : public QDialog RDFeed *feed_feed; QLineEdit *feed_keyname_edit; QLineEdit *feed_channel_title_edit; - QTextEdit *feed_channel_description_edit; + Q3TextEdit *feed_channel_description_edit; QLineEdit *feed_channel_category_edit; QLineEdit *feed_channel_link_edit; QLineEdit *feed_channel_copyright_edit; @@ -73,9 +75,9 @@ class EditFeed : public QDialog QLineEdit *feed_purge_username_edit; QLabel *feed_purge_password_label; QLineEdit *feed_purge_password_edit; - QTextEdit *feed_header_xml_edit; - QTextEdit *feed_channel_xml_edit; - QTextEdit *feed_item_xml_edit; + Q3TextEdit *feed_header_xml_edit; + Q3TextEdit *feed_channel_xml_edit; + Q3TextEdit *feed_item_xml_edit; QSpinBox *feed_max_shelf_life_spin; QCheckBox *feed_autopost_box; QCheckBox *feed_keep_metadata_box; diff --git a/rdadmin/edit_feed_perms.cpp b/rdadmin/edit_feed_perms.cpp index 2f201201..59cd368f 100644 --- a/rdadmin/edit_feed_perms.cpp +++ b/rdadmin/edit_feed_perms.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -104,7 +104,7 @@ EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent) sql=QString().sprintf("select KEY_NAME from FEEDS"); q=new RDSqlQuery(sql); while(q->next()) { - if(feed_host_sel->destFindItem(q->value(0).toString(),ExactMatch)==0) { + if(feed_host_sel->destFindItem(q->value(0).toString(),Q3ListBox::ExactMatch)==0) { feed_host_sel->sourceInsertItem(q->value(0).toString()); } } diff --git a/rdadmin/edit_gpi.cpp b/rdadmin/edit_gpi.cpp index 69f681c2..385566ff 100644 --- a/rdadmin/edit_gpi.cpp +++ b/rdadmin/edit_gpi.cpp @@ -20,6 +20,9 @@ #include #include +//Added by qt3to4: +#include +#include #include #include @@ -68,7 +71,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, QLabel *label=new QLabel("ON Transition",this); label->setGeometry(30,10,120,20); label->setFont(label_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // On Cart Macro Cart @@ -80,7 +83,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, label=new QLabel(tr("Cart Number: "),this); label->setGeometry(15,30,100,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // On Select Button @@ -110,7 +113,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, label=new QLabel(tr("Description: "),this); label->setGeometry(15,52,100,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Off Section Label @@ -118,7 +121,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, label=new QLabel("OFF Transition",this); label->setGeometry(30,90,120,20); label->setFont(label_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Off Cart Macro Cart @@ -130,7 +133,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, label=new QLabel(tr("Cart Number: "),this); label->setGeometry(15,110,100,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Off Select Button @@ -160,7 +163,7 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, label=new QLabel(tr("Description: "),this); label->setGeometry(15,132,100,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button @@ -314,17 +317,15 @@ void EditGpi::cancelData() void EditGpi::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->moveTo(10,20); - p->lineTo(sizeHint().width()-10,20); - p->lineTo(sizeHint().width()-10,82); - p->lineTo(10,82); - p->lineTo(10,20); + p->drawLine(10,20,sizeHint().width()-10,20); + p->drawLine(sizeHint().width()-10,20,sizeHint().width()-10,82); + p->drawLine(sizeHint().width()-10,82,10,82); + p->drawLine(10,82,10,20); - p->moveTo(10,100); - p->lineTo(sizeHint().width()-10,100); - p->lineTo(sizeHint().width()-10,162); - p->lineTo(10,162); - p->lineTo(10,100); + p->drawLine(10,100,sizeHint().width()-10,100); + p->drawLine(sizeHint().width()-10,10,sizeHint().width()-10,162); + p->drawLine(sizeHint().width()-10,162,10,162); + p->drawLine(10,162,10,100); delete p; } diff --git a/rdadmin/edit_gpi.h b/rdadmin/edit_gpi.h index 6d025ff7..76ac2700 100644 --- a/rdadmin/edit_gpi.h +++ b/rdadmin/edit_gpi.h @@ -27,6 +27,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/rdadmin/edit_group.cpp b/rdadmin/edit_group.cpp index 615bd095..4249b1ea 100644 --- a/rdadmin/edit_group.cpp +++ b/rdadmin/edit_group.cpp @@ -23,14 +23,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include +//Added by qt3to4: +#include +#include #include #include @@ -77,7 +80,7 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_name_edit->setReadOnly(true); group_name_label=new QLabel(group_name_edit,tr("&Group Name:"),this); group_name_label->setFont(font); - group_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + group_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Group Description @@ -88,7 +91,7 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_description_label= new QLabel(group_description_edit,tr("Group &Description:"),this); group_description_label->setFont(font); - group_description_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + group_description_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Default Title @@ -99,7 +102,7 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_title_label= new QLabel(group_title_edit,tr("Default Import &Title:"),this); group_title_label->setFont(font); - group_title_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + group_title_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Default Cart Type @@ -110,7 +113,7 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_carttype_label= new QLabel(group_carttype_box,tr("Default Cart &Type:"),this); group_carttype_label->setFont(font); - group_carttype_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + group_carttype_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Default Cart Numbers @@ -121,13 +124,13 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_cartrange_label= new QLabel(group_lowcart_box,tr("Default Cart Number:"),this); group_cartrange_label->setFont(font); - group_cartrange_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + group_cartrange_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); group_highcart_box=new QSpinBox(this); group_highcart_box->setRange(1,999999); group_highcart_label= new QLabel(group_highcart_box,tr("to"),this); group_highcart_label->setFont(font); - group_highcart_label->setAlignment(AlignCenter|ShowPrefix); + group_highcart_label->setAlignment(Qt::AlignCenter); connect(group_lowcart_box,SIGNAL(valueChanged(int)), this,SLOT(lowCartChangedData(int))); @@ -138,7 +141,7 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_enforcerange_label= new QLabel(group_enforcerange_box,tr("Enforce Cart Range"),this); group_enforcerange_label->setFont(font); - group_enforcerange_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + group_enforcerange_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Traffic Report Checkbox @@ -148,7 +151,7 @@ EditGroup::EditGroup(QString group,QWidget *parent) new QLabel(group_traffic_check,tr("Include this group in Traffic reports"), this); group_traffic_label->setFont(font); - group_traffic_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + group_traffic_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Music Report Checkbox @@ -157,7 +160,7 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_music_label=new QLabel(group_music_check,tr("Include this group in Music reports"), this); group_music_label->setFont(font); - group_music_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + group_music_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Default Cut End DateTime @@ -170,11 +173,11 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_cutlife_label= new QLabel(group_cutlife_check,tr("Set End Date/Time to"),this); group_cutlife_label->setFont(font); - group_cutlife_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + group_cutlife_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); group_cutlife_unit= new QLabel(group_cutlife_check,tr("days after cut creation"),this); group_cutlife_unit->setFont(font); - group_cutlife_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + group_cutlife_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Cut Auto Purging @@ -187,17 +190,17 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_shelflife_label= new QLabel(group_shelflife_check,tr("Purge expired cuts after"),this); group_shelflife_label->setFont(font); - group_shelflife_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + group_shelflife_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); group_shelflife_unit= new QLabel(group_shelflife_check,tr("days"),this); group_shelflife_unit->setFont(font); - group_shelflife_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + group_shelflife_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); group_delete_carts_check=new QCheckBox(this); group_delete_carts_label= new QLabel(group_delete_carts_check,tr("Delete cart if empty"),this); group_delete_carts_label->setFont(font); - group_delete_carts_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + group_delete_carts_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Now & Next Data Checkbox @@ -206,7 +209,7 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_nownext_label= new QLabel(group_nownext_check,tr("Transmit Now && Next data"),this); group_nownext_label->setFont(font); - group_nownext_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + group_nownext_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Services Selector diff --git a/rdadmin/edit_group.h b/rdadmin/edit_group.h index fefc1793..547c9460 100644 --- a/rdadmin/edit_group.h +++ b/rdadmin/edit_group.h @@ -22,8 +22,8 @@ #define EDIT_GROUP_H #include -#include -#include +#include +#include #include #include #include @@ -32,6 +32,8 @@ #include #include #include +//Added by qt3to4: +#include #include diff --git a/rdadmin/edit_hostvar.cpp b/rdadmin/edit_hostvar.cpp index de383f40..8c536b19 100644 --- a/rdadmin/edit_hostvar.cpp +++ b/rdadmin/edit_hostvar.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -74,7 +74,7 @@ EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, QLabel *label=new QLabel(edit_name_edit,tr("Variable Name:"),this); label->setGeometry(10,11,110,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Variable Value @@ -85,7 +85,7 @@ EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, label=new QLabel(edit_varvalue_edit,tr("Variable Value:"),this); label->setGeometry(10,33,110,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Remark @@ -96,7 +96,7 @@ EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, label=new QLabel(edit_remark_edit,tr("Remark:"),this); label->setGeometry(10,55,110,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/rdadmin/edit_hostvar.h b/rdadmin/edit_hostvar.h index 9fb96298..c5869405 100644 --- a/rdadmin/edit_hostvar.h +++ b/rdadmin/edit_hostvar.h @@ -22,8 +22,8 @@ #define EDIT_HOSTVAR_H #include -#include -#include +#include +#include #include #include #include diff --git a/rdadmin/edit_hotkeys.cpp b/rdadmin/edit_hotkeys.cpp index 3afdb305..8462e178 100644 --- a/rdadmin/edit_hotkeys.cpp +++ b/rdadmin/edit_hotkeys.cpp @@ -24,7 +24,10 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -69,7 +72,7 @@ EditHotkeys::EditHotkeys(const QString &station,const QString &module, setCaption(hotkey_module.upper()+" "+tr("Hot Key Configuration for")+" "+ hotkey_conf); - list_view=new QListView(this); + list_view=new Q3ListView(this); list_view->setGeometry(10,24,320,220); QLabel *label=new QLabel(list_view,tr("Host Hot Key Configurations"),this); label->setFont(font); @@ -77,19 +80,19 @@ EditHotkeys::EditHotkeys(const QString &station,const QString &module, //list_view->setItemMargin(5); list_view->setSorting(-1); list_view->addColumn(tr("Button / Function ")); - list_view->setColumnAlignment(0,AlignLeft|AlignVCenter); + list_view->setColumnAlignment(0,Qt::AlignLeft|Qt::AlignVCenter); list_view->addColumn(tr("KeyStroke")); - list_view->setColumnAlignment(1,AlignLeft|AlignVCenter); + list_view->setColumnAlignment(1,Qt::AlignLeft|Qt::AlignVCenter); list_view->setAllColumnsShowFocus(true); - connect(list_view,SIGNAL(clicked(QListViewItem *,const QPoint &,int)), + connect(list_view,SIGNAL(clicked(Q3ListViewItem *,const QPoint &,int)), this,SLOT(showCurrentKey())); - connect(list_view,SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + connect(list_view,SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this,SLOT(showCurrentKey())); // Keystroke Value field keystroke = new QLineEdit(this); - keystroke->setFocusPolicy(QWidget::StrongFocus); + keystroke->setFocusPolicy(Qt::StrongFocus); keystroke->setGeometry(sizeHint().width()-270,sizeHint().height()-210,200,35); @@ -128,7 +131,7 @@ EditHotkeys::EditHotkeys(const QString &station,const QString &module, new QLabel(clone_from_host_box,tr("Set From Host:"),this); clone_from_host_label->setFont(font); clone_from_host_label->setGeometry(sizeHint().width()-420,sizeHint().height()-110,120,30); - clone_from_host_label->setAlignment(AlignRight|AlignVCenter); + clone_from_host_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); sql=QString().sprintf("select NAME from STATIONS"); q=new RDSqlQuery(sql); while(q->next()) { @@ -193,9 +196,9 @@ void EditHotkeys::save() QString sql; RDSqlQuery *q; - QListViewItemIterator *start; + Q3ListViewItemIterator *start; - start = new QListViewItemIterator(list_view); + start = new Q3ListViewItemIterator(list_view); QString stringlist [40][45]; // assumes no more than 40 entries... int cur, top, i = 0; @@ -222,7 +225,7 @@ void EditHotkeys::save() } } - start = new QListViewItemIterator(list_view); + start = new Q3ListViewItemIterator(list_view); while(start->current()) { sql=QString("update RDHOTKEYS set ")+ @@ -242,7 +245,7 @@ void EditHotkeys::save() void EditHotkeys::SetHotKey() { - QListViewItem *item=list_view->selectedItem(); + Q3ListViewItem *item=list_view->selectedItem(); if (item==NULL) return; item->setText(1,hotkeystrokes); @@ -261,7 +264,7 @@ void EditHotkeys::clearAll_Hotkeys() break; } - QListViewItem *l = list_view->firstChild(); + Q3ListViewItem *l = list_view->firstChild(); while (l) { l->setText(1,""); l = l->nextSibling(); @@ -411,7 +414,7 @@ void EditHotkeys::RefreshList() QString sql; RDSqlQuery *q; - QListViewItem *l; + Q3ListViewItem *l; list_view->clear(); keyupdated = false; @@ -427,7 +430,7 @@ void EditHotkeys::RefreshList() "order by KEY_ID DESC"; q=new RDSqlQuery(sql); while(q->next()) { - l=new QListViewItem(list_view); + l=new Q3ListViewItem(list_view); l->setText(0,q->value(0).toString()); l->setText(1,q->value(1).toString()); } @@ -442,7 +445,7 @@ void EditHotkeys::Clone_RefreshList(const QString& clone_station) QString tmp_hotkey_conf=clone_station; RDHotkeys *tmp_station_hotkeys= new RDHotkeys(tmp_hotkey_conf,hotkey_module); keyupdated = true; - QListViewItem *l; + Q3ListViewItem *l; list_view->clear(); sql=QString("select ")+ @@ -455,7 +458,7 @@ void EditHotkeys::Clone_RefreshList(const QString& clone_station) q=new RDSqlQuery(sql); while(q->next()) { - l=new QListViewItem(list_view); + l=new Q3ListViewItem(list_view); l->setText(0,q->value(0).toString()); l->setText(1,q->value(1).toString()); } @@ -467,7 +470,7 @@ void EditHotkeys::Clone_RefreshList(const QString& clone_station) void EditHotkeys::showCurrentKey() { - QListViewItem *item=list_view->selectedItem(); + Q3ListViewItem *item=list_view->selectedItem(); if (item==NULL) return; keystroke->setText((const char *)item->text(1)); keystroke->displayText(); @@ -487,7 +490,7 @@ void EditHotkeys::clearCurrentItem() void EditHotkeys::SetButtonClicked() { - QListViewItem *item=list_view->selectedItem(); + Q3ListViewItem *item=list_view->selectedItem(); if (item==NULL) { QMessageBox::warning(this,tr("No Items Selected"), tr("Please Select an Item From the List")); diff --git a/rdadmin/edit_hotkeys.h b/rdadmin/edit_hotkeys.h index d46228d9..d0a67b3a 100644 --- a/rdadmin/edit_hotkeys.h +++ b/rdadmin/edit_hotkeys.h @@ -24,10 +24,12 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include #include #include @@ -64,7 +66,7 @@ class EditHotkeys : public QDialog private: void SetRow(const QString ¶m,QString value) const; RDHotkeys *station_hotkeys; - QListView *list_view; + Q3ListView *list_view; QString hotkeystrokes; QString hotkey_conf; QString hotkey_module; diff --git a/rdadmin/edit_jack.cpp b/rdadmin/edit_jack.cpp index 0988fb56..dd32374e 100644 --- a/rdadmin/edit_jack.cpp +++ b/rdadmin/edit_jack.cpp @@ -22,16 +22,19 @@ #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include @@ -71,7 +74,7 @@ EditJack::EditJack(RDStation *station,QWidget *parent) edit_start_jack_label= new QLabel(edit_start_jack_box,tr("Start JACK Server"),this); edit_start_jack_label->setFont(font); - edit_start_jack_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + edit_start_jack_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // JACK Server Name @@ -81,7 +84,7 @@ EditJack::EditJack(RDStation *station,QWidget *parent) new QLabel(edit_jack_server_name_edit,tr("JACK Server Name:"),this); edit_jack_server_name_label->setFont(font); edit_jack_server_name_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // JACK Command Line @@ -93,7 +96,7 @@ EditJack::EditJack(RDStation *station,QWidget *parent) new QLabel(edit_jack_command_line_edit,tr("JACK Command Line:"),this); edit_jack_command_line_label->setFont(font); edit_jack_command_line_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Active Audio Ports @@ -103,7 +106,7 @@ EditJack::EditJack(RDStation *station,QWidget *parent) edit_jack_audio_ports_label= new QLabel(edit_jack_audio_ports_spin,tr("Active Audio Ports")+":",this); edit_jack_audio_ports_label->setFont(font); - edit_jack_audio_ports_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_jack_audio_ports_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // JACK Client List @@ -118,9 +121,9 @@ EditJack::EditJack(RDStation *station,QWidget *parent) edit_jack_client_view->setColumnAlignment(0,Qt::AlignLeft); edit_jack_client_view->addColumn(tr("Command Line")); edit_jack_client_view->setColumnAlignment(1,Qt::AlignLeft); - connect(edit_jack_client_view,SIGNAL(doubleClicked(QListViewItem *, + connect(edit_jack_client_view,SIGNAL(doubleClicked(Q3ListViewItem *, const QPoint &,int)), - this,SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + this,SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); // // Add Button @@ -270,7 +273,7 @@ void EditJack::deleteData() } -void EditJack::doubleClickedData(QListViewItem *item,const QPoint &pt,int col) +void EditJack::doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col) { editData(); } diff --git a/rdadmin/edit_jack.h b/rdadmin/edit_jack.h index cd215936..75e48257 100644 --- a/rdadmin/edit_jack.h +++ b/rdadmin/edit_jack.h @@ -25,11 +25,13 @@ #include #include #include -#include +#include #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -49,7 +51,7 @@ class EditJack : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void okData(); void cancelData(); diff --git a/rdadmin/edit_jack_client.cpp b/rdadmin/edit_jack_client.cpp index 0ff1775c..60b73428 100644 --- a/rdadmin/edit_jack_client.cpp +++ b/rdadmin/edit_jack_client.cpp @@ -23,6 +23,9 @@ #include #include #include +//Added by qt3to4: +#include +#include EditJackClient::EditJackClient(RDStation *station,QWidget *parent) : QDialog(parent,"",true) @@ -55,7 +58,7 @@ EditJackClient::EditJackClient(RDStation *station,QWidget *parent) new QLabel(edit_jack_description_edit,tr("Description:"),this); edit_jack_description_label->setFont(font); edit_jack_description_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // JACK Client Description @@ -65,7 +68,7 @@ EditJackClient::EditJackClient(RDStation *station,QWidget *parent) new QLabel(edit_jack_command_line_edit,tr("Command Line:"),this); edit_jack_command_line_label->setFont(font); edit_jack_command_line_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/rdadmin/edit_jack_client.h b/rdadmin/edit_jack_client.h index 33d254c3..3cce75a7 100644 --- a/rdadmin/edit_jack_client.h +++ b/rdadmin/edit_jack_client.h @@ -25,6 +25,8 @@ #include #include #include +//Added by qt3to4: +#include #include diff --git a/rdadmin/edit_matrix.cpp b/rdadmin/edit_matrix.cpp index 979d896e..f02aa88a 100644 --- a/rdadmin/edit_matrix.cpp +++ b/rdadmin/edit_matrix.cpp @@ -20,9 +20,12 @@ #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include //#include #include diff --git a/rdadmin/edit_matrix.h b/rdadmin/edit_matrix.h index 17fe6307..20f4bdaa 100644 --- a/rdadmin/edit_matrix.h +++ b/rdadmin/edit_matrix.h @@ -28,6 +28,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/rdadmin/edit_node.cpp b/rdadmin/edit_node.cpp index bd179881..0c054d44 100644 --- a/rdadmin/edit_node.cpp +++ b/rdadmin/edit_node.cpp @@ -63,7 +63,7 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent) new QLabel(edit_hostname_edit,tr("Hostname: "),this); label->setGeometry(10,10,80,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Node TCP Port @@ -74,7 +74,7 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent) label=new QLabel(edit_tcpport_spin,tr("Port: "),this); label->setGeometry(290,10,45,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Node Description @@ -84,7 +84,7 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent) label=new QLabel(edit_description_edit,tr("Description: "),this); label->setGeometry(10,32,80,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Base Output @@ -97,7 +97,7 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent) new QLabel(edit_output_spin,tr("First Output: "),this); label->setGeometry(10,54,80,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Node Password @@ -112,7 +112,7 @@ EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent) new QLabel(edit_password_edit,tr("Password: "),this); label->setGeometry(160,54,80,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // View Node Info Button diff --git a/rdadmin/edit_now_next.cpp b/rdadmin/edit_now_next.cpp index a5689474..b6eae480 100644 --- a/rdadmin/edit_now_next.cpp +++ b/rdadmin/edit_now_next.cpp @@ -20,6 +20,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -80,7 +82,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) QLabel *label=new QLabel(tr("Master Log"),this); label->setGeometry(10,7,100,19); label->setFont(section_font); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Master Log UDP Address @@ -90,7 +92,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_address_edit[0],tr("IP Address:"),this); label->setGeometry(10,33,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Master Log UDP Port @@ -101,7 +103,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_port_spin[0],tr("UDP Port:"),this); label->setGeometry(270,33,100,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Master Log UDP String @@ -111,7 +113,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_string_edit[0],tr("UDP String:"),this); label->setGeometry(10,55,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Master Log RML @@ -122,7 +124,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_rml_edit[0],tr("RML:"),this); label->setGeometry(10,77,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Main Log Default Now Cart @@ -133,7 +135,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_nowcart_edit[0],tr("Default Now Cart:"),this); label->setGeometry(10,104,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QPushButton *button=new QPushButton(this); button->setGeometry(205,101,50,26); button->setFont(normal_font); @@ -150,7 +152,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_nextcart_edit[0],tr("Default Next Cart:"),this); label->setGeometry(10,136,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(this); button->setGeometry(205,132,50,26); button->setFont(normal_font); @@ -164,7 +166,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(tr("Aux Log 1"),this); label->setGeometry(10,175,100,19); label->setFont(section_font); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Aux Log 1 UDP Address @@ -174,7 +176,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_address_edit[1],tr("IP Address:"),this); label->setGeometry(10,201,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Aux Log 1 UDP Port @@ -185,7 +187,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_port_spin[1],tr("UDP Port:"),this); label->setGeometry(270,201,100,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Aux Log 1 UDP String @@ -195,7 +197,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_string_edit[1],tr("UDP String:"),this); label->setGeometry(10,223,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Aux Log 1 RML @@ -206,7 +208,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_rml_edit[1],tr("RML:"),this); label->setGeometry(10,245,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Aux 1 Log Default Now Cart @@ -217,7 +219,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_nowcart_edit[1],tr("Default Now Cart:"),this); label->setGeometry(10,272,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(this); button->setGeometry(205,269,50,26); button->setFont(normal_font); @@ -234,7 +236,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_nextcart_edit[1],tr("Default Next Cart:"),this); label->setGeometry(10,304,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(this); button->setGeometry(205,300,50,26); button->setFont(normal_font); @@ -248,7 +250,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(tr("Aux Log 2"),this); label->setGeometry(10,343,100,19); label->setFont(section_font); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Aux Log 2 UDP Address @@ -258,7 +260,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_address_edit[2],tr("IP Address:"),this); label->setGeometry(10,369,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Aux Log 2 UDP Port @@ -269,7 +271,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_port_spin[2],tr("UDP Port:"),this); label->setGeometry(270,369,100,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Aux Log 2 UDP String @@ -279,7 +281,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_string_edit[2],tr("UDP String:"),this); label->setGeometry(10,391,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Aux Log 2 RML @@ -290,7 +292,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_rml_edit[2],tr("RML:"),this); label->setGeometry(10,413,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Aux 1 Log Default Now Cart @@ -301,7 +303,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_nowcart_edit[2],tr("Default Now Cart:"),this); label->setGeometry(10,440,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(this); button->setGeometry(205,437,50,26); button->setFont(normal_font); @@ -318,7 +320,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) label=new QLabel(nownext_nextcart_edit[2],tr("Default Next Cart:"),this); label->setGeometry(10,472,120,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(this); button->setGeometry(205,469,50,26); button->setFont(normal_font); @@ -333,19 +335,19 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) nownext_plugin_list->setGeometry(10,540,sizeHint().width()-20,120); nownext_plugin_list->setItemMargin(5); nownext_plugin_list->addColumn(tr("Path")); - nownext_plugin_list->setColumnAlignment(0,AlignLeft|AlignVCenter); + nownext_plugin_list->setColumnAlignment(0,Qt::AlignLeft|Qt::AlignVCenter); nownext_plugin_list->addColumn(tr("Argument")); - nownext_plugin_list->setColumnAlignment(1,AlignLeft|AlignVCenter); + nownext_plugin_list->setColumnAlignment(1,Qt::AlignLeft|Qt::AlignVCenter); nownext_plugin_list->setAllColumnsShowFocus(true); connect(nownext_plugin_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(pluginDoubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(pluginDoubleClickedData(Q3ListViewItem *,const QPoint &,int))); label=new QLabel(nownext_plugin_list,tr("Loadable Modules:"),this); label->setGeometry(10,518,sizeHint().width()-20,19); label->setFont(section_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); nownext_add_button=new QPushButton(tr("Add"),this); nownext_add_button->setGeometry(sizeHint().width()-210,665,60,25); @@ -479,7 +481,7 @@ void EditNowNext::deletePluginData() } -void EditNowNext::pluginDoubleClickedData(QListViewItem *item,const QPoint &pt, +void EditNowNext::pluginDoubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editPluginData(); diff --git a/rdadmin/edit_now_next.h b/rdadmin/edit_now_next.h index bb09f610..5653bf08 100644 --- a/rdadmin/edit_now_next.h +++ b/rdadmin/edit_now_next.h @@ -45,7 +45,7 @@ class EditNowNext : public QDialog void addPluginData(); void editPluginData(); void deletePluginData(); - void pluginDoubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void pluginDoubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void editNowcartData(int lognum); void editNextcartData(int lognum); void okData(); diff --git a/rdadmin/edit_nownextplugin.cpp b/rdadmin/edit_nownextplugin.cpp index 8d8b7dd4..f8efb4ca 100644 --- a/rdadmin/edit_nownextplugin.cpp +++ b/rdadmin/edit_nownextplugin.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -63,7 +63,7 @@ EditNowNextPlugin::EditNowNextPlugin(QString *path,QString *arg, QLabel *label=new QLabel(plugin_path_edit,tr("Plugin Path:"),this); label->setGeometry(10,11,95,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); QPushButton *button=new QPushButton(tr("Select"),this); button->setGeometry(sizeHint().width()-60,10,50,22); button->setFont(user_font); @@ -78,7 +78,7 @@ EditNowNextPlugin::EditNowNextPlugin(QString *path,QString *arg, label=new QLabel(plugin_arg_edit,tr("Argument:"),this); label->setGeometry(10,38,95,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button @@ -130,7 +130,7 @@ void EditNowNextPlugin::selectData() if(!plugin_path_edit->text().isEmpty()) { filename=plugin_path_edit->text(); } - filename=QFileDialog::getOpenFileName(filename,RD_MODULE_FILE_FILTER, + filename=Q3FileDialog::getOpenFileName(filename,RD_MODULE_FILE_FILTER, this,"",tr("Select plugin")); if(!filename.isNull()) { plugin_path_edit->setText(filename); diff --git a/rdadmin/edit_rdairplay.cpp b/rdadmin/edit_rdairplay.cpp index de811a3f..6d03c68e 100644 --- a/rdadmin/edit_rdairplay.cpp +++ b/rdadmin/edit_rdairplay.cpp @@ -22,15 +22,18 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -110,13 +113,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_start_rml_edit[0]->setValidator(validator); air_start_rml_label[0]=new QLabel(air_start_rml_edit[0],tr("Start RML:"),this); air_start_rml_label[0]->setGeometry(140,50,65,19); - air_start_rml_label[0]->setAlignment(AlignVCenter|AlignRight); + air_start_rml_label[0]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[0]=new QLineEdit(this); air_stop_rml_edit[0]->setGeometry(210,71,95,19); air_stop_rml_edit[0]->setValidator(validator); air_stop_rml_label[0]=new QLabel(air_start_rml_edit[0],tr("Stop RML:"),this); air_stop_rml_label[0]->setGeometry(140,71,65,19); - air_stop_rml_label[0]->setAlignment(AlignVCenter|AlignRight); + air_stop_rml_label[0]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_channel_button[0]=new QPushButton(tr("Edit\nGPIOs"),this); air_channel_button[0]->setGeometry(310,46,60,50); @@ -140,13 +143,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_start_rml_edit[1]->setValidator(validator); air_start_rml_label[1]=new QLabel(air_start_rml_edit[1],tr("Start RML:"),this); air_start_rml_label[1]->setGeometry(140,118,65,19); - air_start_rml_label[1]->setAlignment(AlignVCenter|AlignRight); + air_start_rml_label[1]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[1]=new QLineEdit(this); air_stop_rml_edit[1]->setGeometry(210,139,95,19); air_stop_rml_edit[1]->setValidator(validator); air_stop_rml_label[1]=new QLabel(air_start_rml_edit[1],tr("Stop RML:"),this); air_stop_rml_label[1]->setGeometry(140,139,65,19); - air_stop_rml_label[1]->setAlignment(AlignVCenter|AlignRight); + air_stop_rml_label[1]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_channel_button[1]=new QPushButton(tr("Edit\nGPIOs"),this); air_channel_button[1]->setGeometry(310,114,60,50); @@ -170,13 +173,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_start_rml_edit[4]->setValidator(validator); air_start_rml_label[4]=new QLabel(air_start_rml_edit[4],tr("Start RML:"),this); air_start_rml_label[4]->setGeometry(140,186,65,19); - air_start_rml_label[4]->setAlignment(AlignVCenter|AlignRight); + air_start_rml_label[4]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[4]=new QLineEdit(this); air_stop_rml_edit[4]->setGeometry(210,207,95,19); air_stop_rml_edit[4]->setValidator(validator); air_stop_rml_label[4]=new QLabel(air_start_rml_edit[4],tr("Stop RML:"),this); air_stop_rml_label[4]->setGeometry(140,207,65,19); - air_stop_rml_label[4]->setAlignment(AlignVCenter|AlignRight); + air_stop_rml_label[4]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_channel_button[4]=new QPushButton(tr("Edit\nGPIOs"),this); air_channel_button[4]->setGeometry(310,182,60,50); @@ -200,13 +203,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_start_rml_edit[5]->setValidator(validator); air_start_rml_label[5]=new QLabel(air_start_rml_edit[5],tr("Start RML:"),this); air_start_rml_label[5]->setGeometry(140,254,65,19); - air_start_rml_label[5]->setAlignment(AlignVCenter|AlignRight); + air_start_rml_label[5]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[5]=new QLineEdit(this); air_stop_rml_edit[5]->setGeometry(210,275,95,19); air_stop_rml_edit[5]->setValidator(validator); air_stop_rml_label[5]=new QLabel(air_start_rml_edit[5],tr("Stop RML:"),this); air_stop_rml_label[5]->setGeometry(140,275,65,19); - air_stop_rml_label[5]->setAlignment(AlignVCenter|AlignRight); + air_stop_rml_label[5]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_channel_button[5]=new QPushButton(tr("Edit\nGPIOs"),this); air_channel_button[5]->setGeometry(310,250,60,50); @@ -242,14 +245,14 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_virtual_start_rml_label= new QLabel(air_virtual_start_rml_edit,tr("Start RML:"),this); air_virtual_start_rml_label->setGeometry(140,332,65,19); - air_virtual_start_rml_label->setAlignment(AlignVCenter|AlignRight); + air_virtual_start_rml_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_virtual_stop_rml_edit=new QLineEdit(this); air_virtual_stop_rml_edit->setGeometry(210,353,95,19); air_virtual_stop_rml_edit->setValidator(validator); air_virtual_stop_rml_label= new QLabel(air_virtual_start_rml_edit,tr("Stop RML:"),this); air_virtual_stop_rml_label->setGeometry(140,353,65,19); - air_virtual_stop_rml_label->setAlignment(AlignVCenter|AlignRight); + air_virtual_stop_rml_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // **** INACTIVE INACTIVE INACTIVE **** // @@ -263,13 +266,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_start_rml_edit[3]->setValidator(validator); air_start_rml_label[3]=new QLabel(air_start_rml_edit[3],tr("Start RML:"),this); air_start_rml_label[3]->setGeometry(140,322,65,19); - air_start_rml_label[3]->setAlignment(AlignVCenter|AlignRight); + air_start_rml_label[3]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[3]=new QLineEdit(this); air_stop_rml_edit[3]->setGeometry(210,343,160,19); air_stop_rml_edit[3]->setValidator(validator); air_stop_rml_label[3]=new QLabel(air_start_rml_edit[3],tr("Stop RML:"),this); air_stop_rml_label[3]->setGeometry(140,343,65,19); - air_stop_rml_label[3]->setAlignment(AlignVCenter|AlignRight); + air_stop_rml_label[3]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_channel_button[3]=NULL; connect(air_card_sel[3],SIGNAL(settingsChanged(int,int,int)), @@ -313,13 +316,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_start_rml_edit[2]->setValidator(validator); air_start_rml_label[2]=new QLabel(air_start_rml_edit[2],tr("Start RML:"),this); air_start_rml_label[2]->setGeometry(510,50,65,19); - air_start_rml_label[2]->setAlignment(AlignVCenter|AlignRight); + air_start_rml_label[2]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[2]=new QLineEdit(this); air_stop_rml_edit[2]->setGeometry(580,71,95,19); air_stop_rml_edit[2]->setValidator(validator); air_stop_rml_label[2]=new QLabel(air_start_rml_edit[2],tr("Stop RML:"),this); air_stop_rml_label[2]->setGeometry(510,71,65,19); - air_stop_rml_label[2]->setAlignment(AlignVCenter|AlignRight); + air_stop_rml_label[2]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_channel_button[2]=new QPushButton(tr("Edit\nGPIOs"),this); air_channel_button[2]->setGeometry(680,46,60,50); @@ -343,13 +346,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_start_rml_edit[6]->setValidator(validator); air_start_rml_label[6]=new QLabel(air_start_rml_edit[6],tr("Start RML:"),this); air_start_rml_label[6]->setGeometry(510,118,65,19); - air_start_rml_label[6]->setAlignment(AlignVCenter|AlignRight); + air_start_rml_label[6]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[6]=new QLineEdit(this); air_stop_rml_edit[6]->setGeometry(580,139,95,19); air_stop_rml_edit[6]->setValidator(validator); air_stop_rml_label[6]=new QLabel(air_start_rml_edit[6],tr("Stop RML:"),this); air_stop_rml_label[6]->setGeometry(510,139,65,19); - air_stop_rml_label[6]->setAlignment(AlignVCenter|AlignRight); + air_stop_rml_label[6]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_channel_button[6]=new QPushButton(tr("Edit\nGPIOs"),this); air_channel_button[6]->setGeometry(680,114,60,50); @@ -373,13 +376,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_start_rml_edit[7]->setValidator(validator); air_start_rml_label[7]=new QLabel(air_start_rml_edit[7],tr("Start RML:"),this); air_start_rml_label[7]->setGeometry(510,186,65,19); - air_start_rml_label[7]->setAlignment(AlignVCenter|AlignRight); + air_start_rml_label[7]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[7]=new QLineEdit(this); air_stop_rml_edit[7]->setGeometry(580,207,95,19); air_stop_rml_edit[7]->setValidator(validator); air_stop_rml_label[7]=new QLabel(air_start_rml_edit[7],tr("Stop RML:"),this); air_stop_rml_label[7]->setGeometry(510,207,65,19); - air_stop_rml_label[7]->setAlignment(AlignVCenter|AlignRight); + air_stop_rml_label[7]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_channel_button[7]=new QPushButton(tr("Edit\nGPIOs"),this); air_channel_button[7]->setGeometry(680,182,60,50); @@ -403,13 +406,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_start_rml_edit[8]->setValidator(validator); air_start_rml_label[8]=new QLabel(air_start_rml_edit[8],tr("Start RML:"),this); air_start_rml_label[8]->setGeometry(510,254,65,19); - air_start_rml_label[8]->setAlignment(AlignVCenter|AlignRight); + air_start_rml_label[8]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[8]=new QLineEdit(this); air_stop_rml_edit[8]->setGeometry(580,275,95,19); air_stop_rml_edit[8]->setValidator(validator); air_stop_rml_label[8]=new QLabel(air_start_rml_edit[8],tr("Stop RML:"),this); air_stop_rml_label[8]->setGeometry(510,275,65,19); - air_stop_rml_label[8]->setAlignment(AlignVCenter|AlignRight); + air_stop_rml_label[8]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_channel_button[8]=new QPushButton(tr("Edit\nGPIOs"),this); air_channel_button[8]->setGeometry(680,250,60,50); @@ -433,13 +436,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_start_rml_edit[9]->setValidator(validator); air_start_rml_label[9]=new QLabel(air_start_rml_edit[9],tr("Start RML:"),this); air_start_rml_label[9]->setGeometry(510,322,65,19); - air_start_rml_label[9]->setAlignment(AlignVCenter|AlignRight); + air_start_rml_label[9]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[9]=new QLineEdit(this); air_stop_rml_edit[9]->setGeometry(580,343,95,19); air_stop_rml_edit[9]->setValidator(validator); air_stop_rml_label[9]=new QLabel(air_start_rml_edit[9],tr("Stop RML:"),this); air_stop_rml_label[9]->setGeometry(510,343,65,19); - air_stop_rml_label[9]->setAlignment(AlignVCenter|AlignRight); + air_stop_rml_label[9]->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_channel_button[9]=new QPushButton(tr("Edit\nGPIOs"),this); air_channel_button[9]->setGeometry(680,318,60,50); @@ -463,10 +466,10 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_segue_edit->setGeometry(895,32,50,20); air_segue_label=new QLabel(air_segue_edit,tr("Manual Segue:"),this); air_segue_label->setGeometry(790,32,100,20); - air_segue_label->setAlignment(AlignRight|AlignVCenter); + air_segue_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); air_segue_unit=new QLabel(air_segue_edit,tr("msecs"),this); air_segue_unit->setGeometry(950,32,40,20); - air_segue_unit->setAlignment(AlignLeft|AlignVCenter); + air_segue_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Forced Transition Length @@ -475,10 +478,10 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_trans_edit->setGeometry(895,54,50,20); air_trans_label=new QLabel(air_trans_edit,tr("Forced Segue:"),this); air_trans_label->setGeometry(790,54,100,20); - air_trans_label->setAlignment(AlignRight|AlignVCenter); + air_trans_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); air_trans_unit=new QLabel(air_trans_edit,tr("msecs"),this); air_trans_unit->setGeometry(950,54,40,20); - air_trans_unit->setAlignment(AlignLeft|AlignVCenter); + air_trans_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Pie Countdown Length @@ -488,10 +491,10 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_piecount_box->setRange(0,60); air_piecount_label=new QLabel(air_piecount_box,tr("Pie Counts Last:"),this); air_piecount_label->setGeometry(785,76,105,20); - air_piecount_label->setAlignment(AlignRight|AlignVCenter); + air_piecount_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); air_piecount_unit=new QLabel(tr("secs"),this); air_piecount_unit->setGeometry(950,76,40,20); - air_piecount_unit->setAlignment(AlignLeft|AlignVCenter); + air_piecount_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Pie Countdown To @@ -500,7 +503,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_countto_box->setGeometry(895,98,100,20); air_countto_label=new QLabel(air_countto_box,tr("Pie Counts To:"),this); air_countto_label->setGeometry(785,98,105,20); - air_countto_label->setAlignment(AlignRight|AlignVCenter); + air_countto_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); air_countto_box->insertItem(tr("Cart End")); air_countto_box->insertItem(tr("Transition")); @@ -511,7 +514,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_default_transtype_box->setGeometry(895,120,100,20); label=new QLabel(air_default_transtype_box,tr("Default Trans. Type:"),this); label->setGeometry(760,120,130,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); air_default_transtype_box->insertItem(tr("Play")); air_default_transtype_box->insertItem(tr("Segue")); air_default_transtype_box->insertItem(tr("Stop")); @@ -523,7 +526,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_defaultsvc_box->setGeometry(895,142,100,20); label=new QLabel(air_defaultsvc_box,tr("Default Service:"),this); label->setGeometry(760,142,130,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Sound Panel Section @@ -541,7 +544,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_station_box->setSpecialValueText(tr("None")); air_station_label=new QLabel(air_station_box,tr("System Panels:"),this); air_station_label->setGeometry(750,204,140,20); - air_station_label->setAlignment(AlignRight|AlignVCenter); + air_station_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // # of User Panels @@ -552,7 +555,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_user_box->setSpecialValueText(tr("None")); air_user_label=new QLabel(air_user_box,tr("User Panels:"),this); air_user_label->setGeometry(750,226,140,20); - air_user_label->setAlignment(AlignRight|AlignVCenter); + air_user_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Flash Active Button @@ -561,7 +564,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_flash_box->setGeometry(810,254,15,15); label=new QLabel(air_flash_box,tr("Flash Active Buttons"),this); label->setGeometry(830,254,150,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Pause Panel Button @@ -570,7 +573,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_panel_pause_box->setGeometry(810,276,15,15); label=new QLabel(air_panel_pause_box,tr("Enable Button Pausing"),this); label->setGeometry(830,276,150,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Label Template @@ -579,7 +582,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_label_template_edit->setGeometry(895,298,sizeHint().width()-910,20); label=new QLabel(air_label_template_edit,tr("Label Template:"),this); label->setGeometry(790,298,100,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Miscellaneous Section @@ -595,7 +598,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_timesync_box->setGeometry(810,356,15,15); air_timesync_label=new QLabel(air_timesync_box,tr("Check TimeSync"),this); air_timesync_label->setGeometry(830,356,100,15); - air_timesync_label->setAlignment(AlignLeft|AlignVCenter); + air_timesync_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Show Log Buttons @@ -604,13 +607,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_auxlog_box[0]->setGeometry(810,378,15,15); label=new QLabel(air_auxlog_box[0],tr("Show Auxlog 1 Button"),this); label->setGeometry(830,378,150,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); air_auxlog_box[1]=new QCheckBox(this); air_auxlog_box[1]->setGeometry(810,400,15,15); label=new QLabel(air_auxlog_box[1],tr("Show Auxlog 2 Button"),this); label->setGeometry(830,400,150,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Clear Cart Filter @@ -619,7 +622,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_clearfilter_box->setGeometry(810,422,15,15); label=new QLabel(air_clearfilter_box,tr("Clear Cart Search Filter"),this); label->setGeometry(830,422,150,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Pause Enable Checkbox @@ -628,7 +631,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_pause_box->setGeometry(810,444,15,15); label=new QLabel(air_pause_box,tr("Enable Paused Events"),this); label->setGeometry(830,444,150,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Show Extra Counters/Buttons @@ -638,7 +641,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, label= new QLabel(air_show_counters_box,tr("Show Extra Buttons/Counters"),this); label->setGeometry(830,466,170,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Show Hour Selector @@ -647,7 +650,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_hour_selector_box->setGeometry(810,488,15,15); label=new QLabel(air_hour_selector_box,tr("Show Hour Selector"),this); label->setGeometry(830,488,170,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Audition Preroll @@ -658,15 +661,15 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_audition_preroll_label= new QLabel(air_audition_preroll_spin,tr("Audition Preroll:"),this); air_audition_preroll_label->setGeometry(800,510,90,15); - air_audition_preroll_label->setAlignment(AlignRight|AlignVCenter); + air_audition_preroll_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); air_audition_preroll_unit=new QLabel(tr("secs"),this); air_audition_preroll_unit->setGeometry(945,510,100,15); - air_audition_preroll_unit->setAlignment(AlignLeft|AlignVCenter); + air_audition_preroll_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Space Bar Action // - air_bar_group=new QButtonGroup(1,Qt::Vertical,tr("Space Bar Action"),this); + air_bar_group=new Q3ButtonGroup(1,Qt::Vertical,tr("Space Bar Action"),this); air_bar_group->setGeometry(805,532,sizeHint().width()-815,55); new QRadioButton(tr("None"),air_bar_group); new QRadioButton(tr("Start Next"),air_bar_group); @@ -687,7 +690,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_exitpasswd_edit->setText("******"); label=new QLabel(air_exitpasswd_edit,tr("Exit Password:"),this); label->setGeometry(0,474,95,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(air_exitpasswd_edit,SIGNAL(textChanged(const QString &)), this,SLOT(exitPasswordChangedData(const QString &))); @@ -716,7 +719,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_startmode_box->insertItem(tr("load specified log")); label=new QLabel(air_exitpasswd_edit,tr("At Startup:"),this); label->setGeometry(30,524,65,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(air_startmode_box,SIGNAL(activated(int)), this,SLOT(startModeChangedData(int))); @@ -729,7 +732,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, new QLabel(air_autorestart_box, tr("Restart Log After Unclean Shutdown"),this); air_autorestart_label->setGeometry(125,549,250,15); - air_autorestart_label->setAlignment(AlignLeft|AlignVCenter); + air_autorestart_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Startup Log @@ -738,7 +741,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_startlog_edit->setGeometry(100,569,240,20); air_startlog_label=new QLabel(air_startlog_edit,tr("Log:"),this); air_startlog_label->setGeometry(30,569,65,20); - air_startlog_label->setAlignment(AlignRight|AlignVCenter); + air_startlog_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Log Select Button @@ -763,7 +766,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_skin_edit->setGeometry(555,403,180,20); label=new QLabel(air_skin_edit,tr("Background Image:"),this); label->setGeometry(435,403,115,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(tr("Select"),this); button->setGeometry(745,400,50,25); connect(button,SIGNAL(clicked()),this,SLOT(selectSkinData())); @@ -775,7 +778,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_title_template_edit->setGeometry(555,425,180,20); label=new QLabel(air_label_template_edit,tr("Title Template:"),this); label->setGeometry(430,425,120,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Artist Template @@ -784,7 +787,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_artist_template_edit->setGeometry(555,447,180,20); label=new QLabel(air_label_template_edit,tr("Artist Template:"),this); label->setGeometry(430,447,120,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Outcue Template @@ -793,7 +796,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_outcue_template_edit->setGeometry(555,469,180,20); label=new QLabel(air_label_template_edit,tr("Outcue Template:"),this); label->setGeometry(430,469,120,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Description Template @@ -802,7 +805,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_description_template_edit->setGeometry(555,491,180,20); label=new QLabel(air_label_template_edit,tr("Description Template:"),this); label->setGeometry(430,491,120,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Log Mode Control Section @@ -820,7 +823,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, this,SLOT(modeControlActivatedData(int))); label=new QLabel(air_modecontrol_box,tr("Mode Control Style:"),this); label->setGeometry(435,550,120,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); air_modecontrol_box->insertItem(tr("Unified")); air_modecontrol_box->insertItem(tr("Independent")); @@ -834,7 +837,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, this,SLOT(logStartupModeActivatedData(int))); air_logstartmode_label[i]=new QLabel(air_logstartmode_box[i],"",this); air_logstartmode_label[i]->setGeometry(470,572+i*22,140,20); - air_logstartmode_label[i]->setAlignment(AlignRight|AlignVCenter); + air_logstartmode_label[i]->setAlignment(Qt::AlignRight|Qt::AlignVCenter); air_logstartmode_box[i]->insertItem(tr("Previous")); air_logstartmode_box[i]->insertItem(tr("LiveAssist")); air_logstartmode_box[i]->insertItem(tr("Automatic")); @@ -1146,7 +1149,7 @@ void EditRDAirPlay::editHotKeys() void EditRDAirPlay::selectSkinData() { QString filename=air_skin_edit->text(); - filename=QFileDialog::getOpenFileName(filename,RD_IMAGE_FILE_FILTER,this,"", + filename=Q3FileDialog::getOpenFileName(filename,RD_IMAGE_FILE_FILTER,this,"", tr("Select Image File")); if(!filename.isNull()) { air_skin_edit->setText(filename); @@ -1283,7 +1286,7 @@ void EditRDAirPlay::cancelData() void EditRDAirPlay::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(black); + p->setPen(Qt::black); p->drawRect(25,485,395,95); p->end(); delete p; diff --git a/rdadmin/edit_rdairplay.h b/rdadmin/edit_rdairplay.h index 70ef72e2..7975a3bc 100644 --- a/rdadmin/edit_rdairplay.h +++ b/rdadmin/edit_rdairplay.h @@ -26,10 +26,12 @@ #include #include #include -#include +#include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -112,7 +114,7 @@ class EditRDAirPlay : public QDialog QSpinBox *air_aux2_box; QCheckBox *air_auxlog_box[2]; QCheckBox *air_clearfilter_box; - QButtonGroup *air_bar_group; + Q3ButtonGroup *air_bar_group; QCheckBox *air_flash_box; QCheckBox *air_panel_pause_box; QCheckBox *air_show_counters_box; diff --git a/rdadmin/edit_rdlibrary.cpp b/rdadmin/edit_rdlibrary.cpp index 93ec4b63..c6a110f3 100644 --- a/rdadmin/edit_rdlibrary.cpp +++ b/rdadmin/edit_rdlibrary.cpp @@ -23,14 +23,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -78,7 +78,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *label=new QLabel(lib_input_card,tr("INPUT"),this); label->setGeometry(10,10,110,19); label->setFont(big_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Output Configuration @@ -88,7 +88,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, label=new QLabel(lib_output_card,tr("OUTPUT"),this); label->setGeometry(170,10,110,19); label->setFont(big_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Settings @@ -96,17 +96,17 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *setting_label=new QLabel(tr("Settings"),this); setting_label->setGeometry(25,79,120,19); setting_label->setFont(big_font); - setting_label->setAlignment(AlignRight|ShowPrefix); + setting_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Maximum Record Length // - lib_maxlength_time=new QTimeEdit(this); + lib_maxlength_time=new Q3TimeEdit(this); lib_maxlength_time->setGeometry(160,100,85,19); QLabel *lib_maxlength_label= new QLabel(lib_maxlength_time,tr("&Max Record Time:"),this); lib_maxlength_label->setGeometry(25,101,130,19); - lib_maxlength_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_maxlength_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // VOX threshold @@ -118,10 +118,10 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_vox_spin_label= new QLabel(lib_vox_spin,tr("&VOX Threshold:"),this); lib_vox_spin_label->setGeometry(25,122,130,19); - lib_vox_spin_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_vox_spin_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); QLabel *lib_vox_spin_unit=new QLabel(tr("dbFS"),this); lib_vox_spin_unit->setGeometry(205,122,120,19); - lib_vox_spin_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + lib_vox_spin_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // AutoTrim threshold @@ -133,10 +133,10 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_trim_spin_label= new QLabel(lib_trim_spin,tr("&AutoTrim Threshold:"),this); lib_trim_spin_label->setGeometry(25,144,130,19); - lib_trim_spin_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_trim_spin_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); QLabel *lib_trim_spin_unit=new QLabel(tr("dbFS"),this); lib_trim_spin_unit->setGeometry(205,144,120,19); - lib_trim_spin_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + lib_trim_spin_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Tail Preroll @@ -149,10 +149,10 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_preroll_spin_label= new QLabel(lib_preroll_spin,tr("&Tail Preroll:"),this); lib_preroll_spin_label->setGeometry(25,166,130,19); - lib_preroll_spin_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_preroll_spin_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); QLabel *lib_preroll_spin_unit=new QLabel(tr("milliseconds"),this); lib_preroll_spin_unit->setGeometry(215,166,120,19); - lib_preroll_spin_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + lib_preroll_spin_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ripper Device @@ -163,7 +163,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_ripdev_label= new QLabel(lib_ripdev_edit,tr("&Ripper Device:"),this); lib_ripdev_label->setGeometry(25,188,130,19); - lib_ripdev_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_ripdev_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Paranoia Level @@ -173,7 +173,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_paranoia_label= new QLabel(lib_paranoia_box,tr("&Paranoia Level:"),this); lib_paranoia_label->setGeometry(25,210,130,19); - lib_paranoia_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_paranoia_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Read ISRC @@ -183,7 +183,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_isrc_label= new QLabel(lib_isrc_box,tr("&Read ISRCs from CD:"),this); lib_isrc_label->setGeometry(25,232,130,19); - lib_isrc_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_isrc_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // FreeDB Server @@ -193,7 +193,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, lib_cddb_edit->setValidator(validator); QLabel *lib_cddb_label=new QLabel(lib_cddb_edit,tr("&FreeDB Server:"),this); lib_cddb_label->setGeometry(25,254,130,19); - lib_cddb_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_cddb_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Format @@ -204,7 +204,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_format_label=new QLabel(lib_format_box,tr("&Format:"),this); lib_format_label->setGeometry(25,278,130,19); - lib_format_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_format_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Bitrate @@ -213,7 +213,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, lib_bitrate_box->setGeometry(160,302,130,19); QLabel *lib_bitrate_label=new QLabel(lib_bitrate_box,tr("&Bitrate:"),this); lib_bitrate_label->setGeometry(25,302,130,19); - lib_bitrate_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Enable Editor @@ -225,7 +225,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_editor_label= new QLabel(lib_editor_box,tr("Allow E&xternal Editing:"),this); lib_editor_label->setGeometry(25,326,130,19); - lib_editor_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_editor_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Sample Rate Converter @@ -239,7 +239,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_converter_label= new QLabel(lib_converter_box,tr("Sample Rate Converter:"),this); lib_converter_label->setGeometry(10,350,145,19); - lib_converter_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_converter_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Limit Searches at Startup @@ -252,7 +252,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_limit_search_label= new QLabel(lib_limit_search_box,tr("Limit Searches at Startup")+":",this); lib_limit_search_label->setGeometry(10,374,145,19); - lib_limit_search_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_limit_search_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Defaults @@ -260,7 +260,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *default_label=new QLabel(tr("Defaults"),this); default_label->setGeometry(25,408,120,19); default_label->setFont(big_font); - default_label->setAlignment(AlignRight|ShowPrefix); + default_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Default Channels @@ -269,7 +269,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, lib_channels_box->setGeometry(160,430,60,19); QLabel *lib_channels_label=new QLabel(lib_channels_box,tr("&Channels:"),this); lib_channels_label->setGeometry(25,430,130,19); - lib_channels_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Default Record Mode @@ -278,7 +278,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, lib_recmode_box->setGeometry(160,454,100,19); QLabel *lib_recmode_label=new QLabel(lib_recmode_box,tr("Record Mode:"),this); lib_recmode_label->setGeometry(25,454,130,19); - lib_recmode_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_recmode_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Default Trim State @@ -288,7 +288,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_trimstate_label= new QLabel(lib_trimstate_box,tr("AutoTrim:"),this); lib_trimstate_label->setGeometry(25,478,130,19); - lib_trimstate_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_trimstate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Normalization Level @@ -300,10 +300,10 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QLabel *lib_riplevel_spin_label= new QLabel(lib_riplevel_spin,tr("Normalization Level:"),this); lib_riplevel_spin_label->setGeometry(25,502,130,19); - lib_riplevel_spin_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_riplevel_spin_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); QLabel *lib_riplevel_spin_unit=new QLabel(tr("dbFS"),this); lib_riplevel_spin_unit->setGeometry(205,502,120,19); - lib_riplevel_spin_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + lib_riplevel_spin_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/rdadmin/edit_rdlibrary.h b/rdadmin/edit_rdlibrary.h index a27ea17f..3bdbf18d 100644 --- a/rdadmin/edit_rdlibrary.h +++ b/rdadmin/edit_rdlibrary.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -60,7 +60,7 @@ class EditRDLibrary : public QDialog QSpinBox *lib_vox_spin; QSpinBox *lib_trim_spin; QSpinBox *lib_preroll_spin; - QTimeEdit *lib_maxlength_time; + Q3TimeEdit *lib_maxlength_time; QLineEdit *lib_ripdev_edit; QComboBox *lib_paranoia_box; QComboBox *lib_isrc_box; diff --git a/rdadmin/edit_rdlogedit.cpp b/rdadmin/edit_rdlogedit.cpp index ad08b5c7..58490088 100644 --- a/rdadmin/edit_rdlogedit.cpp +++ b/rdadmin/edit_rdlogedit.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -75,7 +75,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, QLabel *label=new QLabel(lib_input_card,tr("INPUT"),this); label->setGeometry(10,10,110,19); label->setFont(big_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Output Configuration @@ -85,7 +85,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, label=new QLabel(lib_output_card,tr("OUTPUT"),this); label->setGeometry(170,10,110,19); label->setFont(big_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Settings @@ -93,17 +93,17 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, QLabel *setting_label=new QLabel(tr("Voice Tracker Settings"),this); setting_label->setGeometry(70,79,sizeHint().width()-80,19); setting_label->setFont(big_font); - setting_label->setAlignment(AlignLeft|ShowPrefix); + setting_label->setAlignment(Qt::AlignLeft); // // Maximum Record Length // - lib_maxlength_time=new QTimeEdit(this); + lib_maxlength_time=new Q3TimeEdit(this); lib_maxlength_time->setGeometry(160,100,85,19); QLabel *lib_maxlength_label= new QLabel(lib_maxlength_time,tr("&Max Record Time:"),this); lib_maxlength_label->setGeometry(25,101,130,19); - lib_maxlength_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_maxlength_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Autotrim Level @@ -114,10 +114,10 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, lib_threshold_spin->setMaxValue(0); label=new QLabel(lib_threshold_spin,tr("&AutoTrim Threshold:"),this); label->setGeometry(25,124,130,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label=new QLabel(tr("dbFS"),this); label->setGeometry(215,124,120,19); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Normalization Level @@ -128,10 +128,10 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, lib_normalization_spin->setMaxValue(0); label=new QLabel(lib_normalization_spin,tr("&Normalization Level:"),this); label->setGeometry(25,148,130,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label=new QLabel(tr("dbFS"),this); label->setGeometry(215,148,120,19); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Audio Margin @@ -144,10 +144,10 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, QLabel *lib_preroll_spin_label= new QLabel(lib_preroll_spin,tr("&Audio Margin:"),this); lib_preroll_spin_label->setGeometry(25,172,130,19); - lib_preroll_spin_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_preroll_spin_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QLabel *lib_preroll_spin_unit=new QLabel(tr("milliseconds"),this); lib_preroll_spin_unit->setGeometry(225,172,120,19); - lib_preroll_spin_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + lib_preroll_spin_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Format @@ -157,7 +157,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, connect(lib_format_box,SIGNAL(activated(int)),this,SLOT(formatData(int))); QLabel *lib_format_label=new QLabel(lib_format_box,tr("&Format:"),this); lib_format_label->setGeometry(25,196,130,19); - lib_format_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_format_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Bitrate @@ -166,7 +166,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, lib_bitrate_box->setGeometry(160,220,130,19); QLabel *lib_bitrate_label=new QLabel(lib_bitrate_box,tr("&Bitrate:"),this); lib_bitrate_label->setGeometry(25,220,130,19); - lib_bitrate_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_bitrate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Enable Second Start Button @@ -179,7 +179,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, new QLabel(lib_enable_second_start_box,tr("Enable &2nd Start Button:"),this); lib_enable_second_start_label->setGeometry(10,244,145,19); lib_enable_second_start_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Validator @@ -196,7 +196,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, QLabel *lib_startcart_label= new QLabel(lib_startcart_edit,tr("Play &Start Cart:"),this); lib_startcart_label->setGeometry(25,268,130,19); - lib_startcart_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_startcart_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QPushButton *button=new QPushButton(this); button->setGeometry(240,266,55,23); button->setText(tr("Select")); @@ -211,7 +211,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, QLabel *lib_endcart_label= new QLabel(lib_endcart_edit,tr("Play &End Cart:"),this); lib_endcart_label->setGeometry(25,292,130,19); - lib_endcart_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_endcart_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(this); button->setGeometry(240,290,55,23); button->setText(tr("Select")); @@ -226,7 +226,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, QLabel *lib_recstartcart_label= new QLabel(lib_recstartcart_edit,tr("&Record Start Cart:"),this); lib_recstartcart_label->setGeometry(25,316,130,19); - lib_recstartcart_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_recstartcart_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(this); button->setGeometry(240,314,55,23); button->setText(tr("Select")); @@ -241,7 +241,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, QLabel *lib_recendcart_label= new QLabel(lib_recendcart_edit,tr("Re&cord End Cart:"),this); lib_recendcart_label->setGeometry(25,340,130,19); - lib_recendcart_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_recendcart_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(this); button->setGeometry(240,338,55,23); button->setText(tr("Select")); @@ -254,7 +254,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, lib_channels_box->setGeometry(160,364,60,19); QLabel *lib_channels_label=new QLabel(lib_channels_box,tr("&Channels:"),this); lib_channels_label->setGeometry(25,364,130,19); - lib_channels_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + lib_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Default Transition Type @@ -265,7 +265,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, new QLabel(lib_default_transtype_box,tr("Default Transition:"),this); lib_default_transtype_label->setGeometry(20,388,130,19); lib_default_transtype_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); lib_default_transtype_box->insertItem(tr("Play")); lib_default_transtype_box->insertItem(tr("Segue")); lib_default_transtype_box->insertItem(tr("Stop")); diff --git a/rdadmin/edit_rdlogedit.h b/rdadmin/edit_rdlogedit.h index 95e7396b..84ed1739 100644 --- a/rdadmin/edit_rdlogedit.h +++ b/rdadmin/edit_rdlogedit.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -63,7 +63,7 @@ class EditRDLogedit : public QDialog QSpinBox *lib_preroll_spin; QSpinBox *lib_threshold_spin; QSpinBox *lib_normalization_spin; - QTimeEdit *lib_maxlength_time; + Q3TimeEdit *lib_maxlength_time; QLineEdit *lib_startcart_edit; QLineEdit *lib_endcart_edit; QLineEdit *lib_recstartcart_edit; diff --git a/rdadmin/edit_rdpanel.cpp b/rdadmin/edit_rdpanel.cpp index 23199678..0732fce5 100644 --- a/rdadmin/edit_rdpanel.cpp +++ b/rdadmin/edit_rdpanel.cpp @@ -22,15 +22,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -99,13 +101,13 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_start_rml_edit[0]->setValidator(validator); label=new QLabel(air_start_rml_edit[0],tr("Start RML:"),this); label->setGeometry(135,50,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[0]=new QLineEdit(this); air_stop_rml_edit[0]->setGeometry(205,71,160,19); air_stop_rml_edit[0]->setValidator(validator); label=new QLabel(air_start_rml_edit[0],tr("Stop RML:"),this); label->setGeometry(135,71,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Sound Panel Second Play Output @@ -120,13 +122,13 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_start_rml_edit[1]->setValidator(validator); label=new QLabel(air_start_rml_edit[1],tr("Start RML:"),this); label->setGeometry(135,118,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[1]=new QLineEdit(this); air_stop_rml_edit[1]->setGeometry(205,139,160,19); air_stop_rml_edit[1]->setValidator(validator); label=new QLabel(air_start_rml_edit[1],tr("Stop RML:"),this); label->setGeometry(135,139,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Sound Panel Third Play Output @@ -141,13 +143,13 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_start_rml_edit[2]->setValidator(validator); label=new QLabel(air_start_rml_edit[2],tr("Start RML:"),this); label->setGeometry(135,186,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[2]=new QLineEdit(this); air_stop_rml_edit[2]->setGeometry(205,207,160,19); air_stop_rml_edit[2]->setValidator(validator); label=new QLabel(air_start_rml_edit[2],tr("Stop RML:"),this); label->setGeometry(135,207,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Sound Panel Fourth Play Output @@ -162,13 +164,13 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_start_rml_edit[3]->setValidator(validator); label=new QLabel(air_start_rml_edit[3],tr("Start RML:"),this); label->setGeometry(135,254,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[3]=new QLineEdit(this); air_stop_rml_edit[3]->setGeometry(205,275,160,19); air_stop_rml_edit[3]->setValidator(validator); label=new QLabel(air_start_rml_edit[3],tr("Stop RML:"),this); label->setGeometry(135,275,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Sound Panel Fifth Play Output @@ -183,13 +185,13 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_start_rml_edit[4]->setValidator(validator); label=new QLabel(air_start_rml_edit[4],tr("Start RML:"),this); label->setGeometry(135,322,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[4]=new QLineEdit(this); air_stop_rml_edit[4]->setGeometry(205,343,160,19); air_stop_rml_edit[4]->setValidator(validator); label=new QLabel(air_start_rml_edit[4],tr("Stop RML:"),this); label->setGeometry(135,343,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Sound Panel Cue Play Output @@ -204,13 +206,13 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_start_rml_edit[5]->setValidator(validator); label=new QLabel(air_start_rml_edit[5],tr("Start RML:"),this); label->setGeometry(135,390,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); air_stop_rml_edit[5]=new QLineEdit(this); air_stop_rml_edit[5]->setGeometry(205,411,160,19); air_stop_rml_edit[5]->setValidator(validator); label=new QLabel(air_start_rml_edit[5],tr("Stop RML:"),this); label->setGeometry(135,411,65,19); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Display Settings Section @@ -226,7 +228,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_skin_edit->setGeometry(135,460,180,20); label=new QLabel(air_skin_edit,tr("Background Image:"),this); label->setGeometry(10,460,115,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QPushButton *button=new QPushButton(tr("Select"),this); button->setGeometry(320,458,50,25); connect(button,SIGNAL(clicked()),this,SLOT(selectSkinData())); @@ -248,7 +250,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_station_box->setSpecialValueText(tr("None")); air_station_label=new QLabel(air_station_box,tr("Host Panels:"),this); air_station_label->setGeometry(405,35,100,20); - air_station_label->setAlignment(AlignRight|AlignVCenter); + air_station_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // # of User Panels @@ -259,7 +261,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_user_box->setSpecialValueText(tr("None")); air_user_label=new QLabel(air_user_box,tr("User Panels:"),this); air_user_label->setGeometry(405,57,100,20); - air_user_label->setAlignment(AlignRight|AlignVCenter); + air_user_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Flash Active Button @@ -268,7 +270,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_flash_box->setGeometry(435,85,15,15); label=new QLabel(air_flash_box,tr("Flash Active Buttons"),this); label->setGeometry(455,85,150,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Pause Panel Button @@ -277,7 +279,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_panel_pause_box->setGeometry(435,107,15,15); label=new QLabel(air_panel_pause_box,tr("Enable Button Pausing"),this); label->setGeometry(455,107,150,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Clear Cart Filter @@ -286,7 +288,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_clearfilter_box->setGeometry(435,129,15,15); label=new QLabel(air_clearfilter_box,tr("Clear Cart Search Filter"),this); label->setGeometry(455,129,150,15); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Default Service @@ -295,7 +297,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_defaultsvc_box->setGeometry(520,151,100,20); label=new QLabel(air_defaultsvc_box,tr("Default Service:"),this); label->setGeometry(385,151,130,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Label Template @@ -304,7 +306,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_label_template_edit->setGeometry(520,173,sizeHint().width()-530,20); label=new QLabel(air_label_template_edit,tr("Label Template:"),this); label->setGeometry(415,173,100,20); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button @@ -430,7 +432,7 @@ QSizePolicy EditRDPanel::sizePolicy() const void EditRDPanel::selectSkinData() { QString filename=air_skin_edit->text(); - filename=QFileDialog::getOpenFileName(filename,RD_IMAGE_FILE_FILTER,this,"", + filename=Q3FileDialog::getOpenFileName(filename,RD_IMAGE_FILE_FILTER,this,"", tr("Select Image File")); if(!filename.isNull()) { air_skin_edit->setText(filename); diff --git a/rdadmin/edit_rdpanel.h b/rdadmin/edit_rdpanel.h index 711a5981..b5b7d234 100644 --- a/rdadmin/edit_rdpanel.h +++ b/rdadmin/edit_rdpanel.h @@ -26,10 +26,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/rdadmin/edit_replicator.cpp b/rdadmin/edit_replicator.cpp index 40da713a..a700b288 100644 --- a/rdadmin/edit_replicator.cpp +++ b/rdadmin/edit_replicator.cpp @@ -26,7 +26,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -72,7 +74,7 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) QLabel *repl_name_label=new QLabel(repl_name_edit,tr("Name:"),this); repl_name_label->setGeometry(10,11,90,19); repl_name_label->setFont(font); - repl_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + repl_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Replicator Description @@ -84,7 +86,7 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) new QLabel(repl_description_edit,tr("Description:"),this); repl_description_label->setGeometry(10,33,90,19); repl_description_label->setFont(font); - repl_description_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + repl_description_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Replicator Type @@ -100,7 +102,7 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) QLabel *repl_type_label=new QLabel(repl_type_box,tr("Type:"),this); repl_type_label->setGeometry(10,55,90,19); repl_type_label->setFont(font); - repl_type_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + repl_type_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Host System @@ -120,7 +122,7 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) new QLabel(repl_station_box,tr("Host System:"),this); repl_station_label->setGeometry(10,77,140,19); repl_station_label->setFont(font); - repl_station_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + repl_station_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Upload Audio URL @@ -131,7 +133,7 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) repl_url_label=new QLabel(repl_url_edit,tr("Audio Upload URL:"),this); repl_url_label->setGeometry(20,99,130,19); repl_url_label->setFont(font); - repl_url_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + repl_url_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Upload Username @@ -142,7 +144,7 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) repl_username_label=new QLabel(repl_username_edit,tr("Username:"),this); repl_username_label->setGeometry(40,121,180,19); repl_username_label->setFont(font); - repl_username_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + repl_username_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Upload Password @@ -154,7 +156,7 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) repl_password_label=new QLabel(repl_password_edit,tr("Password:"),this); repl_password_label->setGeometry(320,121,70,19); repl_password_label->setFont(font); - repl_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + repl_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Audio Format @@ -165,7 +167,7 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) repl_format_label=new QLabel(repl_format_edit,tr("Upload Format:"),this); repl_format_label->setGeometry(5,143,145,20); repl_format_label->setFont(font); - repl_format_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + repl_format_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); repl_format_button=new QPushButton(this); repl_format_button->setGeometry(450,142,40,24); repl_format_button->setFont(small_font); @@ -182,7 +184,7 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) new QLabel(repl_normalize_box,tr("Normalize"),this); repl_normalize_check_label->setGeometry(175,165,83,20); repl_normalize_check_label->setFont(font); - repl_normalize_check_label->setAlignment(AlignLeft|AlignVCenter); + repl_normalize_check_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(repl_normalize_box,SIGNAL(toggled(bool)), this,SLOT(normalizeCheckData(bool))); @@ -195,11 +197,11 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) repl_normalize_label=new QLabel(repl_normalize_spin,tr("Level:"),this); repl_normalize_label->setGeometry(245,165,45,20); repl_normalize_label->setFont(font); - repl_normalize_label->setAlignment(AlignRight|AlignVCenter); + repl_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); repl_normalize_unit_label=new QLabel(tr("dBFS"),this); repl_normalize_unit_label->setGeometry(340,165,40,20); repl_normalize_unit_label->setFont(font); - repl_normalize_unit_label->setAlignment(AlignLeft|AlignVCenter); + repl_normalize_unit_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Groups Selector diff --git a/rdadmin/edit_replicator.h b/rdadmin/edit_replicator.h index 1bc739e1..40ed11f9 100644 --- a/rdadmin/edit_replicator.h +++ b/rdadmin/edit_replicator.h @@ -23,7 +23,7 @@ #define EDIT_REPLICATOR_H #include -#include +#include #include #include #include diff --git a/rdadmin/edit_report.cpp b/rdadmin/edit_report.cpp index 4972fbc7..f8c69e53 100644 --- a/rdadmin/edit_report.cpp +++ b/rdadmin/edit_report.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -85,7 +85,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) new QLabel(edit_description_edit,tr("&Report Description:"),this); label->setGeometry(10,10,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Export Filter Type @@ -99,7 +99,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_description_edit,tr("Export &Filter:"),this); label->setGeometry(10,31,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Station ID @@ -111,7 +111,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_stationid_edit,tr("Station ID:"),this); label->setGeometry(10,52,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Cart Number Parameters @@ -119,7 +119,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(tr("Cart Number Parameters:"),this); label->setGeometry(10,73,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_cartzeros_box=new QCheckBox(this); edit_cartzeros_box->setGeometry(170,75,15,15); @@ -128,7 +128,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_cartzeros_box,tr("Use Leading Zeros"),this); label->setGeometry(187,73,120,19); label->setFont(check_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_cartdigits_spin=new QSpinBox(this); edit_cartdigits_spin->setGeometry(350,73,40,19); @@ -136,7 +136,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) edit_cartdigits_label=new QLabel(edit_cartdigits_spin,tr("Digits:"),this); edit_cartdigits_label->setGeometry(300,73,45,19); edit_cartdigits_label->setFont(check_font); - edit_cartdigits_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_cartdigits_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Station Type @@ -150,7 +150,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_stationtype_box,tr("Station Type:"),this); label->setGeometry(10,94,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Lines Per Page @@ -161,7 +161,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_linesperpage_spin,tr("Lines per Page:"),this); label->setGeometry(255,94,100,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_linesperpage_spin->hide(); label->hide(); @@ -174,7 +174,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_servicename_edit,tr("Ser&vice Name:"),this); label->setGeometry(10,115,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Station Format @@ -185,7 +185,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_stationformat_edit,tr("Station &Format:"),this); label->setGeometry(10,136,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Linux Export Path @@ -197,7 +197,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_path_edit,tr("Linux Export Path:"),this); label->setGeometry(10,157,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Linux Post Export Command @@ -208,7 +208,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_path_edit,tr("Linux Post Export Cmd:"),this); label->setGeometry(10,178,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Windows Export Path @@ -219,7 +219,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_winpath_edit,tr("Windows Export Path:"),this); label->setGeometry(10,199,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Windows Post Export Command @@ -230,7 +230,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_path_edit,tr("Windows Post Export Cmd:"),this); label->setGeometry(10,219,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Type Selectors @@ -238,28 +238,28 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(tr("Export Event Types:"),this); label->setGeometry(10,240,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_traffic_box=new QCheckBox(this); edit_traffic_box->setGeometry(170,242,15,15); edit_traffic_label=new QLabel(tr("Traffic"),this); edit_traffic_label->setGeometry(187,241,80,19); edit_traffic_label->setFont(check_font); - edit_traffic_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + edit_traffic_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_music_box=new QCheckBox(this); edit_music_box->setGeometry(270,243,15,15); edit_music_label=new QLabel(tr("Music"),this); edit_music_label->setGeometry(287,241,80,19); edit_music_label->setFont(check_font); - edit_music_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + edit_music_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_generic_box=new QCheckBox(this); edit_generic_box->setGeometry(370,243,15,15); label=new QLabel(tr("All"),this); label->setGeometry(387,241,80,19); label->setFont(check_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(edit_generic_box,SIGNAL(toggled(bool)), this,SLOT(genericEventsToggledData(bool))); @@ -269,21 +269,21 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(tr("Export Events From:"),this); label->setGeometry(10,262,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_forcetraffic_box=new QCheckBox(this); edit_forcetraffic_box->setGeometry(170,264,15,15); label=new QLabel(tr("Traffic Log"),this); label->setGeometry(187,262,80,19); label->setFont(check_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_forcemusic_box=new QCheckBox(this); edit_forcemusic_box->setGeometry(270,264,15,15); label=new QLabel(tr("Music Log"),this); label->setGeometry(287,262,80,19); label->setFont(check_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Include Only On Air Events @@ -295,7 +295,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_onairflag_box,tr("Include Only OnAir Events:"),this); label->setGeometry(10,283,155,19); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Daypart Filter @@ -306,21 +306,21 @@ EditReport::EditReport(QString rptname,QWidget *parent) new QLabel(edit_daypart_check,tr("Filter by Daypart"),this); edit_daypart_label->setGeometry(edit_daypart_check->geometry().x()+20,313,155,19); edit_daypart_label->setFont(font); - edit_daypart_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + edit_daypart_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); - edit_starttime_edit=new QTimeEdit(this); + edit_starttime_edit=new Q3TimeEdit(this); edit_starttime_edit->setGeometry(150,334,80,20); edit_starttime_label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); edit_starttime_label->setGeometry(65,334,80,20); edit_starttime_label->setFont(font); - edit_starttime_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_starttime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit_endtime_edit=new QTimeEdit(this); + edit_endtime_edit=new Q3TimeEdit(this); edit_endtime_edit->setGeometry(335,334,80,20); edit_endtime_label=new QLabel(edit_endtime_edit,tr("End Time:"),this); edit_endtime_label->setGeometry(250,334,80,20); edit_endtime_label->setFont(font); - edit_endtime_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_endtime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_daypart_check,SIGNAL(toggled(bool)), edit_starttime_label,SLOT(setEnabled(bool))); @@ -369,7 +369,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) label=new QLabel(edit_group_box,tr("Filter by Groups"),this); label->setGeometry(edit_group_box->geometry().x()+20,573,155,19); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(edit_group_box,SIGNAL(toggled(bool)), edit_group_sel,SLOT(setEnabled(bool))); diff --git a/rdadmin/edit_report.h b/rdadmin/edit_report.h index a50a8bca..52f34ec9 100644 --- a/rdadmin/edit_report.h +++ b/rdadmin/edit_report.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include @@ -80,9 +80,9 @@ class EditReport : public QDialog QCheckBox *edit_daypart_check; QLabel *edit_daypart_label; QLabel *edit_starttime_label; - QTimeEdit *edit_starttime_edit; + Q3TimeEdit *edit_starttime_edit; QLabel *edit_endtime_label; - QTimeEdit *edit_endtime_edit; + Q3TimeEdit *edit_endtime_edit; }; diff --git a/rdadmin/edit_sas_resource.cpp b/rdadmin/edit_sas_resource.cpp index 35873238..db3dc233 100644 --- a/rdadmin/edit_sas_resource.cpp +++ b/rdadmin/edit_sas_resource.cpp @@ -19,6 +19,8 @@ // #include +//Added by qt3to4: +#include #include @@ -57,7 +59,7 @@ EditSasResource::EditSasResource(int *enginenum,int *devicenum,int *relaynum, QLabel *label=new QLabel(edit_enginenum_edit,tr("Console Number: "),this); label->setGeometry(10,10,120,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Source Number @@ -67,7 +69,7 @@ EditSasResource::EditSasResource(int *enginenum,int *devicenum,int *relaynum, label=new QLabel(edit_devicenum_edit,tr("Source Number: "),this); label->setGeometry(10,36,120,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Opto/Relay Number @@ -78,7 +80,7 @@ EditSasResource::EditSasResource(int *enginenum,int *devicenum,int *relaynum, new QLabel(edit_relaynum_edit,tr("Opto/Relay Number: "),this); edit_relaynum_label->setGeometry(10,62,120,20); edit_relaynum_label->setFont(bold_font); - edit_relaynum_label->setAlignment(AlignRight|AlignVCenter); + edit_relaynum_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button diff --git a/rdadmin/edit_schedcodes.cpp b/rdadmin/edit_schedcodes.cpp index 98589e8f..9c359cd0 100644 --- a/rdadmin/edit_schedcodes.cpp +++ b/rdadmin/edit_schedcodes.cpp @@ -22,11 +22,13 @@ #include #include #include -#include +#include #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -76,7 +78,7 @@ EditSchedCode::EditSchedCode(QString schedCode,QString description, new QLabel(schedCode_name_edit,tr("Scheduler Code:"),this); schedCode_name_label->setGeometry(10,11,110,19); schedCode_name_label->setFont(font); - schedCode_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + schedCode_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Code Description @@ -89,7 +91,7 @@ EditSchedCode::EditSchedCode(QString schedCode,QString description, new QLabel(schedCode_description_edit,tr("Code Description:"),this); schedCode_description_label->setGeometry(10,32,110,19); schedCode_description_label->setFont(font); - schedCode_description_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + schedCode_description_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button diff --git a/rdadmin/edit_schedcodes.h b/rdadmin/edit_schedcodes.h index 4f022255..505731d0 100644 --- a/rdadmin/edit_schedcodes.h +++ b/rdadmin/edit_schedcodes.h @@ -22,7 +22,7 @@ #define EDIT_SCHEDCODES_H #include -#include +#include #include #include #include diff --git a/rdadmin/edit_settings.cpp b/rdadmin/edit_settings.cpp index 31d95cb4..13c16e0b 100644 --- a/rdadmin/edit_settings.cpp +++ b/rdadmin/edit_settings.cpp @@ -22,12 +22,14 @@ #include #include #include -#include +#include #include #include -#include +#include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -79,11 +81,11 @@ EditSettings::EditSettings(QWidget *parent) QLabel *label=new QLabel(edit_sample_rate_box,tr("System Sample Rate:"),this); label->setGeometry(10,10,185,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); label=new QLabel(tr("samples/second"),this); label->setGeometry(275,10,sizeHint().width()-285,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Allow Duplicate Cart Titles Box @@ -96,7 +98,7 @@ EditSettings::EditSettings(QWidget *parent) new QLabel(edit_duplicate_carts_box,tr("Allow Duplicate Cart Titles"),this); label->setGeometry(40,30,sizeHint().width()-50,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); edit_fix_duplicate_carts_box=new QCheckBox(this); edit_fix_duplicate_carts_box->setGeometry(30,52,15,15); @@ -105,7 +107,7 @@ EditSettings::EditSettings(QWidget *parent) edit_fix_duplicate_carts_label->setGeometry(50,50,sizeHint().width()-60,20); edit_fix_duplicate_carts_label->setFont(font); edit_fix_duplicate_carts_label-> - setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // ISCI Cross Reference Path @@ -115,7 +117,7 @@ EditSettings::EditSettings(QWidget *parent) label=new QLabel(edit_isci_path_edit,tr("ISCI Cross Reference Path:"),this); label->setGeometry(10,76,185,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Notification Address @@ -125,7 +127,7 @@ EditSettings::EditSettings(QWidget *parent) label=new QLabel(edit_notification_address_edit,tr("Mcast Address for Notifications"),this); label->setGeometry(10,98,185,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Maximum POST Size @@ -136,11 +138,11 @@ EditSettings::EditSettings(QWidget *parent) label=new QLabel(edit_maxpost_spin,tr("Maximum Remote Post Length:"),this); label->setGeometry(10,120,185,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); label=new QLabel(tr("Mbytes"),this); label->setGeometry(265,120,60,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Temporary Cart Group @@ -156,7 +158,7 @@ EditSettings::EditSettings(QWidget *parent) label=new QLabel(edit_temp_cart_group_box,tr("Temporary Cart Group:"),this); label->setGeometry(10,141,185,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Show User List @@ -169,7 +171,7 @@ EditSettings::EditSettings(QWidget *parent) new QLabel(edit_show_user_list_box,tr("Show User List in RDLogin"),this); label->setGeometry(40,163,sizeHint().width()-50,20); label->setFont(font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Duplicate List (initially hidden) @@ -180,14 +182,14 @@ EditSettings::EditSettings(QWidget *parent) edit_duplicate_label->setGeometry(15,186,sizeHint().width()-30,50); edit_duplicate_label->setFont(normal_font); edit_duplicate_label->hide(); - edit_duplicate_list=new QListView(this); + edit_duplicate_list=new Q3ListView(this); edit_duplicate_list->setGeometry(10,209,sizeHint().width()-20,200); edit_duplicate_list->setItemMargin(5); edit_duplicate_list->setAllColumnsShowFocus(true); edit_duplicate_list->addColumn(tr("CART")); - edit_duplicate_list->setColumnAlignment(0,AlignCenter); + edit_duplicate_list->setColumnAlignment(0,Qt::AlignCenter); edit_duplicate_list->addColumn(tr("TITLE")); - edit_duplicate_list->setColumnAlignment(1,AlignLeft); + edit_duplicate_list->setColumnAlignment(1,Qt::AlignLeft); edit_duplicate_list->hide(); edit_save_button=new QPushButton(this); edit_save_button-> @@ -271,7 +273,7 @@ void EditSettings::duplicatesCheckedData(bool state) void EditSettings::saveData() { QString filename=RDGetHomeDir(); - filename=QFileDialog::getSaveFileName(filename,"Text Files *.txt",this); + filename=Q3FileDialog::getSaveFileName(filename,"Text Files *.txt",this); if(filename.isNull()) { return; } @@ -300,7 +302,7 @@ void EditSettings::saveData() fprintf(f,"\n"); fprintf(f,"Cart Title\n"); fprintf(f,"---- -----\n"); - QListViewItem *item=edit_duplicate_list->firstChild(); + Q3ListViewItem *item=edit_duplicate_list->firstChild(); while(item!=NULL) { fprintf(f,"%s %s\n",(const char *)item->text(0), (const char *)item->text(1)); @@ -320,7 +322,7 @@ void EditSettings::okData() if(edit_duplicate_carts_box->isChecked()!= edit_system->allowDuplicateCartTitles()) { QLabel *msg=new QLabel(this); - QProgressDialog *pd=new QProgressDialog(this); + Q3ProgressDialog *pd=new Q3ProgressDialog(this); pd->setLabel(msg); pd->setCancelButton(NULL); pd->setMinimumDuration(2); @@ -354,7 +356,7 @@ void EditSettings::okData() delete q; pd->reset(); if(dups.size()>0) { - QListViewItem *item; + Q3ListViewItem *item; y_pos=305; setMinimumWidth(sizeHint().width()); setMaximumWidth(sizeHint().width()); @@ -372,7 +374,7 @@ void EditSettings::okData() setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); for(std::map::const_iterator ci=dups.begin(); ci!=dups.end();ci++) { - item=new QListViewItem(edit_duplicate_list); + item=new Q3ListViewItem(edit_duplicate_list); item->setText(0,QString().sprintf("%06u",ci->first)); item->setText(1,ci->second); } diff --git a/rdadmin/edit_settings.h b/rdadmin/edit_settings.h index e1036824..50c0da82 100644 --- a/rdadmin/edit_settings.h +++ b/rdadmin/edit_settings.h @@ -25,11 +25,13 @@ #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include #include #include @@ -61,7 +63,7 @@ class EditSettings : public QDialog QLineEdit *edit_isci_path_edit; QComboBox *edit_temp_cart_group_box; QCheckBox *edit_show_user_list_box; - QListView *edit_duplicate_list; + Q3ListView *edit_duplicate_list; QLineEdit *edit_notification_address_edit; QPushButton *edit_settings_button; QPushButton *edit_save_button; diff --git a/rdadmin/edit_station.cpp b/rdadmin/edit_station.cpp index 60a37ae9..bdf56c44 100644 --- a/rdadmin/edit_station.cpp +++ b/rdadmin/edit_station.cpp @@ -20,14 +20,18 @@ #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -99,7 +103,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_name_edit->setReadOnly(true); station_name_label=new QLabel(station_name_edit,tr("Ho&st Name:"),this); station_name_label->setFont(font); - station_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Station Short Name @@ -109,7 +113,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_short_name_label= new QLabel(station_short_name_edit,tr("Short Name:"),this); station_short_name_label->setFont(font); - station_short_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_short_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Station Description @@ -120,7 +124,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_description_label= new QLabel(station_description_edit,tr("&Description:"),this); station_description_label->setFont(font); - station_description_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_description_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Station Default Name @@ -130,7 +134,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_default_name_label= new QLabel(station_default_name_edit,tr("Default &User:"),this); station_default_name_label->setFont(font); - station_default_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_default_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Station IP Address @@ -141,7 +145,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_address_label= new QLabel(station_address_edit,tr("&IP Address:"),this); station_address_label->setFont(font); - station_address_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_address_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Station Editor Command @@ -151,7 +155,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_editor_cmd_label= new QLabel(station_editor_cmd_edit,tr("Editor &Command:"),this); station_editor_cmd_label->setFont(font); - station_editor_cmd_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_editor_cmd_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Station Time Offset @@ -162,7 +166,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_timeoffset_label= new QLabel(station_timeoffset_box,tr("&Time Offset:"),this); station_timeoffset_label->setFont(font); - station_timeoffset_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_timeoffset_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Startup Cart @@ -173,7 +177,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_startup_cart_label= new QLabel(station_startup_cart_edit,tr("&Startup Cart:"),this); station_startup_cart_label->setFont(font); - station_startup_cart_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_startup_cart_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); station_startup_select_button=new QPushButton(tr("Select"),this); station_startup_select_button->setFont(small_font); @@ -187,7 +191,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_cue_sel_label= new QLabel(station_cue_sel,tr("Cue &Output:"),this); station_cue_sel_label->setFont(font); - station_cue_sel_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_cue_sel_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); station_start_cart_edit=new QLineEdit(this); station_start_cart_edit->setValidator(macro_validator); @@ -218,7 +222,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_heartbeat_label= new QLabel(station_heartbeat_box,tr("Enable Heartbeat"),this); station_heartbeat_label->setFont(font); - station_heartbeat_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + station_heartbeat_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(station_heartbeat_box,SIGNAL(toggled(bool)), this,SLOT(heartbeatToggledData(bool))); @@ -229,7 +233,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_filter_label= new QLabel(station_filter_box,tr("Use Realtime Filtering"),this); station_filter_label->setFont(font); - station_filter_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + station_filter_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Heartbeat Cart @@ -238,7 +242,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_hbcart_edit->setValidator(macro_validator); station_hbcart_label=new QLabel(station_hbcart_edit,tr("Cart:"),this); station_hbcart_label->setFont(font); - station_hbcart_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_hbcart_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); station_hbcart_button=new QPushButton(this); station_hbcart_button->setFont(font); station_hbcart_button->setText(tr("Select")); @@ -253,10 +257,10 @@ EditStation::EditStation(QString sname,QWidget *parent) station_hbinterval_label= new QLabel(station_hbinterval_spin,tr("Interval:"),this); station_hbinterval_label->setFont(font); - station_hbinterval_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_hbinterval_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); station_hbinterval_unit=new QLabel(tr("secs"),this); station_hbinterval_unit->setFont(font); - station_hbinterval_unit->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + station_hbinterval_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // System Maintenance Checkbox @@ -265,7 +269,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_maint_label= new QLabel(station_maint_box,tr("Include in System Maintenance Pool"),this); station_maint_label->setFont(font); - station_maint_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + station_maint_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Enable Drag & Drop Checkbox @@ -273,7 +277,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_dragdrop_box=new QCheckBox(this); station_dragdrop_label=new QLabel(station_dragdrop_box,tr("Enable Drag && Drop"),this); station_dragdrop_label->setFont(font); - station_dragdrop_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + station_dragdrop_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Enforce Panel Setup Checkbox @@ -283,7 +287,7 @@ EditStation::EditStation(QString sname,QWidget *parent) new QLabel(station_panel_enforce_box, tr("Allow Drops on Panels not in Setup Mode"),this); station_panel_enforce_label->setFont(font); - station_panel_enforce_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + station_panel_enforce_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(station_dragdrop_box,SIGNAL(toggled(bool)), station_panel_enforce_label,SLOT(setEnabled(bool))); connect(station_dragdrop_box,SIGNAL(toggled(bool)), @@ -294,7 +298,7 @@ EditStation::EditStation(QString sname,QWidget *parent) // station_systemservices_label=new QLabel(tr("System Services"),this); station_systemservices_label->setFont(font); - station_systemservices_label->setAlignment(AlignCenter|ShowPrefix); + station_systemservices_label->setAlignment(Qt::AlignCenter); // // HTTP Service Host @@ -304,7 +308,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_http_station_label= new QLabel(station_http_station_box,tr("HTTP Xport:"),this); station_http_station_label->setFont(font); - station_http_station_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_http_station_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // CAE Service Host @@ -316,7 +320,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_cae_station_label= new QLabel(station_cae_station_box,tr("Core Audio Engine:"),this); station_cae_station_label->setFont(font); - station_cae_station_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + station_cae_station_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // RDLibrary Configuration Button @@ -886,17 +890,16 @@ void EditStation::stopCartClickedData() void EditStation::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(black); - p->setBrush(black); + p->setPen(Qt::black); + p->setBrush(Qt::black); // // System Services // - p->moveTo(10,343); - p->lineTo(size().width()-10,343); - p->lineTo(size().width()-10,401); - p->lineTo(10,401); - p->lineTo(10,343); + p->drawLine(10,343,size().width()-10,343); + p->drawLine(size().width()-10,343,size().width()-10,401); + p->drawLine(size().width()-10,401,10,401); + p->drawLine(10,401,10,343); delete p; } @@ -1007,7 +1010,7 @@ void EditStation::resizeEvent(QResizeEvent *e) QString EditStation::DisplayPart(QString string) { - for(unsigned i=0;i -#include -#include +#include +#include #include #include #include @@ -32,6 +32,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include diff --git a/rdadmin/edit_svc.cpp b/rdadmin/edit_svc.cpp index a17bbf0d..ebc5db2c 100644 --- a/rdadmin/edit_svc.cpp +++ b/rdadmin/edit_svc.cpp @@ -21,14 +21,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -85,7 +85,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) QLabel *label=new QLabel("General",this); label->setGeometry(10,10,120,24); label->setFont(section_font); - label->setAlignment(AlignLeft); + label->setAlignment(Qt::AlignLeft); // // Service Name @@ -96,7 +96,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_name_edit->setReadOnly(true); label=new QLabel(svc_name_edit,tr("&Service Name:"),this); label->setGeometry(10,33,170,19); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); // // Service Description @@ -107,7 +107,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_description_edit->setValidator(validator); label=new QLabel(svc_description_edit,tr("Service &Description:"),this); label->setGeometry(10,54,170,19); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); // // Service Program Code @@ -118,7 +118,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_program_code_edit->setValidator(validator); label=new QLabel(svc_program_code_edit,tr("&Program Code:"),this); label->setGeometry(10,73,170,19); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); // // Log Name Template @@ -129,7 +129,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_name_template_edit->setValidator(log_validator); label=new QLabel(svc_name_template_edit,tr("Log Name &Template:"),this); label->setGeometry(10,94,170,19); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); // // Log Description Template @@ -140,7 +140,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) label=new QLabel(svc_description_template_edit, tr("Log &Description Template:"),this); label->setGeometry(10,115,170,19); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); // // Voicetracking Group @@ -150,7 +150,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_voice_group_box->insertItem(tr("[none]")); label=new QLabel(svc_voice_group_box,tr("Voicetrack Group:"),this); label->setGeometry(10,136,170,19); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); // // Autospot Group @@ -160,7 +160,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_autospot_group_box->insertItem(tr("[none]")); label=new QLabel(svc_autospot_group_box,tr("AutoSpot Group:"),this); label->setGeometry(10,157,170,19); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); // // Chain Log @@ -169,7 +169,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_chain_box->setGeometry(30,180,15,15); label=new QLabel(svc_chain_box,tr("Insert CHAIN TO at log end"),this); label->setGeometry(50,180,170,19); - label->setAlignment(AlignLeft|ShowPrefix); + label->setAlignment(Qt::AlignLeft); // // Default Auto Refresh @@ -179,7 +179,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) label= new QLabel(svc_autorefresh_box,tr("Enable AutoRefresh By Default"),this); label->setGeometry(250,180,200,19); - label->setAlignment(AlignLeft|ShowPrefix); + label->setAlignment(Qt::AlignLeft); // // Autofill Button @@ -197,7 +197,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_loglife_box->setGeometry(460,95,15,15); label=new QLabel(svc_loglife_box,tr("Set Logs to auto-delete"),this); label->setGeometry(480,95,240,19); - label->setAlignment(AlignLeft|ShowPrefix); + label->setAlignment(Qt::AlignLeft); svc_loglife_spin=new QSpinBox(this); svc_loglife_spin->setGeometry(625,93,50,19); svc_loglife_spin->setRange(0,365); @@ -205,7 +205,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_loglife_spin,SLOT(setEnabled(bool))); svc_loglifeorigin_label=new QLabel(svc_loglife_box,tr("days after"),this); svc_loglifeorigin_label->setGeometry(685,95,100,19); - svc_loglifeorigin_label->setAlignment(AlignLeft|ShowPrefix); + svc_loglifeorigin_label->setAlignment(Qt::AlignLeft); connect(svc_loglife_box,SIGNAL(toggled(bool)), svc_loglifeorigin_label,SLOT(setEnabled(bool))); svc_loglifeorigin_box=new QComboBox(this); @@ -222,7 +222,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_shelflife_box->setGeometry(460,117,15,15); label=new QLabel(svc_shelflife_box,tr("Purge ELR Data"),this); label->setGeometry(480,117,170,19); - label->setAlignment(AlignLeft|ShowPrefix); + label->setAlignment(Qt::AlignLeft); svc_shelflife_spin=new QSpinBox(this); svc_shelflife_spin->setGeometry(580,115,50,19); svc_shelflife_spin->setRange(0,365); @@ -230,7 +230,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_shelflife_spin,SLOT(setEnabled(bool))); label=new QLabel(svc_shelflife_box,tr("days after airing"),this); label->setGeometry(640,117,200,19); - label->setAlignment(AlignLeft|ShowPrefix); + label->setAlignment(Qt::AlignLeft); // // Enable Hosts Button @@ -247,7 +247,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) label=new QLabel(tr("Traffic Data Import"),this); label->setGeometry(10,213,160,24); label->setFont(section_font); - label->setAlignment(AlignLeft); + label->setAlignment(Qt::AlignLeft); // // Linux Traffic Import Path @@ -258,7 +258,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_tfc_path_edit->setValidator(validator); label=new QLabel(svc_tfc_path_edit,tr("Linux Import Path:"),this); label->setGeometry(10,234,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_path_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -271,7 +271,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) label= new QLabel(svc_tfc_preimport_cmd_edit,tr("Linux Preimport Command:"),this); label->setGeometry(10,255,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_preimport_cmd_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -283,7 +283,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_tfc_win_path_edit->setMaxLength(255); label=new QLabel(svc_tfc_win_path_edit,tr("Windows Import Path:"),this); label->setGeometry(10,276,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_win_path_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -295,7 +295,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) label=new QLabel(svc_tfc_win_preimport_cmd_edit, tr("Windows Preimport Command:"),this); label->setGeometry(10,297,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_win_preimport_cmd_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -307,7 +307,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_tfc_label_cart_edit->setMaxLength(32); label=new QLabel(svc_tfc_label_cart_edit,tr("Note Cart String:"),this); label->setGeometry(10,318,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_label_cart_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -319,7 +319,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_tfc_track_edit->setMaxLength(32); label=new QLabel(svc_tfc_track_edit,tr("Insert Voice Track String:"),this); label->setGeometry(10,339,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_track_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -330,7 +330,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_tfc_import_template_box->setGeometry(185,360,240,19); label=new QLabel(svc_tfc_import_template_box,tr("Import Template:"),this); label->setGeometry(10,360,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_tfc_import_template_box,SIGNAL(activated(int)), this,SLOT(tfcTemplateActivatedData(int))); @@ -356,7 +356,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) label=new QLabel(tr("Music Data Import"),this); label->setGeometry(445,213,160,24); label->setFont(section_font); - label->setAlignment(AlignLeft); + label->setAlignment(Qt::AlignLeft); // // Linux Music Import Path @@ -367,7 +367,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_mus_path_edit->setValidator(validator); label=new QLabel(svc_mus_path_edit,tr("Linux Import Path:"),this); label->setGeometry(450,234,165,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_path_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -380,7 +380,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) label= new QLabel(svc_mus_preimport_cmd_edit,tr("Linux Preimport Command:"),this); label->setGeometry(450,255,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_preimport_cmd_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -392,7 +392,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_mus_win_path_edit->setMaxLength(255); label=new QLabel(svc_mus_win_path_edit,tr("Windows Import Path:"),this); label->setGeometry(450,276,165,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_win_path_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -404,7 +404,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) label=new QLabel(svc_mus_win_preimport_cmd_edit, tr("Windows Preimport Command:"),this); label->setGeometry(450,297,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_win_preimport_cmd_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -416,7 +416,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_mus_label_cart_edit->setMaxLength(32); label=new QLabel(svc_mus_label_cart_edit,tr("Note Cart String:"),this); label->setGeometry(450,318,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_label_cart_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -428,7 +428,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_mus_track_edit->setMaxLength(255); label=new QLabel(svc_mus_track_edit,tr("Insert Voice Track String:"),this); label->setGeometry(450,339,165,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_track_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -440,7 +440,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_mus_break_edit->setMaxLength(255); label=new QLabel(svc_mus_break_edit,tr("Insert Traffic Break String:"),this); label->setGeometry(450,360,165,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_break_edit,SIGNAL(textChanged(const QString &)), this,SLOT(textChangedData(const QString &))); @@ -451,7 +451,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_mus_import_template_box->setGeometry(620,381,240,19); label=new QLabel(svc_mus_import_template_box,tr("Import Template:"),this); label->setGeometry(450,381,170,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(svc_mus_import_template_box,SIGNAL(activated(int)), this,SLOT(musTemplateActivatedData(int))); diff --git a/rdadmin/edit_ttys.cpp b/rdadmin/edit_ttys.cpp index eb1026d7..8f2f3d74 100644 --- a/rdadmin/edit_ttys.cpp +++ b/rdadmin/edit_ttys.cpp @@ -20,12 +20,14 @@ #include #include -#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -74,7 +76,7 @@ EditTtys::EditTtys(QString station,QWidget *parent) QLabel *label=new QLabel(edit_port_box,tr("Port ID:"),this); label->setGeometry(10,14,60,22); label->setFont(font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); // // Enable Button @@ -86,7 +88,7 @@ EditTtys::EditTtys(QString station,QWidget *parent) label=new QLabel(edit_enable_button,tr("Enabled"),this); label->setGeometry(200,14,60,22); label->setFont(font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); // // The TTY Port @@ -97,7 +99,7 @@ EditTtys::EditTtys(QString station,QWidget *parent) edit_port_label=new QLabel(edit_port_edit,tr("TTY Device:"),this); edit_port_label->setGeometry(20,56,120,22); edit_port_label->setFont(font); - edit_port_label->setAlignment(AlignRight); + edit_port_label->setAlignment(Qt::AlignRight); // // Baudrate Selector @@ -108,7 +110,7 @@ EditTtys::EditTtys(QString station,QWidget *parent) edit_baudrate_label=new QLabel(edit_baudrate_box,tr("Baud Rate:"),this); edit_baudrate_label->setGeometry(20,84,120,22); edit_baudrate_label->setFont(font); - edit_baudrate_label->setAlignment(AlignRight); + edit_baudrate_label->setAlignment(Qt::AlignRight); // // Parity Selector @@ -119,7 +121,7 @@ EditTtys::EditTtys(QString station,QWidget *parent) edit_parity_label=new QLabel(edit_parity_box,tr("Parity:"),this); edit_parity_label->setGeometry(20,110,120,22); edit_parity_label->setFont(font); - edit_parity_label->setAlignment(AlignRight); + edit_parity_label->setAlignment(Qt::AlignRight); // // Data Bits Selector @@ -130,7 +132,7 @@ EditTtys::EditTtys(QString station,QWidget *parent) edit_databits_label=new QLabel(edit_databits_box,tr("Data Bits:"),this); edit_databits_label->setGeometry(20,138,120,22); edit_databits_label->setFont(font); - edit_databits_label->setAlignment(AlignRight); + edit_databits_label->setAlignment(Qt::AlignRight); // // Stop Bits Selector @@ -141,7 +143,7 @@ EditTtys::EditTtys(QString station,QWidget *parent) edit_stopbits_label=new QLabel(edit_stopbits_box,tr("Stop Bits:"),this); edit_stopbits_label->setGeometry(20,166,120,22); edit_stopbits_label->setFont(font); - edit_stopbits_label->setAlignment(AlignRight); + edit_stopbits_label->setAlignment(Qt::AlignRight); // // Termination Character Selector @@ -153,7 +155,7 @@ EditTtys::EditTtys(QString station,QWidget *parent) new QLabel(edit_termination_box,tr("Terminator:"),this); edit_termination_label->setGeometry(20,194,120,22); edit_termination_label->setFont(font); - edit_termination_label->setAlignment(AlignRight); + edit_termination_label->setAlignment(Qt::AlignRight); // // Close Button diff --git a/rdadmin/edit_user.cpp b/rdadmin/edit_user.cpp index d383a7f1..7148530c 100644 --- a/rdadmin/edit_user.cpp +++ b/rdadmin/edit_user.cpp @@ -22,13 +22,15 @@ #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include //#include #include @@ -79,7 +81,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) QLabel *user_name_label=new QLabel(user_name_edit,tr("&User Name:"),this); user_name_label->setGeometry(5,11,110,19); user_name_label->setFont(font); - user_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + user_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Full Name @@ -92,7 +94,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_full_name_edit,tr("&Full Name:"),this); user_full_name_label->setGeometry(10,32,105,19); user_full_name_label->setFont(font); - user_full_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + user_full_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // User Description @@ -105,7 +107,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_description_edit,tr("&Description:"),this); user_description_label->setGeometry(5,53,110,19); user_description_label->setFont(font); - user_description_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + user_description_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // User Phone @@ -117,7 +119,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) QLabel *user_phone_label=new QLabel(user_phone_edit,tr("&Phone:"),this); user_phone_label->setGeometry(10,75,105,19); user_phone_label->setFont(font); - user_phone_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + user_phone_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Local Authentication @@ -130,7 +132,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) tr("Authenticate This User Locally"),this); user_localauth_label->setGeometry(40,97,180,19); user_localauth_label->setFont(font); - user_localauth_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + user_localauth_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // PAM Service @@ -142,7 +144,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_pamservice_edit,tr("PAM Service")+":",this); user_pamservice_label->setGeometry(10,119,105,19); user_pamservice_label->setFont(font); - user_pamservice_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + user_pamservice_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Change Password Button @@ -164,7 +166,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_webapi_auth_spin,tr("WebAPI Timeout:"),this); user_webapi_auth_label->setGeometry(10,141,105,19); user_webapi_auth_label->setFont(font); - user_webapi_auth_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + user_webapi_auth_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); /* // @@ -175,12 +177,12 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_web_label=new QLabel(user_web_box,tr("Allow RDCastManager Web Logins"),this); user_web_label->setGeometry(40,162,sizeHint().width()-50,19); user_web_label->setFont(font); - user_web_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + user_web_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); */ // // Administrative Group Priviledges // - user_admin_group=new QButtonGroup(tr("Administrative Rights"),this); + user_admin_group=new Q3ButtonGroup(tr("Administrative Rights"),this); user_admin_group->setGeometry(10,170,355,45); user_admin_group->setFont(font); @@ -194,12 +196,12 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_admin_config_label->setGeometry(192,21,150,19); user_admin_config_label->setGeometry(30,21,150,19); user_admin_config_label->setFont(small_font); - user_admin_config_label->setAlignment(AlignLeft|ShowPrefix); + user_admin_config_label->setAlignment(Qt::AlignLeft); // // Production Group Priviledges // - user_prod_group=new QButtonGroup(tr("Production Rights"),this); + user_prod_group=new Q3ButtonGroup(tr("Production Rights"),this); user_prod_group->setGeometry(10,225,355,106); user_prod_group->setFont(font); @@ -209,7 +211,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_create_carts_button,tr("&Create Carts"),user_prod_group); user_create_carts_label->setGeometry(30,21,150,19); user_create_carts_label->setFont(small_font); - user_create_carts_label->setAlignment(AlignLeft|ShowPrefix); + user_create_carts_label->setAlignment(Qt::AlignLeft); user_delete_carts_button=new QCheckBox(user_prod_group); user_delete_carts_button->setGeometry(172,21,15,15); @@ -217,7 +219,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_delete_carts_button,tr("&Delete Carts"),user_prod_group); user_delete_carts_label->setGeometry(192,21,150,19); user_delete_carts_label->setFont(small_font); - user_delete_carts_label->setAlignment(AlignLeft|ShowPrefix); + user_delete_carts_label->setAlignment(Qt::AlignLeft); user_modify_carts_button=new QCheckBox(user_prod_group); user_modify_carts_button->setGeometry(10,42,15,15); @@ -225,7 +227,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_modify_carts_button,tr("&Modify Carts"),user_prod_group); user_modify_carts_label->setGeometry(30,41,150,19); user_modify_carts_label->setFont(small_font); - user_modify_carts_label->setAlignment(AlignLeft|ShowPrefix); + user_modify_carts_label->setAlignment(Qt::AlignLeft); user_edit_audio_button=new QCheckBox(user_prod_group); user_edit_audio_button->setGeometry(10,63,15,15); @@ -233,7 +235,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_edit_audio_button,tr("&Edit Audio"),user_prod_group); user_edit_audio_label->setGeometry(30,62,150,19); user_edit_audio_label->setFont(small_font); - user_edit_audio_label->setAlignment(AlignLeft|ShowPrefix); + user_edit_audio_label->setAlignment(Qt::AlignLeft); user_webget_login_button=new QCheckBox(user_prod_group); user_webget_login_button->setGeometry(10,84,15,15); @@ -242,7 +244,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_prod_group); user_webget_login_label->setGeometry(30,83,150,19); user_webget_login_label->setFont(small_font); - user_webget_login_label->setAlignment(AlignLeft|ShowPrefix); + user_webget_login_label->setAlignment(Qt::AlignLeft); user_edit_catches_button=new QCheckBox(user_prod_group); user_edit_catches_button->setGeometry(172,42,15,15); @@ -251,7 +253,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_prod_group); user_edit_catches_label->setGeometry(192,41,150,19); user_edit_catches_label->setFont(small_font); - user_edit_catches_label->setAlignment(AlignLeft|ShowPrefix); + user_edit_catches_label->setAlignment(Qt::AlignLeft); user_voicetrack_log_button=new QCheckBox(user_prod_group); user_voicetrack_log_button->setGeometry(172,63,15,15); @@ -260,12 +262,12 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_prod_group); user_voicetrack_log_label->setGeometry(192,62,150,19); user_voicetrack_log_label->setFont(small_font); - user_voicetrack_log_label->setAlignment(AlignLeft|ShowPrefix); + user_voicetrack_log_label->setAlignment(Qt::AlignLeft); // // Traffic Group Priviledges // - user_traffic_group=new QButtonGroup(tr("Traffic Rights"),this); + user_traffic_group=new Q3ButtonGroup(tr("Traffic Rights"),this); user_traffic_group->setGeometry(10,341,355,66); user_traffic_group->setFont(font); @@ -275,7 +277,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_create_log_button,tr("Create &Log"),user_traffic_group); user_create_log_label->setGeometry(30,21,150,19); user_create_log_label->setFont(small_font); - user_create_log_label->setAlignment(AlignLeft|ShowPrefix); + user_create_log_label->setAlignment(Qt::AlignLeft); user_delete_log_button=new QCheckBox(user_traffic_group); user_delete_log_button->setGeometry(172,21,15,15); @@ -283,7 +285,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_delete_log_button,tr("De&lete Log"),user_traffic_group); user_delete_log_label->setGeometry(192,21,150,19); user_delete_log_label->setFont(small_font); - user_delete_log_label->setAlignment(AlignLeft|ShowPrefix); + user_delete_log_label->setAlignment(Qt::AlignLeft); user_delete_rec_button=new QCheckBox(user_traffic_group); user_delete_rec_button->setGeometry(172,42,15,15); @@ -292,7 +294,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_traffic_group); user_delete_rec_label->setGeometry(192,42,150,19); user_delete_rec_label->setFont(small_font); - user_delete_rec_label->setAlignment(AlignLeft|ShowPrefix); + user_delete_rec_label->setAlignment(Qt::AlignLeft); user_modify_template_button=new QCheckBox(user_traffic_group); user_modify_template_button->setGeometry(10,42,15,15); @@ -301,12 +303,12 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_traffic_group); user_modify_template_label->setGeometry(30,42,100,19); user_modify_template_label->setFont(small_font); - user_modify_template_label->setAlignment(AlignLeft|ShowPrefix); + user_modify_template_label->setAlignment(Qt::AlignLeft); // // OnAir Group Priviledges // - user_onair_group=new QButtonGroup(tr("OnAir Rights"),this); + user_onair_group=new Q3ButtonGroup(tr("OnAir Rights"),this); user_onair_group->setGeometry(10,417,355,85); user_onair_group->setFont(font); @@ -316,7 +318,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_playout_log_button,tr("&Playout Logs"),user_onair_group); user_playout_log_label->setGeometry(30,21,150,19); user_playout_log_label->setFont(small_font); - user_playout_log_label->setAlignment(AlignLeft|ShowPrefix); + user_playout_log_label->setAlignment(Qt::AlignLeft); user_arrange_log_button=new QCheckBox(user_onair_group); user_arrange_log_button->setGeometry(172,21,15,15); @@ -325,7 +327,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_onair_group); user_arrange_log_label->setGeometry(192,21,150,19); user_arrange_log_label->setFont(small_font); - user_arrange_log_label->setAlignment(AlignLeft|ShowPrefix); + user_arrange_log_label->setAlignment(Qt::AlignLeft); user_addto_log_button=new QCheckBox(user_onair_group); user_addto_log_button->setGeometry(10,42,15,15); @@ -333,7 +335,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_addto_log_button,tr("Add Log &Items"),user_onair_group); user_addto_log_label->setGeometry(30,42,150,19); user_addto_log_label->setFont(small_font); - user_addto_log_label->setAlignment(AlignLeft|ShowPrefix); + user_addto_log_label->setAlignment(Qt::AlignLeft); user_removefrom_log_button=new QCheckBox(user_onair_group); user_removefrom_log_button->setGeometry(172,42,15,15); @@ -342,7 +344,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_onair_group); user_removefrom_log_label->setGeometry(192,42,150,19); user_removefrom_log_label->setFont(small_font); - user_removefrom_log_label->setAlignment(AlignLeft|ShowPrefix); + user_removefrom_log_label->setAlignment(Qt::AlignLeft); user_config_panels_button=new QCheckBox(user_onair_group); user_config_panels_button->setGeometry(10,63,15,15); @@ -351,12 +353,12 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_onair_group); user_config_panels_label->setGeometry(30,63,150,19); user_config_panels_label->setFont(small_font); - user_config_panels_label->setAlignment(AlignLeft|ShowPrefix); + user_config_panels_label->setAlignment(Qt::AlignLeft); // // Podcast Group Priviledges // - user_podcast_group=new QButtonGroup(tr("Podcasting Rights"),this); + user_podcast_group=new Q3ButtonGroup(tr("Podcasting Rights"),this); user_podcast_group->setGeometry(10,512,355,66); user_podcast_group->setFont(font); @@ -367,7 +369,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_podcast_group); user_add_podcast_label->setGeometry(30,21,150,19); user_add_podcast_label->setFont(small_font); - user_add_podcast_label->setAlignment(AlignLeft|ShowPrefix); + user_add_podcast_label->setAlignment(Qt::AlignLeft); user_edit_podcast_button=new QCheckBox(user_podcast_group); user_edit_podcast_button->setGeometry(172,21,15,15); @@ -375,7 +377,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) new QLabel(user_edit_podcast_button,tr("E&dit Podcast"),user_podcast_group); user_edit_podcast_label->setGeometry(192,21,150,19); user_edit_podcast_label->setFont(small_font); - user_edit_podcast_label->setAlignment(AlignLeft|ShowPrefix); + user_edit_podcast_label->setAlignment(Qt::AlignLeft); user_delete_podcast_button=new QCheckBox(user_podcast_group); user_delete_podcast_button->setGeometry(10,42,15,15); @@ -384,7 +386,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_podcast_group); user_delete_podcast_label->setGeometry(30,42,150,19); user_delete_podcast_label->setFont(small_font); - user_delete_podcast_label->setAlignment(AlignLeft|ShowPrefix); + user_delete_podcast_label->setAlignment(Qt::AlignLeft); user_web_box=new QCheckBox(user_podcast_group); user_web_box->setGeometry(172,42,15,15); @@ -392,7 +394,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) user_podcast_group); user_web_label->setGeometry(192,42,150,19); user_web_label->setFont(small_font); - user_web_label->setAlignment(AlignLeft|ShowPrefix); + user_web_label->setAlignment(Qt::AlignLeft); // // Group Permissions Button diff --git a/rdadmin/edit_user.h b/rdadmin/edit_user.h index d8ad9b7c..a022b8b9 100644 --- a/rdadmin/edit_user.h +++ b/rdadmin/edit_user.h @@ -21,9 +21,10 @@ #ifndef EDIT_USER_H #define EDIT_USER_H +#include #include -#include -#include +#include +#include #include #include #include @@ -66,11 +67,11 @@ class EditUser : public QDialog QSpinBox *user_webapi_auth_spin; QCheckBox *user_web_box; QLabel *user_web_label; - QButtonGroup *user_admin_group; - QButtonGroup *user_prod_group; - QButtonGroup *user_traffic_group; - QButtonGroup *user_onair_group; - QButtonGroup *user_podcast_group; + Q3ButtonGroup *user_admin_group; + Q3ButtonGroup *user_prod_group; + Q3ButtonGroup *user_traffic_group; + Q3ButtonGroup *user_onair_group; + Q3ButtonGroup *user_podcast_group; QCheckBox *user_admin_config_button; QCheckBox *user_create_carts_button; QCheckBox *user_delete_carts_button; diff --git a/rdadmin/edit_vguest_resource.cpp b/rdadmin/edit_vguest_resource.cpp index 00f5ba6b..659fc121 100644 --- a/rdadmin/edit_vguest_resource.cpp +++ b/rdadmin/edit_vguest_resource.cpp @@ -19,6 +19,8 @@ // #include +//Added by qt3to4: +#include #include @@ -61,7 +63,7 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, QLabel *label=new QLabel(edit_enginenum_edit,tr("Engine (Hex): "),this); label->setGeometry(10,10,120,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Logitek Device Number @@ -71,7 +73,7 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, label=new QLabel(edit_devicenum_edit,tr("Device (Hex): "),this); label->setGeometry(10,36,120,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Logitek Surface Number @@ -81,7 +83,7 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, label=new QLabel(edit_surfacenum_edit,tr("Surface (Hex): "),this); label->setGeometry(10,62,120,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Logitek Relay Number @@ -92,7 +94,7 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, new QLabel(edit_relaynum_edit,tr("Bus/Relay (Hex): "),this); edit_relaynum_label->setGeometry(10,88,120,20); edit_relaynum_label->setFont(bold_font); - edit_relaynum_label->setAlignment(AlignRight|AlignVCenter); + edit_relaynum_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Ok Button diff --git a/rdadmin/help_audios.cpp b/rdadmin/help_audios.cpp index 555e5117..00ce7e32 100644 --- a/rdadmin/help_audios.cpp +++ b/rdadmin/help_audios.cpp @@ -42,10 +42,10 @@ HelpAudioPorts::HelpAudioPorts(QWidget *parent) button_font.setPixelSize(14); // Help Text - help_edit=new QTextEdit(this,"help_edit"); + help_edit=new Q3TextEdit(this,"help_edit"); help_edit-> setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-70); - help_edit->setTextFormat(RichText); + help_edit->setTextFormat(Qt::RichText); help_edit->setReadOnly(true); // FIXME: add context sensitive help for other options on the Audio Port screen. help_edit->setText(tr("Mode - short for Channel Mode, configures the Left and Right behaviour when recording.
\ @@ -54,12 +54,12 @@ HelpAudioPorts::HelpAudioPorts(QWidget *parent) Channels Mode Effect \ Mono Normal L+R sum to mono \ Mono Swap R+L sum to mono (same result as Normal) \ - Mono Left only L -> mono \ - Mono Right only R -> mono \ + Mono Qt::DockLeft only L -> mono \ + Mono Qt::DockRight only R -> mono \ Stereo Normal Stereo \ Stereo Swap Swapped stereo \ - Stereo Left only L -> to L channel only, R channel is silent \ - Stereo Right only R -> to R channel only, L channel is silent \ + Stereo Qt::DockLeft only L -> to L channel only, R channel is silent \ + Stereo Qt::DockRight only R -> to R channel only, L channel is silent \ ")); // diff --git a/rdadmin/help_audios.h b/rdadmin/help_audios.h index eeee8ac8..79616ca7 100644 --- a/rdadmin/help_audios.h +++ b/rdadmin/help_audios.h @@ -23,7 +23,7 @@ #define HELP_AUDIOS_H #include -#include +#include class HelpAudioPorts : public QDialog @@ -38,7 +38,7 @@ class HelpAudioPorts : public QDialog void closeData(); private: - QTextEdit *help_edit; + Q3TextEdit *help_edit; }; diff --git a/rdadmin/importfields.cpp b/rdadmin/importfields.cpp index a5ef53dc..a4bd2ad1 100644 --- a/rdadmin/importfields.cpp +++ b/rdadmin/importfields.cpp @@ -21,6 +21,8 @@ #include #include +//Added by qt3to4: +#include ImportFields::ImportFields(QWidget *parent) : QWidget(parent) @@ -33,7 +35,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Cart Number:"),this); label->setGeometry(0,0,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Traffic Cart Offset @@ -43,7 +45,7 @@ ImportFields::ImportFields(QWidget *parent) cart_offset_spin->setRange(0,1024); label=new QLabel(cart_offset_spin,tr("Offset:"),this); label->setGeometry(125,0,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(cart_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -55,7 +57,7 @@ ImportFields::ImportFields(QWidget *parent) cart_length_spin->setRange(0,6); label=new QLabel(cart_length_spin,tr("Length:"),this); label->setGeometry(230,0,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(cart_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -64,7 +66,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Title:"),this); label->setGeometry(0,21,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Title Cart Offset @@ -74,7 +76,7 @@ ImportFields::ImportFields(QWidget *parent) title_offset_spin->setRange(0,1024); label=new QLabel(title_offset_spin,tr("Offset:"),this); label->setGeometry(125,21,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(title_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -86,7 +88,7 @@ ImportFields::ImportFields(QWidget *parent) title_length_spin->setRange(0,255); label=new QLabel(title_length_spin,tr("Length:"),this); label->setGeometry(230,21,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(title_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -95,7 +97,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Start Time - Hours:"),this); label->setGeometry(0,42,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Traffic Start Hours Offset @@ -105,7 +107,7 @@ ImportFields::ImportFields(QWidget *parent) hours_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); label=new QLabel(hours_offset_spin,tr("Offset:"),this); label->setGeometry(125,42,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(hours_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -117,7 +119,7 @@ ImportFields::ImportFields(QWidget *parent) hours_length_spin->setRange(0,8); label=new QLabel(hours_length_spin,tr("Length:"),this); label->setGeometry(230,42,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(hours_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -126,7 +128,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Start Time - Minutes:"),this); label->setGeometry(0,63,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Traffic Start Minutes Offset @@ -136,7 +138,7 @@ ImportFields::ImportFields(QWidget *parent) minutes_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); label=new QLabel(minutes_offset_spin,tr("Offset:"),this); label->setGeometry(125,63,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(minutes_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -148,7 +150,7 @@ ImportFields::ImportFields(QWidget *parent) minutes_length_spin->setRange(0,8); label=new QLabel(minutes_length_spin,tr("Length:"),this); label->setGeometry(230,63,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(minutes_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -157,7 +159,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Start Time - Seconds:"),this); label->setGeometry(0,84,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Traffic Start Seconds Offset @@ -167,7 +169,7 @@ ImportFields::ImportFields(QWidget *parent) seconds_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); label=new QLabel(seconds_offset_spin,tr("Offset:"),this); label->setGeometry(125,84,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(seconds_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -179,7 +181,7 @@ ImportFields::ImportFields(QWidget *parent) seconds_length_spin->setRange(0,8); label=new QLabel(seconds_length_spin,tr("Length:"),this); label->setGeometry(230,84,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(seconds_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -188,7 +190,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Length - Hours:"),this); label->setGeometry(0,106,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Traffic Length Hours Offset @@ -198,7 +200,7 @@ ImportFields::ImportFields(QWidget *parent) len_hours_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); label=new QLabel(len_hours_offset_spin,tr("Offset:"),this); label->setGeometry(125,106,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(len_hours_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -210,7 +212,7 @@ ImportFields::ImportFields(QWidget *parent) len_hours_length_spin->setRange(0,8); label=new QLabel(len_hours_length_spin,tr("Length:"),this); label->setGeometry(230,106,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(len_hours_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -219,7 +221,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Length - Minutes:"),this); label->setGeometry(0,127,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Traffic Length Minutes Offset @@ -229,7 +231,7 @@ ImportFields::ImportFields(QWidget *parent) len_minutes_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); label=new QLabel(len_minutes_offset_spin,tr("Offset:"),this); label->setGeometry(125,127,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(len_minutes_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -241,7 +243,7 @@ ImportFields::ImportFields(QWidget *parent) len_minutes_length_spin->setRange(0,8); label=new QLabel(len_minutes_length_spin,tr("Length:"),this); label->setGeometry(230,127,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(len_minutes_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -250,7 +252,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Length - Seconds:"),this); label->setGeometry(0,148,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Traffic Length Seconds Offset @@ -260,7 +262,7 @@ ImportFields::ImportFields(QWidget *parent) len_seconds_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); label=new QLabel(len_seconds_offset_spin,tr("Offset:"),this); label->setGeometry(125,148,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(len_seconds_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -272,7 +274,7 @@ ImportFields::ImportFields(QWidget *parent) len_seconds_length_spin->setRange(0,8); label=new QLabel(len_seconds_length_spin,tr("Length:"),this); label->setGeometry(230,148,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(len_seconds_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -281,7 +283,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Globally Unique ID:"),this); label->setGeometry(0,169,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Traffic Contract # Offset @@ -291,7 +293,7 @@ ImportFields::ImportFields(QWidget *parent) data_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); label=new QLabel(data_offset_spin,tr("Offset:"),this); label->setGeometry(125,169,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(data_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -303,7 +305,7 @@ ImportFields::ImportFields(QWidget *parent) data_length_spin->setRange(0,32); label=new QLabel(data_length_spin,tr("Length:"),this); label->setGeometry(230,169,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(data_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -312,7 +314,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Event ID:"),this); label->setGeometry(0,190,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Traffic Event ID Offset @@ -322,7 +324,7 @@ ImportFields::ImportFields(QWidget *parent) event_id_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); label=new QLabel(event_id_offset_spin,tr("Offset:"),this); label->setGeometry(125,190,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(event_id_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -334,7 +336,7 @@ ImportFields::ImportFields(QWidget *parent) event_id_length_spin->setRange(0,8); label=new QLabel(event_id_length_spin,tr("Length:"),this); label->setGeometry(230,190,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(event_id_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -343,7 +345,7 @@ ImportFields::ImportFields(QWidget *parent) // label=new QLabel(tr("Annc. Type:"),this); label->setGeometry(0,211,120,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Traffic Announcement Type Offset @@ -353,7 +355,7 @@ ImportFields::ImportFields(QWidget *parent) annctype_offset_spin->setRange(0,RD_MAX_IMPORT_LINE_LENGTH); label=new QLabel(annctype_offset_spin,tr("Offset:"),this); label->setGeometry(125,211,45,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(annctype_offset_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); @@ -365,7 +367,7 @@ ImportFields::ImportFields(QWidget *parent) annctype_length_spin->setRange(0,8); label=new QLabel(annctype_length_spin,tr("Length:"),this); label->setGeometry(230,211,50,19); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(annctype_length_spin,SIGNAL(valueChanged(int)), this,SLOT(valueChangedData(int))); } diff --git a/rdadmin/info_dialog.cpp b/rdadmin/info_dialog.cpp index cab4edd9..165be944 100644 --- a/rdadmin/info_dialog.cpp +++ b/rdadmin/info_dialog.cpp @@ -20,14 +20,17 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -103,7 +106,7 @@ InfoDialog::InfoDialog(QWidget *parent) // label=new QLabel(tr("A Radio Automation System"),this); label->setGeometry(130,52,200,18); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); label->setFont(slogan_font); // @@ -116,7 +119,7 @@ InfoDialog::InfoDialog(QWidget *parent) label=new QLabel(tr("Database Schema")+ QString().sprintf(" %d",RD_VERSION_DATABASE),this); label->setGeometry(210,73,120,14); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); label->setFont(font); // diff --git a/rdadmin/list_dropboxes.cpp b/rdadmin/list_dropboxes.cpp index 46c7a947..99b1a972 100644 --- a/rdadmin/list_dropboxes.cpp +++ b/rdadmin/list_dropboxes.cpp @@ -21,13 +21,15 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -118,9 +120,9 @@ ListDropboxes::ListDropboxes(const QString &stationname,QWidget *parent) list_dropboxes_view->addColumn(tr("User Defined")); list_dropboxes_view->setColumnAlignment(9,Qt::AlignVCenter|Qt::AlignLeft); connect(list_dropboxes_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); RefreshList(); } @@ -198,7 +200,7 @@ void ListDropboxes::deleteData() } -void ListDropboxes::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListDropboxes::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); diff --git a/rdadmin/list_dropboxes.h b/rdadmin/list_dropboxes.h index 0c11d5c6..1ae234a1 100644 --- a/rdadmin/list_dropboxes.h +++ b/rdadmin/list_dropboxes.h @@ -26,6 +26,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -43,7 +45,7 @@ class ListDropboxes : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void closeData(); protected: diff --git a/rdadmin/list_endpoints.cpp b/rdadmin/list_endpoints.cpp index 90a0650d..0d681823 100644 --- a/rdadmin/list_endpoints.cpp +++ b/rdadmin/list_endpoints.cpp @@ -20,9 +20,11 @@ #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -39,7 +41,7 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, { QString sql; RDSqlQuery *q; - QListViewItem *l; + Q3ListViewItem *l; QString str; list_matrix=matrix; @@ -77,7 +79,7 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, // // Endpoints List Box // - list_list_view=new QListView(this); + list_list_view=new Q3ListView(this); list_list_view-> setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-94); QLabel *label= @@ -147,9 +149,9 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, } if(!list_readonly) { connect(list_list_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); } // @@ -270,7 +272,7 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, q=new RDSqlQuery(sql); if(list_matrix->type()==RDMatrix::LiveWireLwrpAudio) { while(q->next()) { - l=new QListViewItem(list_list_view); + l=new Q3ListViewItem(list_list_view); l->setText(0,QString().sprintf("%05d",q->value(0).toInt())); l->setText(1,q->value(1).toString()); l->setText(2,q->value(2).toString()); @@ -280,7 +282,7 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, else { q->first(); for(int i=0;isetText(0,QString().sprintf("%04d",i+1)); if(q->isValid()&&(q->value(0).toInt()==(i+1))){ l->setText(1,q->value(1).toString()); @@ -393,7 +395,7 @@ QSizePolicy ListEndpoints::sizePolicy() const void ListEndpoints::editData() { - QListViewItem *item; + Q3ListViewItem *item; RDMatrix::Mode mode=RDMatrix::Stereo; bool ok; QString feedname; @@ -531,7 +533,7 @@ void ListEndpoints::editData() } -void ListEndpoints::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListEndpoints::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); @@ -541,7 +543,7 @@ void ListEndpoints::doubleClickedData(QListViewItem *item,const QPoint &pt, void ListEndpoints::okData() { if(!list_readonly) { - QListViewItem *item; + Q3ListViewItem *item; QString sql; RDSqlQuery *q; RDMatrix::Mode mode=RDMatrix::Stereo; diff --git a/rdadmin/list_endpoints.h b/rdadmin/list_endpoints.h index a85ba357..d9d1d76b 100644 --- a/rdadmin/list_endpoints.h +++ b/rdadmin/list_endpoints.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -40,14 +40,14 @@ class ListEndpoints : public QDialog private slots: void editData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void okData(); void cancelData(); private: RDMatrix *list_matrix; RDMatrix::Endpoint list_endpoint; - QListView *list_list_view; + Q3ListView *list_list_view; int list_size; QString list_table; bool list_readonly; diff --git a/rdadmin/list_feeds.cpp b/rdadmin/list_feeds.cpp index b3e36ab4..0b088cb9 100644 --- a/rdadmin/list_feeds.cpp +++ b/rdadmin/list_feeds.cpp @@ -25,15 +25,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include +//Added by qt3to4: +#include #include #include @@ -122,9 +124,9 @@ ListFeeds::ListFeeds(QWidget *parent) list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); connect(list_feeds_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); RefreshList(); } @@ -238,8 +240,9 @@ void ListFeeds::deleteData() RDPodcast *cast; sql=QString().sprintf("select ID from PODCASTS where FEED_ID=%d",item->id()); q=new RDSqlQuery(sql); - QProgressDialog *pd=new QProgressDialog(tr("Deleting Audio..."),tr("Cancel"), - q->size()+1,this); + Q3ProgressDialog *pd= + new Q3ProgressDialog(tr("Deleting Audio..."),tr("Cancel"),q->size()+1,this, + NULL); pd->setCaption(tr("Deleting")); pd->setProgress(0); qApp->processEvents(); @@ -282,7 +285,7 @@ void ListFeeds::deleteData() } -void ListFeeds::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListFeeds::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); diff --git a/rdadmin/list_feeds.h b/rdadmin/list_feeds.h index 6f1a25f3..32786570 100644 --- a/rdadmin/list_feeds.h +++ b/rdadmin/list_feeds.h @@ -26,6 +26,8 @@ #include #include #include +//Added by qt3to4: +#include #include @@ -42,7 +44,7 @@ class ListFeeds : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void closeData(); protected: diff --git a/rdadmin/list_gpis.cpp b/rdadmin/list_gpis.cpp index c114d080..b87cf488 100644 --- a/rdadmin/list_gpis.cpp +++ b/rdadmin/list_gpis.cpp @@ -20,9 +20,12 @@ #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -41,7 +44,7 @@ ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type,QWidget *parent) { QString sql; RDSqlQuery *q; - QListViewItem *l; + Q3ListViewItem *l; QString list_label; list_matrix=matrix; @@ -79,16 +82,16 @@ ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type,QWidget *parent) // // Gpis List Box // - list_list_view=new QListView(this); + list_list_view=new Q3ListView(this); list_list_label= new QLabel(list_list_view,list_label,this); list_list_label->setFont(bold_font); list_list_view->setAllColumnsShowFocus(true); list_list_view->setItemMargin(5); connect(list_list_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); switch(list_type) { case RDMatrix::GpioInput: @@ -154,7 +157,7 @@ ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type,QWidget *parent) q=new RDSqlQuery(sql); if(list_matrix->type()==RDMatrix::LiveWireLwrpAudio) { while(q->next()) { - l=new QListViewItem(list_list_view); + l=new Q3ListViewItem(list_list_view); l->setText(0,QString().sprintf("%05d",q->value(0).toInt())); if(q->value(1).toInt()>0) { l->setText(1,QString().sprintf("%06d",q->value(1).toInt())); @@ -173,7 +176,7 @@ ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type,QWidget *parent) else { q->first(); for(int i=0;isetText(0,QString().sprintf("%03d",i+1)); if(q->isValid()&&(q->value(0).toInt()==(i+1))){ if(q->value(1).toInt()>0) { @@ -237,7 +240,7 @@ void ListGpis::editData() QString ondesc; QString offdesc; - QListViewItem *item=list_list_view->selectedItem(); + Q3ListViewItem *item=list_list_view->selectedItem(); if(item==NULL) { return; } @@ -271,7 +274,7 @@ void ListGpis::editData() } -void ListGpis::doubleClickedData(QListViewItem *,const QPoint &,int) +void ListGpis::doubleClickedData(Q3ListViewItem *,const QPoint &,int) { editData(); } @@ -305,7 +308,7 @@ void ListGpis::okData() rml.setEchoRequested(false); delete station; - QListViewItem *item=list_list_view->firstChild(); + Q3ListViewItem *item=list_list_view->firstChild(); while(item!=NULL) { sql=QString("insert into ")+list_tablename+" set "+ "STATION_NAME=\""+RDEscapeString(list_matrix->station())+"\","+ diff --git a/rdadmin/list_gpis.h b/rdadmin/list_gpis.h index 480f386e..259c9f30 100644 --- a/rdadmin/list_gpis.h +++ b/rdadmin/list_gpis.h @@ -25,7 +25,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -40,7 +42,7 @@ class ListGpis : public QDialog private slots: void editData(); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void okData(); void cancelData(); @@ -51,7 +53,7 @@ class ListGpis : public QDialog RDMatrix *list_matrix; RDMatrix::GpioType list_type; QString list_tablename; - QListView *list_list_view; + Q3ListView *list_list_view; QLabel *list_list_label; int list_size; QPushButton *list_edit_button; diff --git a/rdadmin/list_groups.cpp b/rdadmin/list_groups.cpp index ee36658b..09758e7c 100644 --- a/rdadmin/list_groups.cpp +++ b/rdadmin/list_groups.cpp @@ -23,13 +23,15 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -140,9 +142,9 @@ ListGroups::ListGroups(QWidget *parent) list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); connect(list_groups_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); RefreshList(); } @@ -399,7 +401,7 @@ void ListGroups::reportData() } -void ListGroups::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListGroups::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); diff --git a/rdadmin/list_groups.h b/rdadmin/list_groups.h index fdcd512b..59e6edb4 100644 --- a/rdadmin/list_groups.h +++ b/rdadmin/list_groups.h @@ -26,6 +26,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -45,7 +47,7 @@ class ListGroups : public QDialog void renameData(); void deleteData(); void reportData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void closeData(); protected: diff --git a/rdadmin/list_hostvars.cpp b/rdadmin/list_hostvars.cpp index 866a5577..36ed6e07 100644 --- a/rdadmin/list_hostvars.cpp +++ b/rdadmin/list_hostvars.cpp @@ -21,13 +21,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -66,7 +66,7 @@ ListHostvars::ListHostvars(QString station,QWidget *parent) // // Matrix List Box // - list_view=new QListView(this); + list_view=new Q3ListView(this); list_view->setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-114); QLabel *label=new QLabel(list_view,tr("Host Variables"),this); label->setFont(font); @@ -79,8 +79,8 @@ ListHostvars::ListHostvars(QString station,QWidget *parent) list_view->setColumnAlignment(1,Qt::AlignLeft); list_view->addColumn(tr("REMARK")); list_view->setColumnAlignment(2,Qt::AlignLeft); - connect(list_view,SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), - this,SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + connect(list_view,SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), + this,SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); RefreshList(); @@ -161,7 +161,7 @@ void ListHostvars::addData() AddHostvar *var_dialog= new AddHostvar(list_station,&varname,&varvalue,&varremark,this); if(var_dialog->exec()==0) { - QListViewItem *item=new QListViewItem(list_view); + Q3ListViewItem *item=new Q3ListViewItem(list_view); item->setText(0,varname); item->setText(1,varvalue); item->setText(2,varremark); @@ -172,7 +172,7 @@ void ListHostvars::addData() void ListHostvars::editData() { - QListViewItem *item=list_view->selectedItem(); + Q3ListViewItem *item=list_view->selectedItem(); if(item==NULL) { return; } @@ -190,7 +190,7 @@ void ListHostvars::editData() void ListHostvars::deleteData() { - QListViewItem *item=list_view->selectedItem(); + Q3ListViewItem *item=list_view->selectedItem(); if(item==NULL) { return; } @@ -204,7 +204,7 @@ void ListHostvars::deleteData() } -void ListHostvars::doubleClickedData(QListViewItem *,const QPoint &,int) +void ListHostvars::doubleClickedData(Q3ListViewItem *,const QPoint &,int) { editData(); } @@ -219,7 +219,7 @@ void ListHostvars::okData() "STATION_NAME=\""+RDEscapeString(list_station)+"\""; q=new RDSqlQuery(sql); delete q; - QListViewItem *item=list_view->firstChild(); + Q3ListViewItem *item=list_view->firstChild(); while(item!=NULL) { sql=QString("insert into HOSTVARS set ")+ "STATION_NAME=\""+RDEscapeString(list_station)+"\","+ @@ -242,7 +242,7 @@ void ListHostvars::cancelData() void ListHostvars::RefreshList() { - QListViewItem *l; + Q3ListViewItem *l; list_view->clear(); QString sql=QString("select ")+ @@ -254,7 +254,7 @@ void ListHostvars::RefreshList() "order by NAME"; RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { - l=new QListViewItem(list_view); + l=new Q3ListViewItem(list_view); l->setText(0,q->value(0).toString()); l->setText(1,q->value(1).toString()); l->setText(2,q->value(2).toString()); diff --git a/rdadmin/list_hostvars.h b/rdadmin/list_hostvars.h index 63a154a9..cc90d968 100644 --- a/rdadmin/list_hostvars.h +++ b/rdadmin/list_hostvars.h @@ -22,8 +22,8 @@ #define LIST_HOSTVARS_H #include -#include -#include +#include +#include #include #include #include @@ -44,13 +44,13 @@ class ListHostvars : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void okData(); void cancelData(); private: void RefreshList(); - QListView *list_view; + Q3ListView *list_view; QString list_station; }; diff --git a/rdadmin/list_livewiregpios.cpp b/rdadmin/list_livewiregpios.cpp index b64cf50f..929e8be7 100644 --- a/rdadmin/list_livewiregpios.cpp +++ b/rdadmin/list_livewiregpios.cpp @@ -21,13 +21,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -77,8 +77,8 @@ ListLiveWireGpios::ListLiveWireGpios(RDMatrix *matrix,int slot_quan, list_view->addColumn(tr("Surface Address")); list_view->setColumnAlignment(2,Qt::AlignCenter); list_view->setColumnSortType(0,RDListView::GpioSort); - connect(list_view,SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), - this,SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + connect(list_view,SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), + this,SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); RefreshList(); @@ -162,7 +162,7 @@ void ListLiveWireGpios::editData() } -void ListLiveWireGpios::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListLiveWireGpios::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); @@ -208,7 +208,7 @@ void ListLiveWireGpios::cancelData() void ListLiveWireGpios::RefreshList() { - QListViewItem *l; + Q3ListViewItem *l; QString sql; RDSqlQuery *q; RDSqlQuery *q1; diff --git a/rdadmin/list_livewiregpios.h b/rdadmin/list_livewiregpios.h index 4cb491c2..f917bfd0 100644 --- a/rdadmin/list_livewiregpios.h +++ b/rdadmin/list_livewiregpios.h @@ -22,7 +22,7 @@ #define LIST_LIVEWIREGPIOS_H #include -#include +#include #include #include #include @@ -42,7 +42,7 @@ class ListLiveWireGpios : public QDialog private slots: void editData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void okData(); void cancelData(); diff --git a/rdadmin/list_matrices.cpp b/rdadmin/list_matrices.cpp index 26ff3702..b8f3950c 100644 --- a/rdadmin/list_matrices.cpp +++ b/rdadmin/list_matrices.cpp @@ -21,13 +21,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -70,7 +70,7 @@ ListMatrices::ListMatrices(QString station,QWidget *parent) // // Matrix List Box // - list_view=new QListView(this,"list_box"); + list_view=new Q3ListView(this,"list_box"); list_view->setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-94); QLabel *label=new QLabel(list_view,tr("Switchers:"),this); label->setFont(font); @@ -83,8 +83,8 @@ ListMatrices::ListMatrices(QString station,QWidget *parent) list_view->setColumnAlignment(1,Qt::AlignLeft); list_view->addColumn(tr("TYPE")); list_view->setColumnAlignment(2,Qt::AlignLeft); - connect(list_view,SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), - this,SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + connect(list_view,SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), + this,SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); RefreshList(); @@ -177,7 +177,7 @@ void ListMatrices::editData() } int matrix_num=list_view->currentItem()->text(0).toInt(); RDMatrix *matrix=new RDMatrix(list_station,matrix_num); - QListViewItem *item=list_view->selectedItem(); + Q3ListViewItem *item=list_view->selectedItem(); EditMatrix *edit=new EditMatrix(matrix,this); if(edit->exec()==0) { RefreshRecord(item); @@ -210,7 +210,7 @@ void ListMatrices::deleteData() } -void ListMatrices::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListMatrices::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); @@ -280,7 +280,7 @@ sql=QString("delete from VGUEST_RESOURCES where ")+ void ListMatrices::RefreshList() { - QListViewItem *l; + Q3ListViewItem *l; list_view->clear(); QString sql=QString("select ")+ @@ -292,7 +292,7 @@ void ListMatrices::RefreshList() "order by MATRIX"; RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { - l=new QListViewItem(list_view); + l=new Q3ListViewItem(list_view); l->setText(0,q->value(0).toString()); l->setText(1,q->value(1).toString()); l->setText(2,RDMatrix::typeString((RDMatrix::Type)q->value(2).toInt())); @@ -304,7 +304,7 @@ void ListMatrices::RefreshList() void ListMatrices::AddList(int matrix_num) { RDMatrix *matrix=new RDMatrix(list_station,matrix_num); - QListViewItem *item=new QListViewItem(list_view); + Q3ListViewItem *item=new Q3ListViewItem(list_view); item->setText(0,QString().sprintf("%d",matrix_num)); item->setText(1,matrix->name()); item->setText(2,RDMatrix::typeString(matrix->type())); @@ -314,7 +314,7 @@ void ListMatrices::AddList(int matrix_num) } -void ListMatrices::RefreshRecord(QListViewItem *item) +void ListMatrices::RefreshRecord(Q3ListViewItem *item) { RDMatrix *matrix=new RDMatrix(list_station,item->text(0).toInt()); item->setText(1,matrix->name()); diff --git a/rdadmin/list_matrices.h b/rdadmin/list_matrices.h index a8667535..22bf3e35 100644 --- a/rdadmin/list_matrices.h +++ b/rdadmin/list_matrices.h @@ -22,8 +22,8 @@ #define LIST_MATRICES_H #include -#include -#include +#include +#include #include #include #include @@ -44,15 +44,15 @@ class ListMatrices : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void closeData(); private: void DeleteMatrix(int matrix); void RefreshList(); void AddList(int matrix_num); - void RefreshRecord(QListViewItem *item); - QListView *list_view; + void RefreshRecord(Q3ListViewItem *item); + Q3ListView *list_view; QString list_station; bool list_matrix_modified[MAX_MATRICES]; }; diff --git a/rdadmin/list_nodes.cpp b/rdadmin/list_nodes.cpp index 279ff161..5d7deb35 100644 --- a/rdadmin/list_nodes.cpp +++ b/rdadmin/list_nodes.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -72,9 +72,9 @@ ListNodes::ListNodes(RDMatrix *matrix,QWidget *parent) list_list_view->addColumn(tr("TCP PORT")); list_list_view->setColumnAlignment(3,Qt::AlignCenter); connect(list_list_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); // // Add Button @@ -186,7 +186,7 @@ void ListNodes::deleteData() } -void ListNodes::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListNodes::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); diff --git a/rdadmin/list_nodes.h b/rdadmin/list_nodes.h index 7730ff72..1029fad0 100644 --- a/rdadmin/list_nodes.h +++ b/rdadmin/list_nodes.h @@ -43,7 +43,7 @@ class ListNodes : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void closeData(); private: diff --git a/rdadmin/list_replicator_carts.cpp b/rdadmin/list_replicator_carts.cpp index 2a85db7e..1478dfd5 100644 --- a/rdadmin/list_replicator_carts.cpp +++ b/rdadmin/list_replicator_carts.cpp @@ -23,13 +23,16 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include #include diff --git a/rdadmin/list_replicator_carts.h b/rdadmin/list_replicator_carts.h index 88ec8be6..6977b469 100644 --- a/rdadmin/list_replicator_carts.h +++ b/rdadmin/list_replicator_carts.h @@ -27,6 +27,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/rdadmin/list_replicators.cpp b/rdadmin/list_replicators.cpp index b97ed51a..819abe67 100644 --- a/rdadmin/list_replicators.cpp +++ b/rdadmin/list_replicators.cpp @@ -23,13 +23,15 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -120,9 +122,9 @@ ListReplicators::ListReplicators(QWidget *parent) list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); connect(list_replicators_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); RefreshList(); } @@ -196,7 +198,7 @@ void ListReplicators::deleteData() switch(QMessageBox::warning(this,tr("Delete Replicator"),warning, QMessageBox::Yes,QMessageBox::No)) { case QMessageBox::No: - case QMessageBox::NoButton: + case Qt::NoButton: return; default: @@ -246,7 +248,7 @@ void ListReplicators::listData() } -void ListReplicators::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListReplicators::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); diff --git a/rdadmin/list_replicators.h b/rdadmin/list_replicators.h index cb2a02a2..53ad3f0d 100644 --- a/rdadmin/list_replicators.h +++ b/rdadmin/list_replicators.h @@ -26,6 +26,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -44,7 +46,7 @@ class ListReplicators : public QDialog void editData(); void deleteData(); void listData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void closeData(); protected: diff --git a/rdadmin/list_reports.cpp b/rdadmin/list_reports.cpp index 9a3cd41d..43625603 100644 --- a/rdadmin/list_reports.cpp +++ b/rdadmin/list_reports.cpp @@ -21,13 +21,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -97,13 +97,13 @@ ListReports::ListReports(QWidget *parent) // // Report List Box // - list_box=new QListBox(this); + list_box=new Q3ListBox(this); list_box->setGeometry(10,30,390,260); QLabel *list_box_label=new QLabel(list_box,tr("R&eports:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,10,85,19); - connect(list_box,SIGNAL(doubleClicked(QListBoxItem *)), - this,SLOT(doubleClickedData(QListBoxItem *))); + connect(list_box,SIGNAL(doubleClicked(Q3ListBoxItem *)), + this,SLOT(doubleClickedData(Q3ListBoxItem *))); RefreshList(); } @@ -184,7 +184,7 @@ void ListReports::closeData() } -void ListReports::doubleClickedData(QListBoxItem *item) +void ListReports::doubleClickedData(Q3ListBoxItem *item) { editData(); } @@ -216,7 +216,7 @@ void ListReports::RefreshList(QString rptname) RDSqlQuery *q; list_box->clear(); - q=new RDSqlQuery("SELECT NAME FROM REPORTS",0); + q=new RDSqlQuery("select NAME from REPORTS"); while (q->next()) { list_box->insertItem(q->value(0).toString()); if(rptname==list_box->text(list_box->count()-1)) { diff --git a/rdadmin/list_reports.h b/rdadmin/list_reports.h index 28b6dead..76ea1f11 100644 --- a/rdadmin/list_reports.h +++ b/rdadmin/list_reports.h @@ -22,8 +22,8 @@ #define LIST_REPORTS_H #include -#include -#include +#include +#include #include #include #include @@ -41,13 +41,13 @@ class ListReports : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListBoxItem *item); + void doubleClickedData(Q3ListBoxItem *item); void closeData(); private: void DeleteReport(QString rptname); void RefreshList(QString rptname=""); - QListBox *list_box; + Q3ListBox *list_box; }; diff --git a/rdadmin/list_sas_resources.cpp b/rdadmin/list_sas_resources.cpp index 12785e3b..ca4aed41 100644 --- a/rdadmin/list_sas_resources.cpp +++ b/rdadmin/list_sas_resources.cpp @@ -20,9 +20,11 @@ #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -60,7 +62,7 @@ ListSasResources::ListSasResources(RDMatrix *matrix,int size,QWidget *parent) // // Resources List Box // - list_list_view=new QListView(this); + list_list_view=new Q3ListView(this); list_list_view-> setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-94); QLabel *label= @@ -78,9 +80,9 @@ ListSasResources::ListSasResources(RDMatrix *matrix,int size,QWidget *parent) list_list_view->addColumn(tr("OPTO/RELAY")); list_list_view->setColumnAlignment(3,Qt::AlignHCenter); connect(list_list_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); // // Edit Button @@ -136,7 +138,7 @@ void ListSasResources::editData() int device_num=-1; int relay_num=-1; - QListViewItem *item=list_list_view->selectedItem(); + Q3ListViewItem *item=list_list_view->selectedItem(); if(item==NULL) { return; } @@ -175,7 +177,7 @@ void ListSasResources::editData() } -void ListSasResources::doubleClickedData(QListViewItem *item, +void ListSasResources::doubleClickedData(Q3ListViewItem *item, const QPoint &pt,int col) { editData(); @@ -191,7 +193,7 @@ void ListSasResources::okData() int surface_num=-1; int relay_num=-1; - QListViewItem *item=list_list_view->firstChild(); + Q3ListViewItem *item=list_list_view->firstChild(); while(item!=NULL) { engine_num=-1; device_num=-1; @@ -250,7 +252,7 @@ void ListSasResources::RefreshList() QString sql; RDSqlQuery *q; RDSqlQuery *q1; - QListViewItem *item; + Q3ListViewItem *item; int n=1; int gpis; @@ -297,10 +299,10 @@ void ListSasResources::RefreshList() list_list_view->clear(); while(q->next()) { while(q->value(0).toInt()>n) { - item=new QListViewItem(list_list_view); + item=new Q3ListViewItem(list_list_view); item->setText(0,QString().sprintf("%03d",n++)); } - item=new QListViewItem(list_list_view); + item=new Q3ListViewItem(list_list_view); item->setText(0,QString().sprintf("%03d",q->value(0).toInt())); if(q->value(1).toInt()>=0) { item->setText(1,QString().sprintf("%d",q->value(1).toInt())); @@ -314,7 +316,7 @@ void ListSasResources::RefreshList() n++; } for(int i=n;i<(list_size+1);i++) { - item=new QListViewItem(list_list_view); + item=new Q3ListViewItem(list_list_view); item->setText(0,QString().sprintf("%03d",i)); } delete q; diff --git a/rdadmin/list_sas_resources.h b/rdadmin/list_sas_resources.h index 84d9bed8..7ab508ed 100644 --- a/rdadmin/list_sas_resources.h +++ b/rdadmin/list_sas_resources.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -40,14 +40,14 @@ class ListSasResources : public QDialog private slots: void editData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void okData(); void cancelData(); private: void RefreshList(); RDMatrix *list_matrix; - QListView *list_list_view; + Q3ListView *list_list_view; int list_size; QString list_table; }; diff --git a/rdadmin/list_schedcodes.cpp b/rdadmin/list_schedcodes.cpp index 37f61d5f..c5879279 100644 --- a/rdadmin/list_schedcodes.cpp +++ b/rdadmin/list_schedcodes.cpp @@ -21,12 +21,14 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -92,7 +94,7 @@ ListSchedCodes::ListSchedCodes(QWidget *parent) // // Group List // - list_schedCodes_view=new QListView(this); + list_schedCodes_view=new Q3ListView(this); list_schedCodes_view->setAllColumnsShowFocus(true); list_schedCodes_view->addColumn(tr("CODE")); list_schedCodes_view->addColumn(tr("DESCRIPTION")); @@ -101,9 +103,9 @@ ListSchedCodes::ListSchedCodes(QWidget *parent) list_box_label->setFont(font); list_box_label->setGeometry(14,11,200,19); connect(list_schedCodes_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); RefreshList(); } @@ -137,7 +139,7 @@ void ListSchedCodes::addData() } delete add_schedCode; add_schedCode=NULL; - QListViewItem *item=new QListViewItem(list_schedCodes_view); + Q3ListViewItem *item=new Q3ListViewItem(list_schedCodes_view); item->setText(0,schedCode); RefreshItem(item); item->setSelected(true); @@ -148,7 +150,7 @@ void ListSchedCodes::addData() void ListSchedCodes::editData() { - QListViewItem *item=list_schedCodes_view->selectedItem(); + Q3ListViewItem *item=list_schedCodes_view->selectedItem(); if(item==NULL) { return; } @@ -163,7 +165,7 @@ void ListSchedCodes::editData() void ListSchedCodes::deleteData() { - QListViewItem *item=list_schedCodes_view->selectedItem(); + Q3ListViewItem *item=list_schedCodes_view->selectedItem(); if(item==NULL) { return; } @@ -200,7 +202,7 @@ void ListSchedCodes::deleteData() } -void ListSchedCodes::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListSchedCodes::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); @@ -227,19 +229,19 @@ void ListSchedCodes::RefreshList() { QString sql; RDSqlQuery *q; - QListViewItem *item; + Q3ListViewItem *item; list_schedCodes_view->clear(); - q=new RDSqlQuery("select CODE,DESCRIPTION from SCHED_CODES",0); + q=new RDSqlQuery("select CODE,DESCRIPTION from SCHED_CODES"); while (q->next()) { - item=new QListViewItem(list_schedCodes_view); + item=new Q3ListViewItem(list_schedCodes_view); WriteItem(item,q); } delete q; } -void ListSchedCodes::RefreshItem(QListViewItem *item) +void ListSchedCodes::RefreshItem(Q3ListViewItem *item) { QString sql; RDSqlQuery *q; @@ -254,7 +256,7 @@ void ListSchedCodes::RefreshItem(QListViewItem *item) } -void ListSchedCodes::WriteItem(QListViewItem *item,RDSqlQuery *q) +void ListSchedCodes::WriteItem(Q3ListViewItem *item,RDSqlQuery *q) { item->setText(0,q->value(0).toString()); item->setText(1,q->value(1).toString()); diff --git a/rdadmin/list_schedcodes.h b/rdadmin/list_schedcodes.h index d6364b09..ca9a5493 100644 --- a/rdadmin/list_schedcodes.h +++ b/rdadmin/list_schedcodes.h @@ -25,6 +25,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -42,7 +44,7 @@ class ListSchedCodes : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void closeData(); protected: @@ -50,9 +52,9 @@ class ListSchedCodes : public QDialog private: void RefreshList(); - void RefreshItem(QListViewItem *item); - void WriteItem(QListViewItem *item,RDSqlQuery *q); - QListView *list_schedCodes_view; + void RefreshItem(Q3ListViewItem *item); + void WriteItem(Q3ListViewItem *item,RDSqlQuery *q); + Q3ListView *list_schedCodes_view; QPushButton *list_add_button; QPushButton *list_edit_button; QPushButton *list_delete_button; diff --git a/rdadmin/list_stations.cpp b/rdadmin/list_stations.cpp index 503fc89e..d84e2470 100644 --- a/rdadmin/list_stations.cpp +++ b/rdadmin/list_stations.cpp @@ -21,13 +21,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -98,13 +98,13 @@ ListStations::ListStations(QWidget *parent) // // Station List Box // - list_box=new QListBox(this); + list_box=new Q3ListBox(this); list_box->setGeometry(10,30,390,260); QLabel *list_box_label=new QLabel(list_box,tr("Ho&sts:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,10,85,19); - connect(list_box,SIGNAL(doubleClicked(QListBoxItem *)), - this,SLOT(doubleClickedData(QListBoxItem *))); + connect(list_box,SIGNAL(doubleClicked(Q3ListBoxItem *)), + this,SLOT(doubleClickedData(Q3ListBoxItem *))); RefreshList(); } @@ -175,7 +175,7 @@ void ListStations::closeData() } -void ListStations::doubleClickedData(QListBoxItem *item) +void ListStations::doubleClickedData(Q3ListBoxItem *item) { editData(); } @@ -187,7 +187,7 @@ void ListStations::RefreshList(QString stationname) RDSqlQuery *q; list_box->clear(); - q=new RDSqlQuery("select NAME from STATIONS",0); + q=new RDSqlQuery("select NAME from STATIONS"); while (q->next()) { list_box->insertItem(q->value(0).toString()); if(stationname==list_box->text(list_box->count()-1)) { diff --git a/rdadmin/list_stations.h b/rdadmin/list_stations.h index dbbff499..d0664a8e 100644 --- a/rdadmin/list_stations.h +++ b/rdadmin/list_stations.h @@ -22,8 +22,8 @@ #define LIST_STATIONS_H #include -#include -#include +#include +#include #include #include #include @@ -41,12 +41,12 @@ class ListStations : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListBoxItem *item); + void doubleClickedData(Q3ListBoxItem *item); void closeData(); private: void RefreshList(QString stationname=""); - QListBox *list_box; + Q3ListBox *list_box; }; diff --git a/rdadmin/list_svcs.cpp b/rdadmin/list_svcs.cpp index 75d47a55..a9167882 100644 --- a/rdadmin/list_svcs.cpp +++ b/rdadmin/list_svcs.cpp @@ -21,13 +21,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -99,13 +99,13 @@ ListSvcs::ListSvcs(QWidget *parent) // // Services List Box // - list_box=new QListBox(this); + list_box=new Q3ListBox(this); list_box->setGeometry(10,30,80,260); QLabel *list_box_label=new QLabel(list_box,tr("&Services:"),this); list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); - connect(list_box,SIGNAL(doubleClicked(QListBoxItem *)), - this,SLOT(doubleClickedData(QListBoxItem *))); + connect(list_box,SIGNAL(doubleClicked(Q3ListBoxItem *)), + this,SLOT(doubleClickedData(Q3ListBoxItem *))); RefreshList(); } @@ -195,7 +195,7 @@ void ListSvcs::closeData() } -void ListSvcs::doubleClickedData(QListBoxItem *item) +void ListSvcs::doubleClickedData(Q3ListBoxItem *item) { editData(); } diff --git a/rdadmin/list_svcs.h b/rdadmin/list_svcs.h index 93bb1696..2dd935cc 100644 --- a/rdadmin/list_svcs.h +++ b/rdadmin/list_svcs.h @@ -22,8 +22,8 @@ #define LIST_SVCS_H #include -#include -#include +#include +#include #include #include #include @@ -41,12 +41,12 @@ class ListSvcs : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListBoxItem *); + void doubleClickedData(Q3ListBoxItem *); void closeData(); private: void RefreshList(QString svcname=""); - QListBox *list_box; + Q3ListBox *list_box; }; diff --git a/rdadmin/list_users.cpp b/rdadmin/list_users.cpp index ef682972..9d653e14 100644 --- a/rdadmin/list_users.cpp +++ b/rdadmin/list_users.cpp @@ -23,13 +23,16 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -123,9 +126,9 @@ ListUsers::ListUsers(const QString &admin_name,QWidget *parent) list_box_label->setFont(font); list_box_label->setGeometry(14,11,85,19); connect(list_users_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); RefreshList(); } @@ -226,7 +229,7 @@ void ListUsers::deleteData() switch(QMessageBox::warning(this,"RDAdmin - "+tr("Delete User"),warning, QMessageBox::Yes,QMessageBox::No)) { case QMessageBox::No: - case QMessageBox::NoButton: + case Qt::NoButton: return; default: @@ -270,7 +273,7 @@ void ListUsers::deleteData() } -void ListUsers::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListUsers::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); diff --git a/rdadmin/list_users.h b/rdadmin/list_users.h index 75afcbb4..b1c56371 100644 --- a/rdadmin/list_users.h +++ b/rdadmin/list_users.h @@ -27,6 +27,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -44,7 +46,7 @@ class ListUsers : public QDialog void addData(); void editData(); void deleteData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void closeData(); protected: diff --git a/rdadmin/list_vguest_resources.cpp b/rdadmin/list_vguest_resources.cpp index da0bc105..2613a8d7 100644 --- a/rdadmin/list_vguest_resources.cpp +++ b/rdadmin/list_vguest_resources.cpp @@ -20,9 +20,11 @@ #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -63,7 +65,7 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix, // // Resources List Box // - list_list_view=new QListView(this); + list_list_view=new Q3ListView(this); list_list_view-> setGeometry(10,24,sizeHint().width()-20,sizeHint().height()-94); QLabel *label=new QLabel(list_list_view,list_table,this); @@ -102,9 +104,9 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix, break; } connect(list_list_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); // // Edit Button @@ -161,7 +163,7 @@ void ListVguestResources::editData() int surface_num=-1; int relay_num=-1; - QListViewItem *item=list_list_view->selectedItem(); + Q3ListViewItem *item=list_list_view->selectedItem(); if(item==NULL) { return; } @@ -224,7 +226,7 @@ void ListVguestResources::editData() } -void ListVguestResources::doubleClickedData(QListViewItem *item, +void ListVguestResources::doubleClickedData(Q3ListViewItem *item, const QPoint &pt,int col) { editData(); @@ -240,7 +242,7 @@ void ListVguestResources::okData() int surface_num=-1; int relay_num=-1; - QListViewItem *item=list_list_view->firstChild(); + Q3ListViewItem *item=list_list_view->firstChild(); while(item!=NULL) { engine_num=-1; device_num=-1; @@ -312,7 +314,7 @@ void ListVguestResources::RefreshList() { QString sql; RDSqlQuery *q; - QListViewItem *item; + Q3ListViewItem *item; int n=1; sql=QString("select ")+ @@ -331,10 +333,10 @@ void ListVguestResources::RefreshList() list_list_view->clear(); while(q->next()) { while(q->value(0).toInt()>n) { - item=new QListViewItem(list_list_view); + item=new Q3ListViewItem(list_list_view); item->setText(0,QString().sprintf("%03d",n++)); } - item=new QListViewItem(list_list_view); + item=new Q3ListViewItem(list_list_view); item->setText(0,QString().sprintf("%03d",q->value(0).toInt())); if(q->value(1).toInt()>=0) { item->setText(1,QString().sprintf("%04X",q->value(1).toInt())); @@ -358,7 +360,7 @@ void ListVguestResources::RefreshList() n++; } for(int i=n;i<(list_size+1);i++) { - item=new QListViewItem(list_list_view); + item=new Q3ListViewItem(list_list_view); item->setText(0,QString().sprintf("%03d",i)); } delete q; diff --git a/rdadmin/list_vguest_resources.h b/rdadmin/list_vguest_resources.h index 5fb77f4d..95aafa6e 100644 --- a/rdadmin/list_vguest_resources.h +++ b/rdadmin/list_vguest_resources.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -41,7 +41,7 @@ class ListVguestResources : public QDialog private slots: void editData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void okData(); void cancelData(); @@ -49,7 +49,7 @@ class ListVguestResources : public QDialog void RefreshList(); RDMatrix *list_matrix; RDMatrix::VguestType list_type; - QListView *list_list_view; + Q3ListView *list_list_view; int list_size; QString list_table; }; diff --git a/rdadmin/login.cpp b/rdadmin/login.cpp index 52c7a9df..95fead0e 100644 --- a/rdadmin/login.cpp +++ b/rdadmin/login.cpp @@ -25,12 +25,14 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include #include @@ -92,7 +94,7 @@ Login::Login(QString *username,QString *password,QWidget *parent) QLabel *login_name_label=new QLabel(login_name_edit,tr("User &Name:"),this); login_name_label->setGeometry(10,10,85,19); login_name_label->setFont(font); - login_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + login_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Login Password @@ -106,7 +108,7 @@ Login::Login(QString *username,QString *password,QWidget *parent) new QLabel(login_password_edit,tr("&Password:"),this); login_password_label->setGeometry(10,31,85,19); login_password_label->setFont(font); - login_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + login_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); } diff --git a/rdadmin/login.h b/rdadmin/login.h index a306c2c6..3169ca63 100644 --- a/rdadmin/login.h +++ b/rdadmin/login.h @@ -23,9 +23,11 @@ #include #include -#include +#include #include #include +//Added by qt3to4: +#include class Login : public QDialog { diff --git a/rdadmin/rdadmin.cpp b/rdadmin/rdadmin.cpp index 182869be..7f854c6c 100644 --- a/rdadmin/rdadmin.cpp +++ b/rdadmin/rdadmin.cpp @@ -31,9 +31,11 @@ #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -406,7 +408,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(),"."); + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(),"."); a.installTranslator(&qt); QTranslator rd(0); rd.load(QString(PREFIX)+QString("/share/rivendell/librd_")+ diff --git a/rdadmin/rename_group.cpp b/rdadmin/rename_group.cpp index 03efc92a..3de2405b 100644 --- a/rdadmin/rename_group.cpp +++ b/rdadmin/rename_group.cpp @@ -23,14 +23,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include @@ -77,7 +77,7 @@ RenameGroup::RenameGroup(QString group,QWidget *parent) new QLabel(group_name_edit,tr("Current Group Name:"),this); group_name_label->setGeometry(10,11,150,19); group_name_label->setFont(font); - group_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + group_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // New Group Name @@ -90,7 +90,7 @@ RenameGroup::RenameGroup(QString group,QWidget *parent) new QLabel(group_newname_edit,tr("New &Group Name:"),this); group_newname_label->setGeometry(10,33,150,19); group_newname_label->setFont(font); - group_newname_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + group_newname_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/rdadmin/rename_group.h b/rdadmin/rename_group.h index c61b80f2..dab5829e 100644 --- a/rdadmin/rename_group.h +++ b/rdadmin/rename_group.h @@ -22,8 +22,8 @@ #define RENAME_GROUP_H #include -#include -#include +#include +#include #include #include #include diff --git a/rdadmin/test_import.cpp b/rdadmin/test_import.cpp index 05571aff..aa55c8af 100644 --- a/rdadmin/test_import.cpp +++ b/rdadmin/test_import.cpp @@ -21,6 +21,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -71,10 +75,10 @@ TestImport::TestImport(RDSvc *svc,RDSvc::ImportSource src,QWidget *parent) // // Date Selector // - test_date_edit=new QDateEdit(this); + test_date_edit=new Q3DateEdit(this); test_date_label=new QLabel(test_date_edit,tr("Test Date:"),this); test_date_label->setFont(font); - test_date_label->setAlignment(AlignVCenter|AlignRight); + test_date_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); test_date_edit->setDate(current_date); connect(test_date_edit,SIGNAL(valueChanged(const QDate &)), this,SLOT(dateChangedData(const QDate &))); @@ -112,19 +116,19 @@ TestImport::TestImport(RDSvc *svc,RDSvc::ImportSource src,QWidget *parent) test_events_list=new RDListView(this); test_events_list->setItemMargin(2); test_events_list->addColumn(tr("Start Time")); - test_events_list->setColumnAlignment(0,AlignCenter); + test_events_list->setColumnAlignment(0,Qt::AlignCenter); test_events_list->addColumn(tr("Cart")); - test_events_list->setColumnAlignment(1,AlignCenter); + test_events_list->setColumnAlignment(1,Qt::AlignCenter); test_events_list->addColumn(tr("Len")); - test_events_list->setColumnAlignment(2,AlignRight); + test_events_list->setColumnAlignment(2,Qt::AlignRight); test_events_list->addColumn(tr("Title")); - test_events_list->setColumnAlignment(3,AlignLeft); + test_events_list->setColumnAlignment(3,Qt::AlignLeft); test_events_list->addColumn(tr("GUID")); - test_events_list->setColumnAlignment(4,AlignCenter); + test_events_list->setColumnAlignment(4,Qt::AlignCenter); test_events_list->addColumn(tr("Event ID")); - test_events_list->setColumnAlignment(5,AlignCenter); + test_events_list->setColumnAlignment(5,Qt::AlignCenter); test_events_list->addColumn(tr("Announcement Type")); - test_events_list->setColumnAlignment(6,AlignCenter); + test_events_list->setColumnAlignment(6,Qt::AlignCenter); test_events_list->setColumnSortType(0,RDListView::LineSort); test_events_label=new QLabel(test_events_list,tr("Imported Events"),this); test_events_label->setGeometry(15,160,sizeHint().width()-30,18); @@ -278,9 +282,8 @@ void TestImport::closeData() void TestImport::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); - p->moveTo(10,105); - p->lineTo(size().width()-20,105); + p->setPen(Qt::black); + p->drawLine(10,105,size().width()-20,105); p->end(); delete p; } diff --git a/rdadmin/test_import.h b/rdadmin/test_import.h index 9ac1c464..4eb9d47d 100644 --- a/rdadmin/test_import.h +++ b/rdadmin/test_import.h @@ -24,9 +24,12 @@ #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -54,7 +57,7 @@ class TestImport : public QDialog RDSvc *test_svc; RDSvc::ImportSource test_src; QLabel *test_date_label; - QDateEdit *test_date_edit; + Q3DateEdit *test_date_edit; QPushButton *test_import_button; QLabel *test_events_label; RDListView *test_events_list; diff --git a/rdadmin/view_adapters.cpp b/rdadmin/view_adapters.cpp index 2583a1f6..51289a27 100644 --- a/rdadmin/view_adapters.cpp +++ b/rdadmin/view_adapters.cpp @@ -19,7 +19,7 @@ // #include -#include +#include #include #include @@ -57,7 +57,7 @@ ViewAdapters::ViewAdapters(RDStation *rdstation,QWidget *parent) // // Resource List // - QTextEdit *text_edit=new QTextEdit(this,"adapter_edit"); + Q3TextEdit *text_edit=new Q3TextEdit(this,"adapter_edit"); text_edit->setGeometry(10,28,sizeHint().width()-20,sizeHint().height()-98); text_edit->setReadOnly(true); QString text; diff --git a/rdadmin/view_node_info.cpp b/rdadmin/view_node_info.cpp index effc3472..4af35144 100644 --- a/rdadmin/view_node_info.cpp +++ b/rdadmin/view_node_info.cpp @@ -72,7 +72,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) QLabel *label=new QLabel(view_hostname_edit,tr("Hostname:"),this); label->setGeometry(10,10,80,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Node TCP Port @@ -83,7 +83,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) label=new QLabel(view_tcpport_edit,tr("Port:"),this); label->setGeometry(305,10,30,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // System Version @@ -94,7 +94,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) label=new QLabel(view_system_edit,tr("System Version:"),this); label->setGeometry(10,32,120,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Protocol Version @@ -105,7 +105,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) label=new QLabel(view_protocol_edit,tr("Protocol Version:"),this); label->setGeometry(210,32,120,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Sources @@ -116,7 +116,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) label=new QLabel(view_sources_edit,tr("Sources:"),this); label->setGeometry(10,54,60,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Destinations @@ -127,7 +127,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) label=new QLabel(view_destinations_edit,tr("Destinations:"),this); label->setGeometry(120,54,100,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Channels @@ -138,7 +138,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) label=new QLabel(view_channels_edit,tr("Channels:"),this); label->setGeometry(260,54,95,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // GPIs @@ -149,7 +149,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) label=new QLabel(view_gpis_edit,tr("GPIs:"),this); label->setGeometry(10,76,120,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // GPOs @@ -160,7 +160,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) label=new QLabel(view_gpos_edit,tr("GPOs:"),this); label->setGeometry(210,76,90,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Sources List @@ -168,7 +168,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) label=new QLabel(view_gpos_edit,tr("Sources"),this); label->setGeometry(15,98,90,20); label->setFont(bold_font); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); view_sources_view=new RDListView(this); view_sources_view->setGeometry(10,118,sizeHint().width()-20,200); view_sources_view->setAllColumnsShowFocus(true); @@ -195,7 +195,7 @@ ViewNodeInfo::ViewNodeInfo(QWidget *parent) label=new QLabel(view_gpos_edit,tr("Destinations"),this); label->setGeometry(15,325,90,20); label->setFont(bold_font); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); view_destinations_view=new RDListView(this); view_destinations_view-> setGeometry(10,345,sizeHint().width()-20,200); diff --git a/rdairplay/Makefile.am b/rdairplay/Makefile.am index 3dd75fa9..52d14c7e 100644 --- a/rdairplay/Makefile.am +++ b/rdairplay/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/rdairplay ## -## (C) 2002-2008,2016 Fred Gleason +## (C) 2002-2008,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +20,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -Wno-strict-aliasing -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,8 +37,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdairplay_*.qm all: - @QT_BIN@/lupdate rdairplay.pro - @QT_BIN@/lrelease rdairplay.pro + lupdate-qt4 rdairplay.pro + lrelease-qt4 rdairplay.pro bin_PROGRAMS = rdairplay @@ -75,7 +75,7 @@ nodist_rdairplay_SOURCES = moc_button_log.cpp\ moc_stop_counter.cpp\ moc_wall_clock.cpp -rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support rdairplay_LDFLAGS = -rdynamic EXTRA_DIST = rdairplay.pro\ diff --git a/rdairplay/colors.h b/rdairplay/colors.h index 750a6230..4315816b 100644 --- a/rdairplay/colors.h +++ b/rdairplay/colors.h @@ -40,20 +40,20 @@ // // Wall Clock // -#define BUTTON_TIME_SYNC_LOST_COLOR red +#define BUTTON_TIME_SYNC_LOST_COLOR Qt::red // // Mode Button // -#define BUTTON_MODE_LIVE_ASSIST_COLOR yellow -#define BUTTON_MODE_AUTO_COLOR green -#define BUTTON_MODE_MANUAL_COLOR red +#define BUTTON_MODE_LIVE_ASSIST_COLOR Qt::yellow +#define BUTTON_MODE_AUTO_COLOR Qt::green +#define BUTTON_MODE_MANUAL_COLOR Qt::red // // Log Selector Buttons // -#define BUTTON_LOG_ACTIVE_TEXT_COLOR white -#define BUTTON_LOG_ACTIVE_BACKGROUND_COLOR blue +#define BUTTON_LOG_ACTIVE_TEXT_COLOR Qt::white +#define BUTTON_LOG_ACTIVE_BACKGROUND_COLOR Qt::blue // // Full Log Colors @@ -64,33 +64,33 @@ // // Pie Counter Color // -#define PIE_COUNTER_COLOR darkGreen -#define PIE_TALK_COLOR blue -#define PIE_FINAL_COLOR black -#define PIE_FINAL_BG_COLOR white -#define PIE_ONAIR_COLOR red +#define PIE_COUNTER_COLOR Qt::darkGreen +#define PIE_TALK_COLOR Qt::blue +#define PIE_FINAL_COLOR Qt::black +#define PIE_FINAL_BG_COLOR Qt::white +#define PIE_ONAIR_COLOR Qt::red // // Widget Colors // -#define AIR_FLASH_COLOR blue -#define AIR_ERROR_COLOR red +#define AIR_FLASH_COLOR Qt::blue +#define AIR_ERROR_COLOR Qt::red // // LogLineBox Colors // -#define LOGLINEBOX_BACKGROUND_COLOR white -#define LOGLINEBOX_MISSING_COLOR red -#define LOGLINEBOX_MARKER_COLOR cyan -#define LOGLINEBOX_CHAIN_COLOR magenta +#define LOGLINEBOX_BACKGROUND_COLOR Qt::white +#define LOGLINEBOX_MISSING_COLOR Qt::red +#define LOGLINEBOX_MARKER_COLOR Qt::cyan +#define LOGLINEBOX_CHAIN_COLOR Qt::magenta #define LOGLINEBOX_EVERGREEN_COLOR "#008000" -#define LOGLINEBOX_TIMESCALE_COLOR green +#define LOGLINEBOX_TIMESCALE_COLOR Qt::green // // Post Point Widget // -#define POSTPOINT_EARLY_COLOR yellow -#define POSTPOINT_ONTIME_COLOR green -#define POSTPOINT_LATE_COLOR red +#define POSTPOINT_EARLY_COLOR Qt::yellow +#define POSTPOINT_ONTIME_COLOR Qt::green +#define POSTPOINT_LATE_COLOR Qt::red #endif // COLORS_H diff --git a/rdairplay/edit_event.cpp b/rdairplay/edit_event.cpp index 938a516b..c1888570 100644 --- a/rdairplay/edit_event.cpp +++ b/rdairplay/edit_event.cpp @@ -22,6 +22,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -56,7 +60,7 @@ EditEvent::EditEvent(RDLogPlay *log,RDCae *cae,QWidget *parent) // edit_timetype_box=new QCheckBox(this); edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); - edit_timetype_label->setAlignment(AlignLeft|AlignVCenter); + edit_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Start Time @@ -71,7 +75,7 @@ EditEvent::EditEvent(RDLogPlay *log,RDCae *cae,QWidget *parent) // Grace Time // edit_grace_group - =new QButtonGroup(1,Qt::Vertical, + =new Q3ButtonGroup(1,Qt::Vertical, tr("Action If Previous Event Still Playing"),this); edit_grace_group->setFont(label_font); edit_grace_group->setRadioButtonExclusive(true); @@ -104,14 +108,14 @@ EditEvent::EditEvent(RDLogPlay *log,RDCae *cae,QWidget *parent) edit_time_label= new QLabel(edit_transtype_box,tr("Start Transition Type:"),this); edit_time_label->setFont(label_font); - edit_time_label->setAlignment(AlignRight|AlignVCenter); + edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // Overlap Box edit_overlap_box=new QCheckBox(this); edit_overlap_label= new QLabel(edit_overlap_box,tr("No Fade at Segue Out"),this); edit_overlap_label->setFont(button_font); - edit_overlap_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + edit_overlap_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // @@ -120,11 +124,10 @@ EditEvent::EditEvent(RDLogPlay *log,RDCae *cae,QWidget *parent) edit_horizrule_label=new QLabel(this); QPixmap *pix=new QPixmap(sizeHint().width(),3); QPainter *p=new QPainter(pix); - p->setPen(QColor(black)); - p->setBrush(QColor(black)); + p->setPen(Qt::black); + p->setBrush(Qt::black); p->fillRect(0,0,sizeHint().width(),3,backgroundColor()); - p->moveTo(10,1); - p->lineTo(sizeHint().width()-10,1); + p->drawLine(10,1,sizeHint().width()-10,1); p->end(); edit_horizrule_label->setPixmap(*pix); delete p; @@ -141,7 +144,7 @@ EditEvent::EditEvent(RDLogPlay *log,RDCae *cae,QWidget *parent) // edit_cart_notes_label=new QLabel(tr("Cart Notes"),this); edit_cart_notes_label->setFont(label_font); - edit_cart_notes_text=new QTextEdit(this); + edit_cart_notes_text=new Q3TextEdit(this); edit_cart_notes_text->setFont(notes_font); edit_cart_notes_text->setReadOnly(true); diff --git a/rdairplay/edit_event.h b/rdairplay/edit_event.h index 5db68066..443ef3ef 100644 --- a/rdairplay/edit_event.h +++ b/rdairplay/edit_event.h @@ -24,13 +24,16 @@ #include #include #include -#include +#include #include -#include +#include #include #include -#include +#include #include +//Added by qt3to4: +#include +#include #include #include @@ -73,7 +76,7 @@ class EditEvent : public QDialog bool edit_time_changed; QCheckBox *edit_timetype_box; QLabel *edit_timetype_label; - QButtonGroup *edit_grace_group; + Q3ButtonGroup *edit_grace_group; RDTimeEdit *edit_grace_edit; QLabel *edit_time_label; QComboBox *edit_transtype_box; @@ -83,7 +86,7 @@ class EditEvent : public QDialog RDCueEdit *edit_cue_edit; QFont normal_font; QLabel *edit_cart_notes_label; - QTextEdit *edit_cart_notes_text; + Q3TextEdit *edit_cart_notes_text; QPushButton *edit_ok_button; QPushButton *edit_cancel_button; QLabel *edit_horizrule_label; diff --git a/rdairplay/hourselector.cpp b/rdairplay/hourselector.cpp index 69f234aa..970bd6d5 100644 --- a/rdairplay/hourselector.cpp +++ b/rdairplay/hourselector.cpp @@ -19,6 +19,8 @@ // #include +//Added by qt3to4: +#include #include diff --git a/rdairplay/hourselector.h b/rdairplay/hourselector.h index 8e6b9380..c4e2bbbc 100644 --- a/rdairplay/hourselector.h +++ b/rdairplay/hourselector.h @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/rdairplay/lib_listview.cpp b/rdairplay/lib_listview.cpp index b8cbee10..a414c4db 100644 --- a/rdairplay/lib_listview.cpp +++ b/rdairplay/lib_listview.cpp @@ -18,7 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include +#include +//Added by qt3to4: +#include +#include #include diff --git a/rdairplay/lib_listview.h b/rdairplay/lib_listview.h index f2835fdc..5177ad3e 100644 --- a/rdairplay/lib_listview.h +++ b/rdairplay/lib_listview.h @@ -23,6 +23,9 @@ #include #include +//Added by qt3to4: +#include +#include class LibListView : public RDListView { diff --git a/rdairplay/list_log.cpp b/rdairplay/list_log.cpp index fba5290f..b984b704 100644 --- a/rdairplay/list_log.cpp +++ b/rdairplay/list_log.cpp @@ -22,6 +22,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -173,7 +176,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, } list_log_list->setGeometry(0,y,sizeHint().width(),h); list_log_list->setAllColumnsShowFocus(true); - list_log_list->setSelectionMode(QListView::Extended); + list_log_list->setSelectionMode(Q3ListView::Extended); list_log_list->setItemMargin(5); list_log_list->addColumn(""); list_log_list->setColumnAlignment(0,Qt::AlignHCenter); @@ -210,13 +213,13 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_log_list->addColumn(tr("STATUS")); list_log_list->setColumnAlignment(16,Qt::AlignHCenter); list_log_list->setHardSortColumn(15); - list_log_list->setFocusPolicy(QWidget::NoFocus); + list_log_list->setFocusPolicy(Qt::NoFocus); connect(list_log_list,SIGNAL(selectionChanged()), this,SLOT(selectionChangedData())); connect(list_log_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleclickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleclickedData(Q3ListViewItem *,const QPoint &,int))); connect(list_log_list,SIGNAL(cartDropped(int,RDLogLine *)), this,SLOT(cartDroppedData(int,RDLogLine *))); @@ -231,7 +234,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, QLabel *label=new QLabel(tr("Run Length"),this); label->setGeometry(372,sizeHint().height()-120,75,20); label->setFont(label_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label->setBackgroundColor(QColor(system_mid_color)); if(!rda->airplayConf()->showCounters()) { label->hide(); @@ -245,7 +248,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_stoptime_label=new QLabel(list_stoptime_edit,tr("Next Stop:"),this); list_stoptime_label->setGeometry(337,sizeHint().height()-100,65,18); list_stoptime_label->setFont(label_font); - list_stoptime_label->setAlignment(AlignRight|AlignVCenter); + list_stoptime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); list_stoptime_label->setBackgroundColor(QColor(system_mid_color)); if(!rda->airplayConf()->showCounters()) { list_stoptime_edit->hide(); @@ -260,7 +263,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_endtime_label=new QLabel(list_endtime_edit,tr("Log End:"),this); list_endtime_label->setGeometry(337,sizeHint().height()-80,65,18); list_endtime_label->setFont(label_font); - list_endtime_label->setAlignment(AlignRight|AlignVCenter); + list_endtime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); list_endtime_label->setBackgroundColor(QColor(system_mid_color)); if(!rda->airplayConf()->showCounters()) { list_endtime_edit->hide(); @@ -275,7 +278,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_take_button->setFont(font); list_take_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); list_take_button->setText(tr("Select")); - list_take_button->setFocusPolicy(QWidget::NoFocus); + list_take_button->setFocusPolicy(Qt::NoFocus); connect(list_take_button,SIGNAL(clicked()),this,SLOT(takeButtonData())); list_take_button->hide(); @@ -287,7 +290,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_head_button->setFont(font); list_head_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); list_head_button->setText(tr("Audition\nHead")); - list_head_button->setFocusPolicy(QWidget::NoFocus); + list_head_button->setFocusPolicy(Qt::NoFocus); connect(list_head_button,SIGNAL(clicked()),this,SLOT(headButtonData())); if(!rda->airplayConf()->showCounters()) { list_head_button->hide(); @@ -301,7 +304,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_tail_button->setFont(font); list_tail_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); list_tail_button->setText(tr("Audition\nTail")); - list_tail_button->setFocusPolicy(QWidget::NoFocus); + list_tail_button->setFocusPolicy(Qt::NoFocus); connect(list_tail_button,SIGNAL(clicked()),this,SLOT(tailButtonData())); if(!rda->airplayConf()->showCounters()) { list_tail_button->hide(); @@ -316,7 +319,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_play_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); list_play_button->setText(tr("Start")); list_play_button->setDisabled(true); - list_play_button->setFocusPolicy(QWidget::NoFocus); + list_play_button->setFocusPolicy(Qt::NoFocus); connect(list_play_button,SIGNAL(clicked()),this,SLOT(playButtonData())); // @@ -328,7 +331,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_next_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); list_next_button->setText(tr("Make\nNext")); list_next_button->setDisabled(true); - list_next_button->setFocusPolicy(QWidget::NoFocus); + list_next_button->setFocusPolicy(Qt::NoFocus); connect(list_next_button,SIGNAL(clicked()),this,SLOT(nextButtonData())); // @@ -340,7 +343,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_modify_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); list_modify_button->setText(tr("Modify")); list_modify_button->setDisabled(true); - list_modify_button->setFocusPolicy(QWidget::NoFocus); + list_modify_button->setFocusPolicy(Qt::NoFocus); connect(list_modify_button,SIGNAL(clicked()),this,SLOT(modifyButtonData())); // @@ -351,7 +354,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_scroll_button->setFont(font); list_scroll_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); list_scroll_button->setText(tr("Scroll")); - list_scroll_button->setFocusPolicy(QWidget::NoFocus); + list_scroll_button->setFocusPolicy(Qt::NoFocus); connect(list_scroll_button,SIGNAL(clicked()),this,SLOT(scrollButtonData())); list_scroll_button->setPalette(list_scroll_color[0]); @@ -364,7 +367,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_refresh_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); list_refresh_button->setText(tr("Refresh\nLog")); list_refresh_button->setDisabled(true); - list_refresh_button->setFocusPolicy(QWidget::NoFocus); + list_refresh_button->setFocusPolicy(Qt::NoFocus); connect(list_refresh_button,SIGNAL(clicked()), this,SLOT(refreshButtonData())); @@ -377,7 +380,7 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_load_button->setFont(font); list_load_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); list_load_button->setText(tr("Select\nLog")); - list_load_button->setFocusPolicy(QWidget::NoFocus); + list_load_button->setFocusPolicy(Qt::NoFocus); connect(list_load_button,SIGNAL(clicked()),this,SLOT(loadButtonData())); // @@ -475,7 +478,7 @@ void ListLog::setActionMode(RDAirPlayConf::ActionMode mode,int *cartnum) } switch(mode) { case RDAirPlayConf::Normal: - list_log_list->setSelectionMode(QListView::Extended); + list_log_list->setSelectionMode(Q3ListView::Extended); list_log_list->setPalette(palette()); list_take_button->hide(); list_play_button->show(); @@ -487,7 +490,7 @@ void ListLog::setActionMode(RDAirPlayConf::ActionMode mode,int *cartnum) break; case RDAirPlayConf::AddTo: - list_log_list->setSelectionMode(QListView::Single); + list_log_list->setSelectionMode(Q3ListView::Single); list_log_list->setPalette(list_list_to_color); list_take_button->setText(ADD_TO_MODE_TITLE); list_take_button->setPalette(list_to_color); @@ -501,7 +504,7 @@ void ListLog::setActionMode(RDAirPlayConf::ActionMode mode,int *cartnum) break; case RDAirPlayConf::DeleteFrom: - list_log_list->setSelectionMode(QListView::Single); + list_log_list->setSelectionMode(Q3ListView::Single); list_log_list->setPalette(list_list_from_color); list_take_button->setText(DELETE_FROM_MODE_TITLE); list_take_button->setPalette(list_from_color); @@ -515,7 +518,7 @@ void ListLog::setActionMode(RDAirPlayConf::ActionMode mode,int *cartnum) break; case RDAirPlayConf::MoveFrom: - list_log_list->setSelectionMode(QListView::Single); + list_log_list->setSelectionMode(Q3ListView::Single); list_log_list->setPalette(list_list_from_color); list_take_button->setText(MOVE_FROM_MODE_TITLE); list_take_button->setPalette(list_from_color); @@ -529,7 +532,7 @@ void ListLog::setActionMode(RDAirPlayConf::ActionMode mode,int *cartnum) break; case RDAirPlayConf::MoveTo: - list_log_list->setSelectionMode(QListView::Single); + list_log_list->setSelectionMode(Q3ListView::Single); list_log_list->setPalette(list_list_to_color); list_take_button->setText(MOVE_TO_MODE_TITLE); list_take_button->setPalette(list_to_color); @@ -543,7 +546,7 @@ void ListLog::setActionMode(RDAirPlayConf::ActionMode mode,int *cartnum) break; case RDAirPlayConf::CopyFrom: - list_log_list->setSelectionMode(QListView::Single); + list_log_list->setSelectionMode(Q3ListView::Single); list_log_list->setPalette(list_list_from_color); list_take_button->setText(COPY_FROM_MODE_TITLE); list_take_button->setPalette(list_from_color); @@ -557,7 +560,7 @@ void ListLog::setActionMode(RDAirPlayConf::ActionMode mode,int *cartnum) break; case RDAirPlayConf::CopyTo: - list_log_list->setSelectionMode(QListView::Single); + list_log_list->setSelectionMode(Q3ListView::Single); list_log_list->setPalette(list_list_to_color); list_take_button->setText(COPY_TO_MODE_TITLE); list_take_button->setPalette(list_to_color); @@ -811,7 +814,7 @@ void ListLog::modifyButtonData() } -void ListLog::doubleclickedData(QListViewItem *,const QPoint &,int) +void ListLog::doubleclickedData(Q3ListViewItem *,const QPoint &,int) { modifyButtonData(); } @@ -1093,13 +1096,12 @@ void ListLog::paintEvent(QPaintEvent *e) int y=sizeHint().height()-111; QPainter *p=new QPainter(this); - p->setPen(black); - p->setBrush(black); - p->moveTo(x,y); - p->lineTo(x+146,y); - p->lineTo(x+146,y+53); - p->lineTo(x,y+53); - p->lineTo(x,y); + p->setPen(Qt::black); + p->setBrush(Qt::black); + p->drawLine(x,y,x+146,y); + p->drawLine(x+146,y,x+146,y+53); + p->drawLine(x+146,y+53,x,y+53); + p->drawLine(x,y+53,x,y); p->end(); delete p; diff --git a/rdairplay/list_log.h b/rdairplay/list_log.h index 560366e4..f8b6fda8 100644 --- a/rdairplay/list_log.h +++ b/rdairplay/list_log.h @@ -26,6 +26,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -71,7 +73,7 @@ class ListLog : public QWidget void takeButtonData(); void playButtonData(); void modifyButtonData(); - void doubleclickedData(QListViewItem *,const QPoint &,int); + void doubleclickedData(Q3ListViewItem *,const QPoint &,int); void scrollButtonData(); void refreshButtonData(); void nextButtonData(); diff --git a/rdairplay/list_logs.cpp b/rdairplay/list_logs.cpp index 03358f74..13cf4ec5 100644 --- a/rdairplay/list_logs.cpp +++ b/rdairplay/list_logs.cpp @@ -20,6 +20,9 @@ #include #include +//Added by qt3to4: +#include +#include #include #include @@ -57,13 +60,13 @@ ListLogs::ListLogs(RDLogPlay *log,QWidget *parent) // // Log List // - list_log_list=new QListView(this); + list_log_list=new Q3ListView(this); list_log_list->setAllColumnsShowFocus(true); list_log_list->setItemMargin(5); connect(list_log_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); list_log_list->addColumn(tr("NAME")); list_log_list->setColumnAlignment(0,Qt::AlignLeft); list_log_list->addColumn(tr("DESCRIPTION")); @@ -156,7 +159,7 @@ void ListLogs::closeEvent(QCloseEvent *e) } -void ListLogs::doubleClickedData(QListViewItem *,const QPoint &,int) +void ListLogs::doubleClickedData(Q3ListViewItem *,const QPoint &,int) { loadButtonData(); } @@ -164,7 +167,7 @@ void ListLogs::doubleClickedData(QListViewItem *,const QPoint &,int) void ListLogs::loadButtonData() { - QListViewItem *item=list_log_list->selectedItem(); + Q3ListViewItem *item=list_log_list->selectedItem(); if(item==NULL) { return; } @@ -247,7 +250,7 @@ void ListLogs::RefreshList() { RDSqlQuery *q; QString sql; - QListViewItem *l; + Q3ListViewItem *l; QDate current_date=QDate::currentDate(); QStringList services_list; @@ -263,7 +266,7 @@ void ListLogs::RefreshList() list_filter_widget->whereSql(); q=new RDSqlQuery(sql); while(q->next()) { - l=new QListViewItem(list_log_list); + l=new Q3ListViewItem(list_log_list); l->setText(0,q->value(0).toString()); l->setText(1,q->value(1).toString()); l->setText(2,q->value(2).toString()); diff --git a/rdairplay/list_logs.h b/rdairplay/list_logs.h index e16bacfd..862e876e 100644 --- a/rdairplay/list_logs.h +++ b/rdairplay/list_logs.h @@ -23,8 +23,11 @@ #include #include -#include +#include #include +//Added by qt3to4: +#include +#include #include #include @@ -45,7 +48,7 @@ class ListLogs : public QDialog private slots: void filterChangedData(const QString &where_sql); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void closeEvent(QCloseEvent *); void loadButtonData(); void saveButtonData(); @@ -60,7 +63,7 @@ class ListLogs : public QDialog void RefreshList(); bool TryLock(RDLogLock *lock); RDLogFilter *list_filter_widget; - QListView *list_log_list; + Q3ListView *list_log_list; QString *list_logname; QString *list_svcname; QPushButton *list_load_button; diff --git a/rdairplay/local_macros.cpp b/rdairplay/local_macros.cpp index b035c51f..022b4c50 100644 --- a/rdairplay/local_macros.cpp +++ b/rdairplay/local_macros.cpp @@ -58,9 +58,9 @@ void MainWidget::RunLocalMacros(RDMacro *rml) } str+=rml->arg(rml->argQuantity()-1); pal=air_message_label->palette(); - pal.setColor(QPalette::Active,QColorGroup::Foreground,QColor(black)); + pal.setColor(QPalette::Active,QColorGroup::Foreground,QColor(Qt::black)); pal.setColor(QPalette::Inactive,QColorGroup::Foreground, - QColor(black)); + QColor(Qt::black)); air_message_label->setPalette(pal); air_message_label->setFont(MessageFont(str)); air_message_label->setText(str); @@ -78,7 +78,7 @@ void MainWidget::RunLocalMacros(RDMacro *rml) else { QColor color(rml->arg(0)); if(!color.isValid()) { - color=QColor(black); + color=QColor(Qt::black); } for(int i=1;i<(rml->argQuantity()-1);i++) { str+=(rml->arg(i)+" "); diff --git a/rdairplay/loglinebox.cpp b/rdairplay/loglinebox.cpp index 16daa253..b5a9bc19 100644 --- a/rdairplay/loglinebox.cpp +++ b/rdairplay/loglinebox.cpp @@ -19,6 +19,13 @@ // #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include #include #include @@ -130,23 +137,23 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) line_text_palette=palette(); line_text_palette.setColor(QPalette::Active,QColorGroup::Foreground, - QColor(black)); + QColor(Qt::black)); line_text_palette.setColor(QPalette::Inactive,QColorGroup::Foreground, - QColor(black)); + QColor(Qt::black)); // // Count Up // line_up_label=new QLabel(this); line_up_label->setGeometry(5,65,65,16); - line_up_label->setAlignment(AlignLeft|AlignVCenter); + line_up_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); line_up_label->setFont(line_font); line_up_label->hide(); // // Position Slider // - line_position_bar=new QProgressBar(this); + line_position_bar=new Q3ProgressBar(this); line_position_bar->setGeometry(75,66,sizeHint().width()-150,13); line_position_bar->setPercentageVisible(false); line_position_bar->hide(); @@ -156,7 +163,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) // line_down_label=new QLabel(this); line_down_label->setGeometry(sizeHint().width()-72,65,65,16); - line_down_label->setAlignment(AlignLeft|AlignVCenter); + line_down_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); line_down_label->setFont(line_font); line_down_label->hide(); @@ -196,7 +203,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) line_comment_label=new RDLabel(this); line_comment_label->setGeometry(5,18,sizeHint().width()-10,62); line_comment_label->setFont(line_font); - line_comment_label->setAlignment(AlignTop|AlignLeft); + line_comment_label->setAlignment(Qt::AlignTop|Qt::AlignLeft); line_comment_label->setWordWrapEnabled(true); line_comment_label->hide(); @@ -233,7 +240,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) line_time_label=new QLabel(this); line_time_label->setGeometry(185,3,70,16); line_time_label->setFont(line_font); - line_time_label->setAlignment(AlignRight); + line_time_label->setAlignment(Qt::AlignRight); line_time_label->setPalette(line_time_palette); // @@ -242,7 +249,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) line_talktime_label=new QLabel(this); line_talktime_label->setGeometry(257,3,36,16); line_talktime_label->setFont(talk_font); - line_talktime_label->setAlignment(AlignRight); + line_talktime_label->setAlignment(Qt::AlignRight); // // Length @@ -250,14 +257,14 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent) line_length_label=new QLabel(this); line_length_label->setGeometry(297,3,40,16); line_length_label->setFont(line_font); - line_length_label->setAlignment(AlignRight); + line_length_label->setAlignment(Qt::AlignRight); // // Transition Type // line_trans_label=new QLabel(this); line_trans_label->setGeometry(sizeHint().width()-53,3,48,16); - line_trans_label->setAlignment(AlignRight); + line_trans_label->setAlignment(Qt::AlignRight); line_trans_label->setFont(line_bold_font); SetColor(QColor(LOGLINEBOX_BACKGROUND_COLOR)); @@ -869,7 +876,7 @@ void LogLineBox::SetColor(QColor color) line_talktime_label->setPalette(line_text_palette); line_up_label->setBackgroundColor(color); line_up_label->setPalette(line_text_palette); - line_position_bar->setBackgroundColor(QColor(lightGray)); + line_position_bar->setBackgroundColor(QColor(Qt::lightGray)); line_down_label->setBackgroundColor(color); line_down_label->setPalette(line_text_palette); line_comment_label->setBackgroundColor(color); diff --git a/rdairplay/loglinebox.h b/rdairplay/loglinebox.h index 89193fc4..ccd0c56a 100644 --- a/rdairplay/loglinebox.h +++ b/rdairplay/loglinebox.h @@ -27,9 +27,15 @@ #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include #include #include @@ -106,7 +112,7 @@ class LogLineBox : public QWidget QLabel *line_up_label; QLabel *line_down_label; RDLabel *line_comment_label; - QProgressBar *line_position_bar; + Q3ProgressBar *line_position_bar; QTimer *line_countdown_timer; QTime line_end_time; int log_id; diff --git a/rdairplay/mode_display.cpp b/rdairplay/mode_display.cpp index 2c393862..2906bd55 100644 --- a/rdairplay/mode_display.cpp +++ b/rdairplay/mode_display.cpp @@ -19,6 +19,8 @@ // #include +//Added by qt3to4: +#include #include #include @@ -99,7 +101,7 @@ void ModeDisplay::WriteMap() case RDAirPlayConf::LiveAssist: p->fillRect(0,0,sizeHint().width(),sizeHint().height(), BUTTON_MODE_LIVE_ASSIST_COLOR); - p->setPen(QColor(color1)); + p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); p->drawText((sizeHint().width()-p->fontMetrics(). width(tr("Operating Mode")))/2, @@ -113,7 +115,7 @@ void ModeDisplay::WriteMap() case RDAirPlayConf::Auto: p->fillRect(0,0,sizeHint().width(),sizeHint().height(), BUTTON_MODE_AUTO_COLOR); - p->setPen(QColor(color1)); + p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); p->drawText((sizeHint().width()-p->fontMetrics(). width(tr("Operating Mode")))/2, @@ -127,7 +129,7 @@ void ModeDisplay::WriteMap() case RDAirPlayConf::Manual: p->fillRect(0,0,sizeHint().width(),sizeHint().height(), BUTTON_MODE_MANUAL_COLOR); - p->setPen(QColor(color1)); + p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); p->drawText((sizeHint().width()-p->fontMetrics(). width(tr("Operating Mode")))/2, @@ -147,7 +149,7 @@ void ModeDisplay::WriteMap() case RDAirPlayConf::LiveAssist: p->fillRect(0,0,sizeHint().width(),sizeHint().height(), BUTTON_MODE_LIVE_ASSIST_COLOR); - p->setPen(QColor(color1)); + p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); p->drawText((sizeHint().width()-p->fontMetrics(). width(tr("Operating Mode")))/2, @@ -161,7 +163,7 @@ void ModeDisplay::WriteMap() case RDAirPlayConf::Auto: p->fillRect(0,0,sizeHint().width(),sizeHint().height(), BUTTON_MODE_AUTO_COLOR); - p->setPen(QColor(color1)); + p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); p->drawText((sizeHint().width()-p->fontMetrics(). width(tr("Operating Mode")))/2, @@ -175,7 +177,7 @@ void ModeDisplay::WriteMap() case RDAirPlayConf::Manual: p->fillRect(0,0,sizeHint().width(),sizeHint().height(), BUTTON_MODE_MANUAL_COLOR); - p->setPen(QColor(color1)); + p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); p->drawText((sizeHint().width()-p->fontMetrics(). width(tr("Operating Mode")))/2, diff --git a/rdairplay/pie_counter.cpp b/rdairplay/pie_counter.cpp index 4af01c50..a14a5f29 100644 --- a/rdairplay/pie_counter.cpp +++ b/rdairplay/pie_counter.cpp @@ -21,6 +21,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include @@ -48,7 +51,7 @@ PieCounter::PieCounter(int count_length,QWidget *parent) pie_time_label-> setGeometry(PIE_X_PADDING+ring+25,PIE_Y_PADDING+ring+32,48,36); pie_time_label->setFont(font); - pie_time_label->setAlignment(AlignCenter); + pie_time_label->setAlignment(Qt::AlignCenter); pie_time_label->hide(); pie_talk_label=new QLabel(":00",this,"pie_talk_label"); @@ -59,7 +62,7 @@ PieCounter::PieCounter(int count_length,QWidget *parent) setColor(QPalette::Active,QColorGroup::Foreground,QColor(PIE_TALK_COLOR)); pie_talk_label->setPalette(pal); pie_talk_label->setFont(font); - pie_talk_label->setAlignment(AlignCenter); + pie_talk_label->setAlignment(Qt::AlignCenter); pie_talk_label->hide(); onair_off_color=backgroundColor(); pie_logline=NULL; @@ -245,7 +248,7 @@ void PieCounter::paintEvent(QPaintEvent *e) (int)(1440.0-5760.0*(double)pie_talk_start/(double)pie_length); int talk_angle=(int) (-5760.0*((double)pie_talk_end-(double)pie_talk_start)/(double)pie_length); - QPainter *p=new QPainter(&pix,false); + QPainter *p=new QPainter(&pix); double ring_angle = ((pie_length < (pie_count_length) ? pie_length : pie_count_length) - ((pie_time > pie_count_length) ? pie_count_length : pie_time)); if (pie_count_length) diff --git a/rdairplay/pie_counter.h b/rdairplay/pie_counter.h index 5c7634d9..634c18f1 100644 --- a/rdairplay/pie_counter.h +++ b/rdairplay/pie_counter.h @@ -25,6 +25,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/rdairplay/post_counter.cpp b/rdairplay/post_counter.cpp index 5c6e941b..31992603 100644 --- a/rdairplay/post_counter.cpp +++ b/rdairplay/post_counter.cpp @@ -20,6 +20,8 @@ #include #include +//Added by qt3to4: +#include #include @@ -159,7 +161,7 @@ void PostCounter::UpdateDisplay() color=POSTPOINT_ONTIME_COLOR; } } - system_button_text_color = color1; + system_button_text_color=Qt::color1; } else { state="--------"; diff --git a/rdairplay/post_counter.h b/rdairplay/post_counter.h index ac04e8c1..f1c0800f 100644 --- a/rdairplay/post_counter.h +++ b/rdairplay/post_counter.h @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include #include // // Settings diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp index a00a78c7..96ee3c6c 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -32,15 +32,21 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include #include #include @@ -144,8 +150,8 @@ MainWidget::MainWidget(QWidget *parent) QMessageBox::critical(this,"RDAirPlay - "+tr("Error"),err_msg); exit(1); } - connect(RDDbStatus(),SIGNAL(logText(RDConfig::LogPriority,const QString &)), - this,SLOT(logLine(RDConfig::LogPriority,const QString &))); + // connect(RDDbStatus(),SIGNAL(logText(RDConfig::LogPriority,const QString &)), + // this,SLOT(logLine(RDConfig::LogPriority,const QString &))); // @@ -158,7 +164,7 @@ MainWidget::MainWidget(QWidget *parent) for(unsigned j=0;jcmdSwitch()->keys();j++) { if(rda->cmdSwitch()->key(j)==QString().sprintf("--log%u",i+1)) { air_start_logname[i]=rda->cmdSwitch()->value(j); - for(unsigned k=0;kcmdSwitch()->value(j).length();k++) { + for(int k=0;kcmdSwitch()->value(j).length();k++) { if(rda->cmdSwitch()->value(j).at(k)==QChar(':')) { air_start_logname[i]= RDDateTimeDecode(rda->cmdSwitch()->value(j).left(k), @@ -336,7 +342,7 @@ MainWidget::MainWidget(QWidget *parent) // // UDP Transmission Socket // - air_nownext_socket=new QSocketDevice(QSocketDevice::Datagram); + air_nownext_socket=new Q3SocketDevice(Q3SocketDevice::Datagram); // // Log Machines @@ -417,7 +423,7 @@ MainWidget::MainWidget(QWidget *parent) setGeometry(10,5,clock->sizeHint().width(),clock->sizeHint().height()); clock->setCheckSyncEnabled(rda->airplayConf()->checkTimesync()); connect(air_master_timer,SIGNAL(timeout()),clock,SLOT(tickClock())); - clock->setFocusPolicy(QWidget::NoFocus); + clock->setFocusPolicy(Qt::NoFocus); connect(clock,SIGNAL(timeModeChanged(RDAirPlayConf::TimeMode)), this,SLOT(timeModeData(RDAirPlayConf::TimeMode))); @@ -428,7 +434,7 @@ MainWidget::MainWidget(QWidget *parent) air_post_counter->setGeometry(220,5,air_post_counter->sizeHint().width(), air_post_counter->sizeHint().height()); air_post_counter->setPostPoint(QTime(),0,false,false); - air_post_counter->setFocusPolicy(QWidget::NoFocus); + air_post_counter->setFocusPolicy(Qt::NoFocus); connect(air_master_timer,SIGNAL(timeout()), air_post_counter,SLOT(tickCounter())); connect(air_log[0],SIGNAL(postPointChanged(QTime,int,bool,bool)), @@ -443,7 +449,7 @@ MainWidget::MainWidget(QWidget *parent) air_pie_counter->setCountLength(rda->airplayConf()->pieCountLength()); air_pie_end=rda->airplayConf()->pieEndPoint(); air_pie_counter->setOpMode(air_op_mode[0]); - air_pie_counter->setFocusPolicy(QWidget::NoFocus); + air_pie_counter->setFocusPolicy(Qt::NoFocus); if(mainmap!=NULL) { pm=new QPixmap(1024,738); pd=new QPainter(pm); @@ -465,7 +471,7 @@ MainWidget::MainWidget(QWidget *parent) air_stereo_meter->setGeometry(50,70,air_stereo_meter->sizeHint().width(), air_stereo_meter->sizeHint().height()); air_stereo_meter->setMode(RDSegMeter::Peak); - air_stereo_meter->setFocusPolicy(QWidget::NoFocus); + air_stereo_meter->setFocusPolicy(Qt::NoFocus); if(rda->config()->useStreamMeters()) { air_stereo_meter->hide(); } @@ -479,9 +485,9 @@ MainWidget::MainWidget(QWidget *parent) air_message_label->setWordWrapEnabled(true); air_message_label->setLineWidth(1); air_message_label->setMidLineWidth(1); - air_message_label->setFrameStyle(QFrame::Box|QFrame::Raised); - air_message_label->setAlignment(AlignCenter); - air_message_label->setFocusPolicy(QWidget::NoFocus); + air_message_label->setFrameStyle(Q3Frame::Box|Q3Frame::Raised); + air_message_label->setAlignment(Qt::AlignCenter); + air_message_label->setFocusPolicy(Qt::NoFocus); // // Stop Counter @@ -490,7 +496,7 @@ MainWidget::MainWidget(QWidget *parent) air_stop_counter->setGeometry(600,5,air_stop_counter->sizeHint().width(), air_stop_counter->sizeHint().height()); air_stop_counter->setTime(QTime(0,0,0)); - air_stop_counter->setFocusPolicy(QWidget::NoFocus); + air_stop_counter->setFocusPolicy(Qt::NoFocus); connect(air_master_timer,SIGNAL(timeout()), air_stop_counter,SLOT(tickCounter())); connect(air_log[0],SIGNAL(nextStopChanged(QTime)), @@ -504,7 +510,7 @@ MainWidget::MainWidget(QWidget *parent) setGeometry(sizeHint().width()-air_mode_display->sizeHint().width()-10, 5,air_mode_display->sizeHint().width(), air_mode_display->sizeHint().height()); - air_mode_display->setFocusPolicy(QWidget::NoFocus); + air_mode_display->setFocusPolicy(Qt::NoFocus); air_mode_display->setOpModeStyle(air_op_mode_style); connect(air_mode_display,SIGNAL(clicked()),this,SLOT(modeButtonData())); @@ -536,7 +542,7 @@ MainWidget::MainWidget(QWidget *parent) air_add_button->setGeometry(10,sizeHint().height()-65,80,60); air_add_button->setFont(button_font); air_add_button->setText(tr("ADD")); - air_add_button->setFocusPolicy(QWidget::NoFocus); + air_add_button->setFocusPolicy(Qt::NoFocus); connect(air_add_button,SIGNAL(clicked()),this,SLOT(addButtonData())); // @@ -547,7 +553,7 @@ MainWidget::MainWidget(QWidget *parent) air_delete_button->setFont(button_font); air_delete_button->setText(tr("DEL")); air_delete_button->setFlashColor(AIR_FLASH_COLOR); - air_delete_button->setFocusPolicy(QWidget::NoFocus); + air_delete_button->setFocusPolicy(Qt::NoFocus); connect(air_delete_button,SIGNAL(clicked()),this,SLOT(deleteButtonData())); // @@ -558,7 +564,7 @@ MainWidget::MainWidget(QWidget *parent) air_move_button->setFont(button_font); air_move_button->setText(tr("MOVE")); air_move_button->setFlashColor(AIR_FLASH_COLOR); - air_move_button->setFocusPolicy(QWidget::NoFocus); + air_move_button->setFocusPolicy(Qt::NoFocus); connect(air_move_button,SIGNAL(clicked()),this,SLOT(moveButtonData())); // @@ -569,7 +575,7 @@ MainWidget::MainWidget(QWidget *parent) air_copy_button->setFont(button_font); air_copy_button->setText(tr("COPY")); air_copy_button->setFlashColor(AIR_FLASH_COLOR); - air_copy_button->setFocusPolicy(QWidget::NoFocus); + air_copy_button->setFocusPolicy(Qt::NoFocus); connect(air_copy_button,SIGNAL(clicked()),this,SLOT(copyButtonData())); // @@ -579,9 +585,9 @@ MainWidget::MainWidget(QWidget *parent) air_refresh_label->setGeometry(390,sizeHint().height()-65,120,60); air_refresh_label->setFont(button_font); QPalette p=palette(); - p.setColor(QColorGroup::Foreground,red); + p.setColor(QColorGroup::Foreground,Qt::red); air_refresh_label->setPalette(p); - air_refresh_label->setAlignment(AlignCenter); + air_refresh_label->setAlignment(Qt::AlignCenter); if(mainmap!=NULL) { air_refresh_pixmap=new QPixmap(1024,738); pd=new QPainter(air_refresh_pixmap); @@ -626,7 +632,7 @@ MainWidget::MainWidget(QWidget *parent) air_panel->setPauseEnabled(rda->airplayConf()->panelPauseEnabled()); air_panel->setCard(0,rda->airplayConf()->card(RDAirPlayConf::SoundPanel1Channel)); air_panel->setPort(0,rda->airplayConf()->port(RDAirPlayConf::SoundPanel1Channel)); - air_panel->setFocusPolicy(QWidget::NoFocus); + air_panel->setFocusPolicy(Qt::NoFocus); if((card=rda->airplayConf()->card(RDAirPlayConf::SoundPanel2Channel))<0) { air_panel->setCard(1,air_panel->card(RDAirPlayConf::MainLog1Channel)); air_panel->setPort(1,air_panel->port(RDAirPlayConf::MainLog1Channel)); @@ -748,7 +754,7 @@ MainWidget::MainWidget(QWidget *parent) air_log_button[i]=new QPushButton(this); air_log_button[i]->setGeometry(647+i*123,sizeHint().height()-65,118,60); air_log_button[i]->setFont(button_font); - air_log_button[i]->setFocusPolicy(QWidget::NoFocus); + air_log_button[i]->setFocusPolicy(Qt::NoFocus); mapper->setMapping(air_log_button[i],i); connect(air_log_button[i],SIGNAL(clicked()),mapper,SLOT(map())); } @@ -781,7 +787,7 @@ MainWidget::MainWidget(QWidget *parent) air_panel_button->setFont(button_font); air_panel_button->setText(tr("Sound\nPanel")); air_panel_button->setPalette(active_color); - air_panel_button->setFocusPolicy(QWidget::NoFocus); + air_panel_button->setFocusPolicy(Qt::NoFocus); connect(air_panel_button,SIGNAL(clicked()),this,SLOT(panelButtonData())); if (rda->airplayConf()->panels(RDAirPlayConf::StationPanel) || rda->airplayConf()->panels(RDAirPlayConf::UserPanel)){ @@ -893,7 +899,7 @@ MainWidget::MainWidget(QWidget *parent) if(mlockall(MCL_CURRENT|MCL_FUTURE)<0) { QMessageBox::warning(this,"RDAirPlay - "+tr("Memory Warning"), tr("Unable to lock all memory")+ - " ["+strerror(errno)+"]."); + " ["+QString(strerror(errno))+"]."); } } @@ -1954,8 +1960,8 @@ void MainWidget::keyPressEvent(QKeyEvent *e) break; case Qt::Key_X: - if(((e->state()&AltButton)!=0)&& - ((e->state()&ShiftButton)==0)&&((e->state()&ControlButton)==0)) { + if(((e->state()&Qt::AltModifier)!=0)&& + ((e->state()&Qt::ShiftModifier)==0)&&((e->state()&Qt::ControlModifier)==0)) { QCloseEvent *ce=new QCloseEvent(); closeEvent(ce); delete ce; @@ -2164,8 +2170,8 @@ void MainWidget::closeEvent(QCloseEvent *e) void MainWidget::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(black); - p->fillRect(10,70,410,air_stereo_meter->sizeHint().height(),black); + p->setPen(Qt::black); + p->fillRect(10,70,410,air_stereo_meter->sizeHint().height(),Qt::black); p->end(); delete p; } @@ -2485,7 +2491,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(), + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(), "."); a.installTranslator(&qt); diff --git a/rdairplay/rdairplay.h b/rdairplay/rdairplay.h index 6715b2db..552ced75 100644 --- a/rdairplay/rdairplay.h +++ b/rdairplay/rdairplay.h @@ -32,10 +32,14 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -199,7 +203,7 @@ class MainWidget : public QWidget RDLabel *air_refresh_label; QPixmap *air_refresh_pixmap; QString air_editor_cmd; - QSocketDevice *air_nownext_socket; + Q3SocketDevice *air_nownext_socket; std::vector air_plugin_hosts; QSplashScreen *air_splash_screen; int keystrokecount; diff --git a/rdairplay/rdairplay_cs.ts b/rdairplay/rdairplay_cs.ts index 7c7d962e..23751e5e 100644 --- a/rdairplay/rdairplay_cs.ts +++ b/rdairplay/rdairplay_cs.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_de.ts b/rdairplay/rdairplay_de.ts index 28639914..1aaa9dc1 100644 --- a/rdairplay/rdairplay_de.ts +++ b/rdairplay/rdairplay_de.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_es.ts b/rdairplay/rdairplay_es.ts index b9ecf0f1..44bbc507 100644 --- a/rdairplay/rdairplay_es.ts +++ b/rdairplay/rdairplay_es.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_fr.ts b/rdairplay/rdairplay_fr.ts index 8ffe9ab4..bd14e9ca 100644 --- a/rdairplay/rdairplay_fr.ts +++ b/rdairplay/rdairplay_fr.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_nb.ts b/rdairplay/rdairplay_nb.ts index 6f0c8f55..9af3f0cb 100644 --- a/rdairplay/rdairplay_nb.ts +++ b/rdairplay/rdairplay_nb.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_nn.ts b/rdairplay/rdairplay_nn.ts index 6f0c8f55..9af3f0cb 100644 --- a/rdairplay/rdairplay_nn.ts +++ b/rdairplay/rdairplay_nn.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_pt_BR.ts b/rdairplay/rdairplay_pt_BR.ts index 85350b95..646714eb 100644 --- a/rdairplay/rdairplay_pt_BR.ts +++ b/rdairplay/rdairplay_pt_BR.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/start_button.cpp b/rdairplay/start_button.cpp index 3495b2bd..331fbcf3 100644 --- a/rdairplay/start_button.cpp +++ b/rdairplay/start_button.cpp @@ -214,12 +214,11 @@ void StartButton::Resize(int x,int y,int w,int h) p->fillRect(0,0,w,h,palette().color(QPalette::Active,QColorGroup::Button)); //p->eraseRect(0,0,w,h); if(start_mode!=StartButton::Disabled) { - p->setPen(QColor(color1)); + p->setPen(QColor(Qt::color1)); p->setFont(start_label_font); p->drawText((geometry().width()-p->fontMetrics().width(start_title))/2, 22,start_title); - p->moveTo(10,24); - p->lineTo(70,24); + p->drawLine(10,24,70,24); p->setFont(start_counter_font); if(!start_time.isNull()) { if(start_time_mode==RDAirPlayConf::TwentyFourHour) { diff --git a/rdairplay/wall_clock.cpp b/rdairplay/wall_clock.cpp index 4ea3c659..2cde8f54 100644 --- a/rdairplay/wall_clock.cpp +++ b/rdairplay/wall_clock.cpp @@ -25,6 +25,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -151,7 +153,7 @@ void WallClock::tickClock() QPainter p(pix); if(flash_state) { p.fillRect(0,0,width(),height(),BUTTON_TIME_SYNC_LOST_COLOR); - p.setPen(QColor(color1)); + p.setPen(Qt::color1); } else { p.fillRect(0,0,width(),height(),backgroundColor()); diff --git a/rdairplay/wall_clock.h b/rdairplay/wall_clock.h index 3813587a..058d3d62 100644 --- a/rdairplay/wall_clock.h +++ b/rdairplay/wall_clock.h @@ -26,6 +26,8 @@ #include #include +//Added by qt3to4: +#include #include diff --git a/rdcartslots/Makefile.am b/rdcartslots/Makefile.am index 2d26452d..8da37cd5 100644 --- a/rdcartslots/Makefile.am +++ b/rdcartslots/Makefile.am @@ -20,8 +20,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,8 +37,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcartslots_*.qm all: - @QT_BIN@/lupdate rdcartslots.pro - @QT_BIN@/lrelease rdcartslots.pro + lupdate-qt4 rdcartslots.pro + lrelease-qt4 rdcartslots.pro bin_PROGRAMS = rdcartslots @@ -47,7 +47,7 @@ dist_rdcartslots_SOURCES = local_macros.cpp\ nodist_rdcartslots_SOURCES = moc_rdcartslots.cpp -rdcartslots_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdcartslots_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdcartslots.pro\ rdcartslots_de.ts\ diff --git a/rdcartslots/rdcartslots.cpp b/rdcartslots/rdcartslots.cpp index 90092903..2b099df4 100644 --- a/rdcartslots/rdcartslots.cpp +++ b/rdcartslots/rdcartslots.cpp @@ -31,6 +31,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -246,7 +249,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(),"."); + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(),"."); a.installTranslator(&qt); QTranslator rd(0); rd.load(QString(PREFIX)+QString("/share/rivendell/librd_")+ diff --git a/rdcartslots/rdcartslots.h b/rdcartslots/rdcartslots.h index 6f7f9b09..cc9820f8 100644 --- a/rdcartslots/rdcartslots.h +++ b/rdcartslots/rdcartslots.h @@ -26,6 +26,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include diff --git a/rdcartslots/rdcartslots_de.ts b/rdcartslots/rdcartslots_de.ts index 11500427..e51a5415 100644 --- a/rdcartslots/rdcartslots_de.ts +++ b/rdcartslots/rdcartslots_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcartslots/rdcartslots_es.ts b/rdcartslots/rdcartslots_es.ts index 11500427..e51a5415 100644 --- a/rdcartslots/rdcartslots_es.ts +++ b/rdcartslots/rdcartslots_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcartslots/rdcartslots_fr.ts b/rdcartslots/rdcartslots_fr.ts index 11500427..e51a5415 100644 --- a/rdcartslots/rdcartslots_fr.ts +++ b/rdcartslots/rdcartslots_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcartslots/rdcartslots_nb.ts b/rdcartslots/rdcartslots_nb.ts index 11500427..e51a5415 100644 --- a/rdcartslots/rdcartslots_nb.ts +++ b/rdcartslots/rdcartslots_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcartslots/rdcartslots_nn.ts b/rdcartslots/rdcartslots_nn.ts index 11500427..e51a5415 100644 --- a/rdcartslots/rdcartslots_nn.ts +++ b/rdcartslots/rdcartslots_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcartslots/rdcartslots_pt_BR.ts b/rdcartslots/rdcartslots_pt_BR.ts index 11500427..e51a5415 100644 --- a/rdcartslots/rdcartslots_pt_BR.ts +++ b/rdcartslots/rdcartslots_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcastmanager/Makefile.am b/rdcastmanager/Makefile.am index 80868801..d56049f9 100644 --- a/rdcastmanager/Makefile.am +++ b/rdcastmanager/Makefile.am @@ -20,8 +20,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,8 +37,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcastmanager_*.qm all: - @QT_BIN@/lupdate rdcastmanager.pro - @QT_BIN@/lrelease rdcastmanager.pro + lupdate-qt4 rdcastmanager.pro + lrelease-qt4 rdcastmanager.pro bin_PROGRAMS = rdcastmanager @@ -53,7 +53,7 @@ nodist_rdcastmanager_SOURCES = moc_edit_cast.cpp\ moc_pick_report_dates.cpp\ moc_rdcastmanager.cpp -rdcastmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdcastmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdcastmanager.pro\ rdcastmanager_cs.ts\ diff --git a/rdcastmanager/edit_cast.cpp b/rdcastmanager/edit_cast.cpp index fa1b868a..8d71b5a7 100644 --- a/rdcastmanager/edit_cast.cpp +++ b/rdcastmanager/edit_cast.cpp @@ -26,6 +26,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -66,7 +68,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) new QLabel(cast_item_medialink_edit,tr("Media Link:"),this); cast_item_medialink_label->setGeometry(20,10,90,20); cast_item_medialink_label->setFont(font); - cast_item_medialink_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cast_item_medialink_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); if(cast_feed->mediaLinkMode()==RDFeed::LinkNone) { cast_item_medialink_edit->hide(); cast_item_medialink_label->hide(); @@ -86,7 +88,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) new QLabel(cast_item_title_edit,tr("Title:"),this); cast_item_title_label->setGeometry(20,ypos,90,20); cast_item_title_label->setFont(font); - cast_item_title_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cast_item_title_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Item Author @@ -98,7 +100,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) new QLabel(cast_item_author_edit,tr("Author E-Mail:"),this); cast_item_author_label->setGeometry(20,ypos+22,90,20); cast_item_author_label->setFont(font); - cast_item_author_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cast_item_author_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Item Category @@ -111,7 +113,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) cast_item_category_label->setGeometry(20,ypos+44,90,20); cast_item_category_label->setFont(font); cast_item_category_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Item Link @@ -123,12 +125,12 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) new QLabel(cast_item_link_edit,tr("Link URL:"),this); cast_item_link_label->setGeometry(20,ypos+66,90,20); cast_item_link_label->setFont(font); - cast_item_link_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cast_item_link_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Item Description // - cast_item_description_edit=new QTextEdit(this); + cast_item_description_edit=new Q3TextEdit(this); cast_item_description_edit-> setGeometry(115,ypos+88,sizeHint().width()-125,76); QLabel *cast_item_description_label= @@ -136,7 +138,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) cast_item_description_label->setGeometry(20,ypos+88,90,20); cast_item_description_label->setFont(font); cast_item_description_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Item Source Text @@ -148,7 +150,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) new QLabel(cast_item_sourcetext_edit,tr("Source Text:"),this); cast_item_sourcetext_label->setGeometry(20,ypos+169,90,20); cast_item_sourcetext_label->setFont(font); - cast_item_sourcetext_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cast_item_sourcetext_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Item Source URL @@ -160,7 +162,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) new QLabel(cast_item_sourceurl_edit,tr("Source URL:"),this); cast_item_sourceurl_label->setGeometry(20,ypos+191,90,20); cast_item_sourceurl_label->setFont(font); - cast_item_sourceurl_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cast_item_sourceurl_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Item Comments @@ -172,20 +174,20 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) new QLabel(cast_item_comments_edit,tr("Comments URL:"),this); cast_item_comments_label->setGeometry(10,ypos+213,100,20); cast_item_comments_label->setFont(font); - cast_item_comments_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + cast_item_comments_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); cast_ypos=233+ypos; // // Effective DateTime // - cast_item_effective_edit=new QDateTimeEdit(this); + cast_item_effective_edit=new Q3DateTimeEdit(this); cast_item_effective_edit-> setGeometry(115,cast_ypos,165,20); QLabel *label=new QLabel(cast_item_effective_edit,tr("Air Date/Time:"),this); label->setGeometry(20,cast_ypos,90,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QPushButton *button=new QPushButton(this); button->setGeometry(290,cast_ypos-3,50,25); button->setFont(select_font); @@ -205,7 +207,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) cast_item_origin_label->setGeometry(20,cast_ypos,90,20); cast_item_origin_label->setFont(font); cast_item_origin_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); cast_ypos+=22; // @@ -221,19 +223,19 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) label->setGeometry(20,cast_ypos,90,20); label->setFont(font); label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); cast_ypos+=22; cast_item_expiration_box->setEnabled(cast_status!=RDPodcast::StatusExpired); label->setEnabled(cast_status!=RDPodcast::StatusExpired); - cast_item_expiration_edit=new QDateEdit(this); + cast_item_expiration_edit=new Q3DateEdit(this); cast_item_expiration_edit->setGeometry(115,cast_ypos,95,20); cast_item_expiration_label= new QLabel(cast_item_expiration_edit,tr("Expires On:"),this); cast_item_expiration_label->setGeometry(20,cast_ypos,90,20); cast_item_expiration_label->setFont(font); cast_item_expiration_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); cast_item_expiration_button=new QPushButton(this); cast_item_expiration_button->setGeometry(220,cast_ypos-3,50,25); cast_item_expiration_button->setFont(select_font); @@ -250,7 +252,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) // // Cast Status // - cast_item_status_group=new QButtonGroup(this); + cast_item_status_group=new Q3ButtonGroup(this); cast_item_status_group->setExclusive(true); cast_item_status_group->hide(); @@ -260,7 +262,7 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) label=new QLabel(rbutton,tr("Hold"),this); label->setFont(select_font); label->setGeometry(140,cast_ypos,30,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rbutton->setChecked(true); label->setEnabled(cast_status!=RDPodcast::StatusExpired); rbutton->setEnabled(cast_status!=RDPodcast::StatusExpired); @@ -271,12 +273,12 @@ EditCast::EditCast(unsigned cast_id,QWidget *parent) label=new QLabel(rbutton,tr("Active"),this); label->setFont(select_font); label->setGeometry(210,cast_ypos,80,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); label->setEnabled(cast_status!=RDPodcast::StatusExpired); label=new QLabel(cast_item_status_group,tr("Posting Status:"),this); label->setGeometry(20,cast_ypos-1,90,20); label->setFont(font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label->setEnabled(cast_status!=RDPodcast::StatusExpired); rbutton->setEnabled(cast_status!=RDPodcast::StatusExpired); diff --git a/rdcastmanager/edit_cast.h b/rdcastmanager/edit_cast.h index 38ecaa4d..42bc7391 100644 --- a/rdcastmanager/edit_cast.h +++ b/rdcastmanager/edit_cast.h @@ -24,15 +24,15 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include -#include +#include #include #include @@ -61,7 +61,7 @@ class EditCast : public QDialog QLineEdit *cast_item_title_edit; QLineEdit *cast_item_author_edit; QLineEdit *cast_item_origin_edit; - QTextEdit *cast_item_description_edit; + Q3TextEdit *cast_item_description_edit; QLineEdit *cast_item_category_edit; QLineEdit *cast_item_comments_edit; QLineEdit *cast_item_sourcetext_edit; @@ -70,9 +70,9 @@ class EditCast : public QDialog QComboBox *cast_item_expiration_box; QLabel *cast_item_expiration_label; QPushButton *cast_item_expiration_button; - QDateEdit *cast_item_expiration_edit; - QDateTimeEdit *cast_item_effective_edit; - QButtonGroup *cast_item_status_group; + Q3DateEdit *cast_item_expiration_edit; + Q3DateTimeEdit *cast_item_effective_edit; + Q3ButtonGroup *cast_item_status_group; int cast_ypos; RDPodcast::Status cast_status; }; diff --git a/rdcastmanager/list_casts.cpp b/rdcastmanager/list_casts.cpp index c90777e0..cdfe2e87 100644 --- a/rdcastmanager/list_casts.cpp +++ b/rdcastmanager/list_casts.cpp @@ -25,17 +25,20 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -102,7 +105,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent) // Progress Dialog // list_progress_dialog= - new QProgressDialog(tr("Uploading Audio..."),"Cancel",4,this); + new Q3ProgressDialog(tr("Uploading Audio..."),"Cancel",4,this,NULL); list_progress_dialog->setCaption(tr("Progress")); list_progress_dialog->setMinimumDuration(0); list_progress_dialog->setTotalSteps(list_feed->totalPostSteps()); @@ -116,7 +119,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent) list_filter_label= new QLabel(list_filter_edit,tr("Filter:"),this); list_filter_label->setFont(font); - list_filter_label->setAlignment(AlignRight|AlignVCenter); + list_filter_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(list_filter_edit,SIGNAL(textChanged(const QString &)), this,SLOT(filterChangedData(const QString &))); @@ -127,7 +130,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent) list_unexpired_label= new QLabel(list_unexpired_check,tr("Only Show Unexpired Casts"),this); list_unexpired_label->setFont(font); - list_unexpired_label->setAlignment(AlignLeft|AlignVCenter); + list_unexpired_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(list_unexpired_check,SIGNAL(toggled(bool)), this,SLOT(notexpiredToggledData(bool))); @@ -138,7 +141,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent) list_active_label= new QLabel(list_active_check,tr("Only Show Active Casts"),this); list_active_label->setFont(font); - list_active_label->setAlignment(AlignLeft|AlignVCenter); + list_active_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(list_active_check,SIGNAL(toggled(bool)), this,SLOT(activeToggledData(bool))); @@ -149,25 +152,25 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent) list_casts_view->setAllColumnsShowFocus(true); list_casts_view->setItemMargin(5); list_casts_view->addColumn(tr(" ")); - list_casts_view->setColumnAlignment(0,AlignCenter); + list_casts_view->setColumnAlignment(0,Qt::AlignCenter); list_casts_view->addColumn(tr("Title")); - list_casts_view->setColumnAlignment(1,AlignLeft); + list_casts_view->setColumnAlignment(1,Qt::AlignLeft); list_casts_view->addColumn(tr("Origin")); - list_casts_view->setColumnAlignment(2,AlignLeft); + list_casts_view->setColumnAlignment(2,Qt::AlignLeft); list_casts_view->addColumn(tr("Expires")); - list_casts_view->setColumnAlignment(3,AlignCenter); + list_casts_view->setColumnAlignment(3,Qt::AlignCenter); list_casts_view->addColumn(tr("Length")); - list_casts_view->setColumnAlignment(4,AlignRight); + list_casts_view->setColumnAlignment(4,Qt::AlignRight); list_casts_view->addColumn(tr("Description")); - list_casts_view->setColumnAlignment(5,AlignLeft); + list_casts_view->setColumnAlignment(5,Qt::AlignLeft); list_casts_view->addColumn(tr("Category")); - list_casts_view->setColumnAlignment(6,AlignCenter); + list_casts_view->setColumnAlignment(6,Qt::AlignCenter); list_casts_view->addColumn(tr("Link")); - list_casts_view->setColumnAlignment(7,AlignCenter); + list_casts_view->setColumnAlignment(7,Qt::AlignCenter); connect(list_casts_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); // // Post Cart Button @@ -274,7 +277,7 @@ void ListCasts::addCartData() void ListCasts::addFileData() { - QString srcfile=QFileDialog::getOpenFileName("",RD_AUDIO_FILE_FILTER,this); + QString srcfile=Q3FileDialog::getOpenFileName("",RD_AUDIO_FILE_FILTER,this); if(srcfile.isNull()) { return; } @@ -327,8 +330,8 @@ void ListCasts::deleteData() return; } - QProgressDialog *pd= - new QProgressDialog(tr("Deleting Podcast..."),"Cancel",2,this); + Q3ProgressDialog *pd= + new Q3ProgressDialog(tr("Deleting Podcast..."),"Cancel",2,this,NULL); pd->setCaption(tr("Progress")); pd->setMinimumDuration(0); pd->setProgress(0); @@ -375,7 +378,7 @@ void ListCasts::reportData() } -void ListCasts::doubleClickedData(QListViewItem *item,const QPoint &pt, +void ListCasts::doubleClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { editData(); diff --git a/rdcastmanager/list_casts.h b/rdcastmanager/list_casts.h index 4c574bb7..c16b4601 100644 --- a/rdcastmanager/list_casts.h +++ b/rdcastmanager/list_casts.h @@ -29,7 +29,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -49,7 +51,7 @@ class ListCasts : public QDialog void editData(); void deleteData(); void reportData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void userChangedData(); void filterChangedData(const QString &str); void notexpiredToggledData(bool state); @@ -82,7 +84,7 @@ class ListCasts : public QDialog QCheckBox *list_unexpired_check; QLabel *list_active_label; QCheckBox *list_active_check; - QProgressDialog *list_progress_dialog; + Q3ProgressDialog *list_progress_dialog; RDFeed *list_feed; }; diff --git a/rdcastmanager/pick_report_dates.cpp b/rdcastmanager/pick_report_dates.cpp index 41b6c485..625fd573 100644 --- a/rdcastmanager/pick_report_dates.cpp +++ b/rdcastmanager/pick_report_dates.cpp @@ -74,13 +74,13 @@ PickReportDates::PickReportDates(unsigned feed_id,unsigned cast_id, // // Start Date // - edit_startdate_edit=new QDateEdit(this); + edit_startdate_edit=new Q3DateEdit(this); edit_startdate_edit->setGeometry(150,10,100,20); edit_startdate_edit->setDate(yesterday_date.addMonths(-1)); QLabel *label=new QLabel(edit_startdate_edit,tr("&Start Date:"),this); label->setGeometry(75,10,70,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QPushButton *button=new QPushButton(this); button->setGeometry(260,7,50,27); button->setFont(font); @@ -90,13 +90,13 @@ PickReportDates::PickReportDates(unsigned feed_id,unsigned cast_id, // // End Date // - edit_enddate_edit=new QDateEdit(this); + edit_enddate_edit=new Q3DateEdit(this); edit_enddate_edit->setGeometry(150,40,100,20); edit_enddate_edit->setDate(yesterday_date); label=new QLabel(edit_enddate_edit,tr("&End Date:"),this); label->setGeometry(75,40,70,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(this); button->setGeometry(260,37,50,27); button->setFont(font); diff --git a/rdcastmanager/pick_report_dates.h b/rdcastmanager/pick_report_dates.h index 8c6eecec..a6bc34bd 100644 --- a/rdcastmanager/pick_report_dates.h +++ b/rdcastmanager/pick_report_dates.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include class PickReportDates : public QDialog { @@ -45,8 +45,8 @@ class PickReportDates : public QDialog void GenerateSubscriptionReport(const QString &keyname,QString *rpt); void GenerateEpisodeReport(const QString &keyname,unsigned cast_id, QString *rpt); - QDateEdit *edit_startdate_edit; - QDateEdit *edit_enddate_edit; + Q3DateEdit *edit_startdate_edit; + Q3DateEdit *edit_enddate_edit; QString edit_keyname; unsigned edit_feed_id; unsigned edit_cast_id; diff --git a/rdcastmanager/rdcastmanager.cpp b/rdcastmanager/rdcastmanager.cpp index 92271085..2840fe18 100644 --- a/rdcastmanager/rdcastmanager.cpp +++ b/rdcastmanager/rdcastmanager.cpp @@ -34,6 +34,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -62,7 +65,7 @@ QString cast_group; QString cast_schedcode; MainWidget::MainWidget(QWidget *parent) - :QMainWindow(parent) + :Q3MainWindow(parent) { QString str1; QString str2; @@ -142,9 +145,9 @@ MainWidget::MainWidget(QWidget *parent) cast_feed_list->setAllColumnsShowFocus(true); cast_feed_list->setItemMargin(5); connect(cast_feed_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(feedDoubleclickedData(QListViewItem *,const QPoint &,int))); + SLOT(feedDoubleclickedData(Q3ListViewItem *,const QPoint &,int))); cast_feed_list->addColumn(""); cast_feed_list->setColumnAlignment(0,Qt::AlignCenter); cast_feed_list->addColumn(tr("Key Name")); @@ -213,7 +216,7 @@ void MainWidget::openData() } -void MainWidget::feedDoubleclickedData(QListViewItem *,const QPoint &,int) +void MainWidget::feedDoubleclickedData(Q3ListViewItem *,const QPoint &,int) { openData(); } @@ -339,7 +342,7 @@ int main(int argc,char *argv[]) qt_path=tr_path; #else tr_path=QString(PREFIX)+QString("/share/rivendell/"); - qt_path=QString(QTDIR)+QString("/translation/"); + qt_path=QString("/usr/share/qt4/translation/"); #endif // WIN32 QTranslator qt(0); qt.load(qt_path+QString("qt_")+QTextCodec::locale(),"."); diff --git a/rdcastmanager/rdcastmanager.h b/rdcastmanager/rdcastmanager.h index 3655f075..acdbda67 100644 --- a/rdcastmanager/rdcastmanager.h +++ b/rdcastmanager/rdcastmanager.h @@ -23,12 +23,14 @@ #include -#include +#include #include #include #include #include #include +//Added by qt3to4: +#include #include #include @@ -39,7 +41,7 @@ #define RDCASTMANAGER_USAGE "\n" -class MainWidget : public QMainWindow +class MainWidget : public Q3MainWindow { Q_OBJECT public: @@ -50,7 +52,7 @@ class MainWidget : public QMainWindow private slots: void openData(); void userChangedData(); - void feedDoubleclickedData(QListViewItem *item,const QPoint &pt,int col); + void feedDoubleclickedData(Q3ListViewItem *item,const QPoint &pt,int col); void quitMainWidget(); protected: diff --git a/rdcastmanager/rdcastmanager_cs.ts b/rdcastmanager/rdcastmanager_cs.ts index e350e0fd..ba8dd485 100644 --- a/rdcastmanager/rdcastmanager_cs.ts +++ b/rdcastmanager/rdcastmanager_cs.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_de.ts b/rdcastmanager/rdcastmanager_de.ts index 3aa00f46..a2f20c96 100644 --- a/rdcastmanager/rdcastmanager_de.ts +++ b/rdcastmanager/rdcastmanager_de.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_es.ts b/rdcastmanager/rdcastmanager_es.ts index a4af1945..27c6ce95 100644 --- a/rdcastmanager/rdcastmanager_es.ts +++ b/rdcastmanager/rdcastmanager_es.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_fr.ts b/rdcastmanager/rdcastmanager_fr.ts index 8ce03d7d..48184188 100644 --- a/rdcastmanager/rdcastmanager_fr.ts +++ b/rdcastmanager/rdcastmanager_fr.ts @@ -1,4 +1,6 @@ - + + + EditCast @@ -130,7 +132,7 @@ Car&t/Cut - + Title diff --git a/rdcastmanager/rdcastmanager_nb.ts b/rdcastmanager/rdcastmanager_nb.ts index 4e15374c..1f6de031 100644 --- a/rdcastmanager/rdcastmanager_nb.ts +++ b/rdcastmanager/rdcastmanager_nb.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_nn.ts b/rdcastmanager/rdcastmanager_nn.ts index 4e15374c..1f6de031 100644 --- a/rdcastmanager/rdcastmanager_nn.ts +++ b/rdcastmanager/rdcastmanager_nn.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_pt_BR.ts b/rdcastmanager/rdcastmanager_pt_BR.ts index 6f21669e..6c8719cd 100644 --- a/rdcastmanager/rdcastmanager_pt_BR.ts +++ b/rdcastmanager/rdcastmanager_pt_BR.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcatch/Makefile.am b/rdcatch/Makefile.am index 70a82849..49cdfbee 100644 --- a/rdcatch/Makefile.am +++ b/rdcatch/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/rdcatch ## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +20,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,8 +37,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcatch_*.qm all: - @QT_BIN@/lupdate rdcatch.pro - @QT_BIN@/lrelease rdcatch.pro + lupdate-qt4 rdcatch.pro + lrelease-qt4 rdcatch.pro bin_PROGRAMS = rdcatch @@ -72,7 +72,8 @@ nodist_rdcatch_SOURCES = moc_add_recording.cpp\ moc_vbox.cpp -rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support + EXTRA_DIST = rdcatch.pro\ rdcatch_cs.ts\ diff --git a/rdcatch/add_recording.cpp b/rdcatch/add_recording.cpp index e0fc51e2..94ee2b4e 100644 --- a/rdcatch/add_recording.cpp +++ b/rdcatch/add_recording.cpp @@ -23,12 +23,16 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -78,7 +82,7 @@ AddRecording::AddRecording(int id,QString *filter,QWidget *parent) QLabel *label=new QLabel(tr("Schedule a:"),this,"title_label"); label->setGeometry(0,0,sizeHint().width(),30); label->setFont(label_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Recording Button diff --git a/rdcatch/add_recording.h b/rdcatch/add_recording.h index 0b8b229f..897f1cf7 100644 --- a/rdcatch/add_recording.h +++ b/rdcatch/add_recording.h @@ -24,11 +24,14 @@ #include #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include #include #include diff --git a/rdcatch/catch_listview.cpp b/rdcatch/catch_listview.cpp index ba718e8b..0e4fcdd5 100644 --- a/rdcatch/catch_listview.cpp +++ b/rdcatch/catch_listview.cpp @@ -18,7 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -36,7 +39,7 @@ CatchListView::CatchListView(QWidget *parent) // // Right-Click Menu // - catch_menu=new QPopupMenu(NULL); + catch_menu=new Q3PopupMenu(NULL); connect(catch_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); catch_menu-> insertItem(tr("Edit Cue Markers"),this,SLOT(editAudioMenuData()),0,0); @@ -65,43 +68,43 @@ void CatchListView::editAudioMenuData() void CatchListView::contentsMousePressEvent(QMouseEvent *e) { - QListView::contentsMousePressEvent(e); - QListView::contentsMousePressEvent(e); + Q3ListView::contentsMousePressEvent(e); + Q3ListView::contentsMousePressEvent(e); catch_menu_item=selectedItem(); if(catch_menu_item==NULL) { catch_cutname=""; } else { switch(catch_menu_item->text(28).toUInt()) { - case RDRecording::Recording: - case RDRecording::Playout: - case RDRecording::Upload: - case RDRecording::Download: - catch_cutname=catch_menu_item->text(25); - break; + case RDRecording::Recording: + case RDRecording::Playout: + case RDRecording::Upload: + case RDRecording::Download: + catch_cutname=catch_menu_item->text(25); + break; - case RDRecording::MacroEvent: - case RDRecording::SwitchEvent: - catch_cutname=""; - break; + case RDRecording::MacroEvent: + case RDRecording::SwitchEvent: + catch_cutname=""; + break; } } switch(e->button()) { - case QMouseEvent::RightButton: - catch_menu->setGeometry(e->globalX(),e->globalY(), - catch_menu->sizeHint().width(), - catch_menu->sizeHint().height()); - catch_menu->exec(); - break; + case Qt::RightButton: + catch_menu->setGeometry(e->globalX(),e->globalY(), + catch_menu->sizeHint().width(), + catch_menu->sizeHint().height()); + catch_menu->exec(); + break; - default: - e->ignore(); - break; + default: + e->ignore(); + break; } } void CatchListView::contentsMouseDoubleClickEvent(QMouseEvent *e) { - QListView::contentsMouseDoubleClickEvent(e); + Q3ListView::contentsMouseDoubleClickEvent(e); } diff --git a/rdcatch/catch_listview.h b/rdcatch/catch_listview.h index 3bbb26c4..8a34c195 100644 --- a/rdcatch/catch_listview.h +++ b/rdcatch/catch_listview.h @@ -21,7 +21,9 @@ #ifndef CATCH_LISTVIEW_H #define CATCH_LISTVIEW_H -#include +#include +//Added by qt3to4: +#include #include @@ -41,8 +43,8 @@ class CatchListView : public RDListView void contentsMouseDoubleClickEvent(QMouseEvent *e); private: - QPopupMenu *catch_menu; - QListViewItem *catch_menu_item; + Q3PopupMenu *catch_menu; + Q3ListViewItem *catch_menu_item; QString catch_cutname; QWidget *catch_parent; }; diff --git a/rdcatch/colors.h b/rdcatch/colors.h index cdafcb4e..3ec44460 100644 --- a/rdcatch/colors.h +++ b/rdcatch/colors.h @@ -24,26 +24,26 @@ // // Text Colors // -#define EVENT_ACTIVE_TEXT_COLOR black -#define EVENT_INACTIVE_TEXT_COLOR darkGray +#define EVENT_ACTIVE_TEXT_COLOR Qt::black +#define EVENT_INACTIVE_TEXT_COLOR Qt::darkGray // // Background Event List Colors // -#define EVENT_IDLE_COLOR white -#define EVENT_READY_COLOR cyan -#define EVENT_ACTIVE_COLOR green -#define EVENT_NEXT_COLOR yellow -#define EVENT_WAITING_COLOR magenta +#define EVENT_IDLE_COLOR Qt::white +#define EVENT_READY_COLOR Qt::cyan +#define EVENT_ACTIVE_COLOR Qt::green +#define EVENT_NEXT_COLOR Qt::yellow +#define EVENT_WAITING_COLOR Qt::magenta #define EVENT_ERROR_COLOR "#F08888" -#define EVENT_ERROR_TEXT_COLOR white +#define EVENT_ERROR_TEXT_COLOR Qt::white // // Button Colors // -#define BUTTON_ACTIVE_TEXT_COLOR white -#define BUTTON_ACTIVE_BACKGROUND_COLOR blue -#define BUTTON_MONITOR_FLASHING_COLOR red +#define BUTTON_ACTIVE_TEXT_COLOR Qt::white +#define BUTTON_ACTIVE_BACKGROUND_COLOR Qt::blue +#define BUTTON_MONITOR_FLASHING_COLOR Qt::red #endif // COLORS_H diff --git a/rdcatch/deckmon.cpp b/rdcatch/deckmon.cpp index 7d13f9c6..d5956b71 100644 --- a/rdcatch/deckmon.cpp +++ b/rdcatch/deckmon.cpp @@ -27,9 +27,13 @@ #include "colors.h" #include "deckmon.h" #include "globals.h" +//Added by qt3to4: +#include +#include +#include DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent) - : QFrame(parent) + : Q3Frame(parent) { mon_station=station; mon_channel=channel; @@ -108,7 +112,7 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent) mon_event_label=new QLabel(this); mon_event_label->setFont(event_font); mon_event_label->setAlignment(Qt::AlignCenter); - mon_event_label->setFrameStyle(QFrame::Panel|QFrame::Sunken); + mon_event_label->setFrameStyle(Q3Frame::Panel|Q3Frame::Sunken); mon_event_label->setPalette(mon_dark_palette); mon_event_label->setText("--"); mon_event_timer=new QTimer(this); @@ -163,7 +167,7 @@ void DeckMon::enableMonitorButton(bool state) void DeckMon::setGeometry(int x,int y,int w,int h) { - QFrame::setGeometry(x,y,w,h); + Q3Frame::setGeometry(x,y,w,h); } @@ -290,7 +294,7 @@ void DeckMon::resizeEvent(QResizeEvent *e) mon_status_label->setGeometry(e->size().width()-320,6,80,18); mon_left_meter->setGeometry(e->size().width()-235,6,225,10); mon_right_meter->setGeometry(e->size().width()-235,16,225,10); - QFrame::resizeEvent(e); + Q3Frame::resizeEvent(e); } diff --git a/rdcatch/deckmon.h b/rdcatch/deckmon.h index 82513463..42d05b3d 100644 --- a/rdcatch/deckmon.h +++ b/rdcatch/deckmon.h @@ -21,16 +21,18 @@ #ifndef DECKMON_H #define DECKMON_H -#include +#include #include #include #include +//Added by qt3to4: +#include #include #include #include -class DeckMon : public QFrame +class DeckMon : public Q3Frame { Q_OBJECT public: diff --git a/rdcatch/edit_cartevent.cpp b/rdcatch/edit_cartevent.cpp index 713e6f69..9d28d917 100644 --- a/rdcatch/edit_cartevent.cpp +++ b/rdcatch/edit_cartevent.cpp @@ -21,12 +21,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -94,7 +99,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this); label->setGeometry(30,11,125,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Station @@ -104,17 +109,17 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Start Time // - edit_starttime_edit=new QTimeEdit(this); + edit_starttime_edit=new Q3TimeEdit(this); edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20); label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(sizeHint().width()-175,12,80,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Description @@ -125,7 +130,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,43,100,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Cart Number @@ -136,7 +141,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_destination_edit,tr("Cart Number:"),this); label->setGeometry(10,73,100,19); label->setFont(label_font); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); QPushButton *button=new QPushButton(this); button->setGeometry(185,68,60,24); button->setFont(day_font); @@ -149,7 +154,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(tr("Active Days"),this); label->setGeometry(47,101,90,19); label->setFont(label_font); - label->setAlignment(AlignHCenter|ShowPrefix); + label->setAlignment(Qt::AlignHCenter); // // Monday Button @@ -159,7 +164,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_mon_button,tr("Monday"),this); label->setGeometry(40,120,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Tuesday Button @@ -169,7 +174,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_tue_button,tr("Tuesday"),this); label->setGeometry(135,120,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Wednesday Button @@ -179,7 +184,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_wed_button,tr("Wednesday"),this); label->setGeometry(235,120,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Thursday Button @@ -189,7 +194,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_thu_button,tr("Thursday"),this); label->setGeometry(355,120,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Friday Button @@ -199,7 +204,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_fri_button,tr("Friday"),this); label->setGeometry(460,120,40,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Saturday Button @@ -209,7 +214,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_sat_button,tr("Saturday"),this); label->setGeometry(150,145,60,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Sunday Button @@ -219,7 +224,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_sun_button,tr("Sunday"),this); label->setGeometry(320,145,60,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // OneShot Button @@ -229,7 +234,7 @@ EditCartEvent::EditCartEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this); label->setGeometry(40,178,115,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Save As Button @@ -376,7 +381,7 @@ void EditCartEvent::cancelData() void EditCartEvent::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); + p->setPen(Qt::black); p->drawRect(10,109,sizeHint().width()-20,62); p->end(); } diff --git a/rdcatch/edit_cartevent.h b/rdcatch/edit_cartevent.h index 9a04cf6a..026c7be2 100644 --- a/rdcatch/edit_cartevent.h +++ b/rdcatch/edit_cartevent.h @@ -26,11 +26,15 @@ #include #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -64,7 +68,7 @@ class EditCartEvent : public QDialog RDRecording *edit_recording; QCheckBox *edit_active_button; QComboBox *edit_station_box; - QTimeEdit *edit_starttime_edit; + Q3TimeEdit *edit_starttime_edit; QLineEdit *edit_description_edit; QString edit_cutname; QLineEdit *edit_destination_edit; diff --git a/rdcatch/edit_download.cpp b/rdcatch/edit_download.cpp index daa970e2..12bb7c2a 100644 --- a/rdcatch/edit_download.cpp +++ b/rdcatch/edit_download.cpp @@ -21,13 +21,18 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -92,7 +97,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this); label->setGeometry(30,11,125,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Station @@ -102,17 +107,17 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Start Time // - edit_starttime_edit=new QTimeEdit(this); + edit_starttime_edit=new Q3TimeEdit(this); edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20); label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(sizeHint().width()-175,12,80,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Description @@ -123,7 +128,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,43,100,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Url @@ -137,7 +142,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_url_edit,tr("Url:"),this); label->setGeometry(10,70,100,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Username @@ -149,7 +154,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, edit_username_label=new QLabel(edit_username_edit,tr("Username:"),this); edit_username_label->setGeometry(10,97,100,20); edit_username_label->setFont(label_font); - edit_username_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_username_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Password @@ -162,7 +167,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, edit_password_label=new QLabel(edit_password_edit,tr("Password:"),this); edit_password_label->setGeometry(275,97,80,20); edit_password_label->setFont(label_font); - edit_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Destination @@ -173,7 +178,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_destination_edit,tr("Destination:"),this); label->setGeometry(10,127,100,19); label->setFont(label_font); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight); QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-70,122,60,24); button->setFont(day_font); @@ -190,7 +195,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_channels_box,tr("Channels:"),this); label->setGeometry(120,149,70,20); label->setFont(label_font); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Autotrim Controls @@ -202,18 +207,18 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_autotrim_box,tr("Autotrim"),this); label->setGeometry(140,173,80,20); label->setFont(label_font); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); edit_autotrim_spin=new QSpinBox(this); edit_autotrim_spin->setGeometry(265,173,40,20); edit_autotrim_spin->setRange(-99,-1); edit_autotrim_label=new QLabel(edit_autotrim_spin,tr("Level:"),this); edit_autotrim_label->setGeometry(220,173,40,20); edit_autotrim_label->setFont(label_font); - edit_autotrim_label->setAlignment(AlignVCenter|AlignRight); + edit_autotrim_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); edit_autotrim_unit=new QLabel(edit_autotrim_spin,tr("dBFS"),this); edit_autotrim_unit->setGeometry(310,173,40,20); edit_autotrim_unit->setFont(label_font); - edit_autotrim_unit->setAlignment(AlignVCenter|AlignLeft); + edit_autotrim_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Normalize Controls @@ -225,18 +230,18 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_normalize_box,tr("Normalize"),this); label->setGeometry(140,197,80,20); label->setFont(label_font); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); edit_normalize_spin=new QSpinBox(this); edit_normalize_spin->setGeometry(265,197,40,20); edit_normalize_spin->setRange(-99,-1); edit_normalize_label=new QLabel(edit_normalize_spin,tr("Level:"),this); edit_normalize_label->setGeometry(220,197,40,20); edit_normalize_label->setFont(label_font); - edit_normalize_label->setAlignment(AlignVCenter|AlignRight); + edit_normalize_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); edit_normalize_unit=new QLabel(edit_normalize_spin,tr("dBFS"),this); edit_normalize_unit->setGeometry(310,197,40,20); edit_normalize_unit->setFont(label_font); - edit_normalize_unit->setAlignment(AlignVCenter|AlignLeft); + edit_normalize_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Export Metadata Box @@ -246,7 +251,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_metadata_box,tr("Update Library Metadata"),this); label->setGeometry(140,222,160,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Button Label @@ -254,7 +259,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(tr("Active Days"),this); label->setGeometry(47,254,90,19); label->setFont(label_font); - label->setAlignment(AlignHCenter|ShowPrefix); + label->setAlignment(Qt::AlignHCenter); // // Monday Button @@ -264,7 +269,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_mon_button,tr("Monday"),this); label->setGeometry(40,273,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Tuesday Button @@ -274,7 +279,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_tue_button,tr("Tuesday"),this); label->setGeometry(135,273,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Wednesday Button @@ -284,7 +289,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_wed_button,tr("Wednesday"),this); label->setGeometry(235,273,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Thursday Button @@ -294,7 +299,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_thu_button,tr("Thursday"),this); label->setGeometry(355,273,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Friday Button @@ -304,7 +309,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_fri_button,tr("Friday"),this); label->setGeometry(460,273,40,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Saturday Button @@ -314,7 +319,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_sat_button,tr("Saturday"),this); label->setGeometry(150,298,60,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Sunday Button @@ -324,7 +329,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_sun_button,tr("Sunday"),this); label->setGeometry(320,298,60,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // OneShot Button @@ -334,7 +339,7 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this); label->setGeometry(40,333,115,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Event Offset @@ -345,11 +350,11 @@ EditDownload::EditDownload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_eventoffset_spin,tr("Event Offset:"),this); label->setGeometry(140,333,100,20); label->setFont(label_font); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); label=new QLabel(edit_eventoffset_spin,tr("days"),this); label->setGeometry(295,333,40,20); label->setFont(label_font); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Save As Button @@ -455,7 +460,7 @@ QSizePolicy EditDownload::sizePolicy() const void EditDownload::urlChangedData(const QString &str) { - QUrl url(str); + Q3Url url(str); QString protocol=url.protocol(); if((protocol=="ftp")||(protocol=="http")||(protocol=="file")|| (protocol=="scp")||(protocol=="sftp")) { @@ -519,7 +524,7 @@ void EditDownload::saveasData() void EditDownload::okData() { - if(QUrl::isRelativeUrl(edit_url_edit->text())|| + if(Q3Url::isRelativeUrl(edit_url_edit->text())|| (edit_url_edit->text().right(1)=="/")) { QMessageBox::warning(this,tr("Invalid URL"),tr("The URL is invalid!")); return; @@ -556,7 +561,7 @@ void EditDownload::cancelData() void EditDownload::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); + p->setPen(Qt::black); p->drawRect(10,262,sizeHint().width()-20,62); p->end(); } diff --git a/rdcatch/edit_download.h b/rdcatch/edit_download.h index ab80af8d..37839992 100644 --- a/rdcatch/edit_download.h +++ b/rdcatch/edit_download.h @@ -26,11 +26,15 @@ #include #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -66,7 +70,7 @@ class EditDownload : public QDialog RDRecording *edit_recording; QCheckBox *edit_active_button; QComboBox *edit_station_box; - QTimeEdit *edit_starttime_edit; + Q3TimeEdit *edit_starttime_edit; QLineEdit *edit_description_edit; QLineEdit *edit_url_edit; QLabel *edit_username_label; diff --git a/rdcatch/edit_playout.cpp b/rdcatch/edit_playout.cpp index 98485d74..e5c75d98 100644 --- a/rdcatch/edit_playout.cpp +++ b/rdcatch/edit_playout.cpp @@ -21,12 +21,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -87,7 +92,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this); label->setGeometry(30,11,125,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Station @@ -97,19 +102,19 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(edit_station_box,SIGNAL(activated(int)), this,SLOT(activateStationData(int))); // // Start Time // - edit_starttime_edit=new QTimeEdit(this); + edit_starttime_edit=new Q3TimeEdit(this); edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20); label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(sizeHint().width()-175,12,80,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Description @@ -120,7 +125,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,43,90,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Destination @@ -131,7 +136,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_destination_edit,tr("Destination:"),this); label->setGeometry(10,70,90,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-70,65,60,30); button->setFont(day_font); @@ -144,7 +149,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(tr("Active Days"),this); label->setGeometry(47,101,90,19); label->setFont(label_font); - label->setAlignment(AlignHCenter|ShowPrefix); + label->setAlignment(Qt::AlignHCenter|Qt::TextShowMnemonic); // // Monday Button @@ -154,7 +159,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_mon_button,tr("Monday"),this); label->setGeometry(40,120,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Tuesday Button @@ -164,7 +169,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_tue_button,tr("Tuesday"),this); label->setGeometry(135,120,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Wednesday Button @@ -174,7 +179,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_wed_button,tr("Wednesday"),this); label->setGeometry(235,120,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Thursday Button @@ -184,7 +189,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_thu_button,tr("Thursday"),this); label->setGeometry(355,120,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Friday Button @@ -194,7 +199,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_fri_button,tr("Friday"),this); label->setGeometry(460,120,40,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Saturday Button @@ -204,7 +209,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_sat_button,tr("Saturday"),this); label->setGeometry(150,145,60,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Sunday Button @@ -214,7 +219,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_sun_button,tr("Sunday"),this); label->setGeometry(320,145,60,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // OneShot Button @@ -224,7 +229,7 @@ EditPlayout::EditPlayout(int id,std::vector *adds,QString *filter, label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this); label->setGeometry(40,178,115,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Save As Button @@ -351,7 +356,7 @@ void EditPlayout::cancelData() void EditPlayout::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); + p->setPen(QColor(Qt::black)); p->drawRect(10,109,sizeHint().width()-20,62); p->end(); } diff --git a/rdcatch/edit_playout.h b/rdcatch/edit_playout.h index 85749728..6f892e58 100644 --- a/rdcatch/edit_playout.h +++ b/rdcatch/edit_playout.h @@ -26,11 +26,15 @@ #include #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -64,7 +68,7 @@ class EditPlayout : public QDialog RDRecording *edit_recording; QCheckBox *edit_active_button; QComboBox *edit_station_box; - QTimeEdit *edit_starttime_edit; + Q3TimeEdit *edit_starttime_edit; QLineEdit *edit_description_edit; QString edit_cutname; QLineEdit *edit_destination_edit; diff --git a/rdcatch/edit_recording.cpp b/rdcatch/edit_recording.cpp index 374881fd..b6b01514 100644 --- a/rdcatch/edit_recording.cpp +++ b/rdcatch/edit_recording.cpp @@ -22,12 +22,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -96,14 +101,14 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, QLabel * label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_station_box,SIGNAL(activated(int)), this,SLOT(activateStationData(int))); // // Start Parameters // - edit_starttype_group=new QButtonGroup(this); + edit_starttype_group=new Q3ButtonGroup(this); edit_starttype_group->setGeometry(10,47,sizeHint().width()-20,104); connect(edit_starttype_group,SIGNAL(clicked(int)), this,SLOT(startTypeClickedData(int))); @@ -111,42 +116,42 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, label=new QLabel(tr("Start Parameters"),this); label->setGeometry(47,38,120,19); label->setFont(label_font); - label->setAlignment(AlignHCenter|ShowPrefix); + label->setAlignment(Qt::AlignHCenter); QRadioButton *rbutton=new QRadioButton(tr("Use Hard Time"),this); rbutton->setGeometry(20,57,100,15); edit_starttype_group->insert(rbutton,RDRecording::HardStart); rbutton->setFont(day_font); - edit_starttime_edit=new QTimeEdit(this); + edit_starttime_edit=new Q3TimeEdit(this); edit_starttime_edit->setGeometry(235,53,80,20); edit_starttime_label=new QLabel(edit_starttime_edit,tr("Record Start Time:"), this); edit_starttime_label->setGeometry(125,57,105,15); edit_starttime_label->setFont(day_font); - edit_starttime_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_starttime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rbutton=new QRadioButton(tr("Use GPI"),this); rbutton->setGeometry(20,81,100,15); rbutton->setFont(day_font); - edit_start_startwindow_edit=new QTimeEdit(this); + edit_start_startwindow_edit=new Q3TimeEdit(this); edit_start_startwindow_edit->setGeometry(235,77,80,20); edit_start_startwindow_label= new QLabel(edit_start_startwindow_edit,tr("Window Start Time:"),this); edit_start_startwindow_label->setGeometry(125,81,105,15); edit_start_startwindow_label->setFont(day_font); edit_start_startwindow_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit_start_endwindow_edit=new QTimeEdit(this); + edit_start_endwindow_edit=new Q3TimeEdit(this); edit_start_endwindow_edit->setGeometry(435,77,80,20); edit_start_endwindow_label= new QLabel(edit_start_endwindow_edit,"Window End Time:",this); edit_start_endwindow_label->setGeometry(325,81,105,15); edit_start_endwindow_label->setFont(day_font); edit_start_endwindow_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_startmatrix_spin=new QSpinBox(this); edit_startmatrix_spin->setGeometry(185,99,30,20); @@ -155,7 +160,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, new QLabel(edit_startmatrix_spin,tr("GPI Matrix:"),this); edit_startmatrix_label->setGeometry(100,100,80,20); edit_startmatrix_label->setFont(day_font); - edit_startmatrix_label->setAlignment(AlignRight|AlignVCenter); + edit_startmatrix_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_startline_spin=new QSpinBox(this); edit_startline_spin->setGeometry(295,99,30,20); @@ -163,16 +168,16 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, edit_startline_label=new QLabel(edit_startline_spin,tr("GPI Line:"),this); edit_startline_label->setGeometry(230,100,60,20); edit_startline_label->setFont(day_font); - edit_startline_label->setAlignment(AlignRight|AlignVCenter); + edit_startline_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit_startoffset_edit=new QTimeEdit(this); + edit_startoffset_edit=new Q3TimeEdit(this); edit_startoffset_edit->setGeometry(435,99,80,20); edit_startoffset_label= new QLabel(edit_startoffset_edit,tr("Start Delay:"),this); edit_startoffset_label->setGeometry(325,100,105,20); edit_startoffset_label->setFont(day_font); edit_startoffset_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_multirec_box= new QCheckBox(tr("Allow Multiple Recordings within this Window"),this); @@ -184,7 +189,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, // // End Parameters // - edit_endtype_group=new QButtonGroup(this); + edit_endtype_group=new Q3ButtonGroup(this); edit_endtype_group->setGeometry(10,171,sizeHint().width()-20,104); connect(edit_endtype_group,SIGNAL(clicked(int)), this,SLOT(endTypeClickedData(int))); @@ -192,50 +197,50 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, label=new QLabel(tr("End Parameters"),this); label->setGeometry(47,162,120,19); label->setFont(label_font); - label->setAlignment(AlignHCenter|ShowPrefix); + label->setAlignment(Qt::AlignHCenter); rbutton=new QRadioButton(tr("Use Length"),this); rbutton->setGeometry(20,205,100,15); edit_endtype_group->insert(rbutton,RDRecording::LengthEnd); rbutton->setFont(day_font); - edit_endlength_edit=new QTimeEdit(this); + edit_endlength_edit=new Q3TimeEdit(this); edit_endlength_edit->setGeometry(235,201,80,20); edit_endlength_label=new QLabel(tr("Record Length:"),this); edit_endlength_label->setGeometry(125,205,105,15); edit_endlength_label->setFont(day_font); - edit_endlength_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_endlength_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rbutton=new QRadioButton(tr("Use Hard Time"),this); rbutton->setGeometry(20,181,1100,15); edit_endtype_group->insert(rbutton,RDRecording::HardEnd); rbutton->setFont(day_font); - edit_endtime_edit=new QTimeEdit(this); + edit_endtime_edit=new Q3TimeEdit(this); edit_endtime_edit->setGeometry(235,177,80,20); edit_endtime_label=new QLabel(edit_endtime_edit,tr("Record End Time:"),this); edit_endtime_label->setGeometry(125,177,105,15); edit_endtime_label->setFont(day_font); - edit_endtime_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_endtime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rbutton=new QRadioButton(tr("Use GPI"),this,"gpi_button"); rbutton->setGeometry(20,229,100,15); rbutton->setFont(day_font); - edit_end_startwindow_edit=new QTimeEdit(this); + edit_end_startwindow_edit=new Q3TimeEdit(this); edit_end_startwindow_edit->setGeometry(235,225,80,20); edit_end_startwindow_label= new QLabel(edit_end_startwindow_edit,tr("Window Start Time:"),this); edit_end_startwindow_label->setGeometry(125,229,105,15); edit_end_startwindow_label->setFont(day_font); edit_end_startwindow_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit_end_endwindow_edit=new QTimeEdit(this); + edit_end_endwindow_edit=new Q3TimeEdit(this); edit_end_endwindow_edit->setGeometry(435,225,80,20); edit_end_endwindow_label= new QLabel(edit_end_endwindow_edit,tr("Window End Time:"),this); edit_end_endwindow_label->setGeometry(325,229,105,15); edit_end_endwindow_label->setFont(day_font); edit_end_endwindow_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_endmatrix_spin=new QSpinBox(this); edit_endmatrix_spin->setGeometry(185,247,30,20); @@ -243,7 +248,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, edit_endmatrix_label=new QLabel(edit_endmatrix_spin,tr("GPI Matrix:"),this); edit_endmatrix_label->setGeometry(100,248,80,20); edit_endmatrix_label->setFont(day_font); - edit_endmatrix_label->setAlignment(AlignRight|AlignVCenter); + edit_endmatrix_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_endline_spin=new QSpinBox(this); edit_endline_spin->setGeometry(295,247,30,20); @@ -251,16 +256,16 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, edit_endline_label=new QLabel(edit_endline_spin,tr("GPI Line:"),this); edit_endline_label->setGeometry(230,248,60,20); edit_endline_label->setFont(day_font); - edit_endline_label->setAlignment(AlignRight|AlignVCenter); + edit_endline_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit_maxlength_edit=new QTimeEdit(this); + edit_maxlength_edit=new Q3TimeEdit(this); edit_maxlength_edit->setGeometry(435,247,80,20); edit_maxlength_label= new QLabel(edit_maxlength_edit,tr("Max Record Length:"),this); edit_maxlength_label->setGeometry(325,248,105,20); edit_maxlength_label->setFont(day_font); edit_maxlength_label-> - setAlignment(AlignRight|AlignVCenter|ShowPrefix); + setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_endtype_group->insert(rbutton,RDRecording::GpiEnd); @@ -273,7 +278,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,291,90,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Source Name @@ -283,7 +288,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, label=new QLabel(edit_source_box,tr("Source:"),this); label->setGeometry(10,317,90,24); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Destination @@ -294,7 +299,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, label=new QLabel(edit_destination_edit,tr("Destination:"),this); label->setGeometry(10,345,90,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-70,344,60,24); button->setFont(day_font); @@ -311,7 +316,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, label=new QLabel(edit_channels_box,tr("Channels:"),this); label->setGeometry(120,370,70,20); label->setFont(label_font); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Autotrim Controls @@ -328,12 +333,12 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, new QLabel(edit_autotrim_spin,tr("Level:"),this); edit_autotrim_label->setGeometry(220,393,40,20); edit_autotrim_label->setFont(label_font); - edit_autotrim_label->setAlignment(AlignVCenter|AlignRight); + edit_autotrim_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); edit_autotrim_unit= new QLabel(edit_autotrim_spin,tr("dBFS"),this); edit_autotrim_unit->setGeometry(310,393,40,20); edit_autotrim_unit->setFont(label_font); - edit_autotrim_unit->setAlignment(AlignVCenter|AlignLeft); + edit_autotrim_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Normalize Controls @@ -350,12 +355,12 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, new QLabel(edit_normalize_spin,tr("Level:"),this); edit_normalize_label->setGeometry(220,418,40,20); edit_normalize_label->setFont(label_font); - edit_normalize_label->setAlignment(AlignVCenter|AlignRight); + edit_normalize_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); edit_normalize_unit= new QLabel(edit_normalize_spin,tr("dBFS"),this); edit_normalize_unit->setGeometry(310,418,40,20); edit_normalize_unit->setFont(label_font); - edit_normalize_unit->setAlignment(AlignVCenter|AlignLeft); + edit_normalize_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Button Label @@ -363,7 +368,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, label=new QLabel(tr("Active Days"),this); label->setGeometry(47,440,90,19); label->setFont(label_font); - label->setAlignment(AlignHCenter|ShowPrefix); + label->setAlignment(Qt::AlignHCenter); // // Monday Button @@ -424,7 +429,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, label=new QLabel(edit_startoffset_box,tr("Start Date Offset:"),this); label->setGeometry(10,516,125,24); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // End Date Offset @@ -436,7 +441,7 @@ EditRecording::EditRecording(int id,std::vector *adds,QString *filter, label=new QLabel(edit_endoffset_box,tr("End Date Offset:"),this); label->setGeometry(310,516,125,24); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // OneShot Button @@ -763,7 +768,7 @@ void EditRecording::cancelData() void EditRecording::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); + p->setPen(Qt::black); p->drawRect(10,447,sizeHint().width()-20,62); p->end(); } diff --git a/rdcatch/edit_recording.h b/rdcatch/edit_recording.h index e5281431..11c17a3b 100644 --- a/rdcatch/edit_recording.h +++ b/rdcatch/edit_recording.h @@ -26,12 +26,16 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include #include #include @@ -87,25 +91,25 @@ class EditRecording : public QDialog QSpinBox *edit_startoffset_box; QSpinBox *edit_endoffset_box; QCheckBox *edit_oneshot_box; - QButtonGroup *edit_starttype_group; + Q3ButtonGroup *edit_starttype_group; QLabel *edit_starttime_label; - QButtonGroup *edit_endtype_group; + Q3ButtonGroup *edit_endtype_group; QLabel *edit_endtime_label; QLabel *edit_endlength_label; - QTimeEdit *edit_starttime_edit; - QTimeEdit *edit_endtime_edit; - QTimeEdit *edit_endlength_edit; + Q3TimeEdit *edit_starttime_edit; + Q3TimeEdit *edit_endtime_edit; + Q3TimeEdit *edit_endlength_edit; QLabel *edit_start_startwindow_label; - QTimeEdit *edit_start_startwindow_edit; + Q3TimeEdit *edit_start_startwindow_edit; QLabel *edit_start_endwindow_label; - QTimeEdit *edit_start_endwindow_edit; + Q3TimeEdit *edit_start_endwindow_edit; QLabel *edit_end_startwindow_label; QCheckBox *edit_multirec_box; QLabel *edit_maxlength_label; - QTimeEdit *edit_maxlength_edit; - QTimeEdit *edit_end_startwindow_edit; + Q3TimeEdit *edit_maxlength_edit; + Q3TimeEdit *edit_end_startwindow_edit; QLabel *edit_end_endwindow_label; - QTimeEdit *edit_end_endwindow_edit; + Q3TimeEdit *edit_end_endwindow_edit; QLabel *edit_startmatrix_label; QSpinBox *edit_startmatrix_spin; QLabel *edit_startline_label; @@ -115,9 +119,9 @@ class EditRecording : public QDialog QLabel *edit_endline_label; QSpinBox *edit_endline_spin; QLabel *edit_startlength_label; - QTimeEdit *edit_startlength_edit; + Q3TimeEdit *edit_startlength_edit; QLabel *edit_startoffset_label; - QTimeEdit *edit_startoffset_edit; + Q3TimeEdit *edit_startoffset_edit; std::vector *edit_added_events; QComboBox *edit_channels_box; QCheckBox *edit_autotrim_box; diff --git a/rdcatch/edit_switchevent.cpp b/rdcatch/edit_switchevent.cpp index 7506eecd..3b62901b 100644 --- a/rdcatch/edit_switchevent.cpp +++ b/rdcatch/edit_switchevent.cpp @@ -21,12 +21,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -87,7 +92,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this); label->setGeometry(30,11,125,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Station @@ -97,19 +102,19 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(edit_station_box,SIGNAL(activated(const QString &)), this,SLOT(activateStationData(const QString &))); // // Start Time // - edit_starttime_edit=new QTimeEdit(this); + edit_starttime_edit=new Q3TimeEdit(this); edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20); label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(sizeHint().width()-175,12,80,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Description @@ -120,7 +125,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,43,105,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Switch Matrix @@ -130,7 +135,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_matrix_box,tr("Switch Matrix:"),this); label->setGeometry(10,70,105,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(edit_matrix_box,SIGNAL(activated(const QString &)), this,SLOT(activateMatrixData(const QString &))); @@ -142,7 +147,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_input_box,tr("Switch Input:"),this); label->setGeometry(10,100,105,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); edit_input_spin=new QSpinBox(this); edit_input_spin->setGeometry(140,125,50,20); connect(edit_input_box,SIGNAL(activated(const QString &)), @@ -156,7 +161,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_output_box,tr("Switch Output:"),this); label->setGeometry(10,155,105,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); edit_output_spin=new QSpinBox(this); edit_output_spin->setGeometry(140,180,50,20); connect(edit_output_box,SIGNAL(activated(const QString &)), @@ -168,7 +173,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(tr("Active Days"),this); label->setGeometry(47,210,80,19); label->setFont(label_font); - label->setAlignment(AlignHCenter|ShowPrefix); + label->setAlignment(Qt::AlignHCenter|Qt::TextShowMnemonic); // // Monday Button @@ -178,7 +183,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_mon_button,tr("Monday"),this); label->setGeometry(40,228,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Tuesday Button @@ -188,7 +193,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_tue_button,tr("Tuesday"),this); label->setGeometry(135,228,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Wednesday Button @@ -198,7 +203,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_wed_button,tr("Wednesday"),this); label->setGeometry(235,228,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Thursday Button @@ -208,7 +213,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_thu_button,tr("Thursday"),this); label->setGeometry(355,228,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Friday Button @@ -218,7 +223,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_fri_button,tr("Friday"),this); label->setGeometry(460,228,40,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Saturday Button @@ -228,7 +233,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_sat_button,tr("Saturday"),this); label->setGeometry(150,253,60,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Sunday Button @@ -238,7 +243,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_sun_button,tr("Sunday"),this); label->setGeometry(320,253,60,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // OneShot Button @@ -248,7 +253,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector *adds,QWidget *parent) label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this); label->setGeometry(40,288,115,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Save As Button @@ -493,7 +498,7 @@ void EditSwitchEvent::cancelData() void EditSwitchEvent::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); + p->setPen(QColor(Qt::black)); p->drawRect(10,218,sizeHint().width()-20,62); p->end(); } diff --git a/rdcatch/edit_switchevent.h b/rdcatch/edit_switchevent.h index ce77985e..30f0141f 100644 --- a/rdcatch/edit_switchevent.h +++ b/rdcatch/edit_switchevent.h @@ -26,10 +26,14 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -72,7 +76,7 @@ class EditSwitchEvent : public QDialog RDRecording *edit_recording; QCheckBox *edit_active_button; QComboBox *edit_station_box; - QTimeEdit *edit_starttime_edit; + Q3TimeEdit *edit_starttime_edit; QLineEdit *edit_description_edit; QComboBox *edit_matrix_box; QComboBox *edit_input_box; diff --git a/rdcatch/edit_upload.cpp b/rdcatch/edit_upload.cpp index 94226218..2a045872 100644 --- a/rdcatch/edit_upload.cpp +++ b/rdcatch/edit_upload.cpp @@ -21,12 +21,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -91,7 +96,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this); label->setGeometry(30,11,125,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Station @@ -103,17 +108,17 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_station_box,tr("Location:"),this); label->setGeometry(125,10,70,23); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Start Time // - edit_starttime_edit=new QTimeEdit(this); + edit_starttime_edit=new Q3TimeEdit(this); edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20); label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(sizeHint().width()-175,12,80,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // RSS Feed @@ -124,7 +129,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_feed_box,tr("RSS Feed:"),this); label->setGeometry(10,43,100,19); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Source @@ -135,7 +140,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_destination_edit,tr("Source:"),this); label->setGeometry(10,70,100,19); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); QPushButton *button=new QPushButton(this); button->setGeometry(sizeHint().width()-70,68,60,24); button->setFont(day_font); @@ -151,7 +156,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_description_edit,tr("Description:"),this); label->setGeometry(10,97,100,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Url @@ -165,7 +170,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_url_edit,tr("Url:"),this); label->setGeometry(10,124,100,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Username @@ -177,7 +182,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, edit_username_label=new QLabel(edit_username_edit,tr("Username:"),this); edit_username_label->setGeometry(10,151,100,20); edit_username_label->setFont(label_font); - edit_username_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_username_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Password @@ -190,7 +195,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, edit_password_label=new QLabel(edit_password_edit,tr("Password:"),this); edit_password_label->setGeometry(275,151,80,20); edit_password_label->setFont(label_font); - edit_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + edit_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Audio Format @@ -201,7 +206,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_format_edit,tr("Export Format:"),this); label->setGeometry(5,178,105,20); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); button=new QPushButton(this); button->setGeometry(sizeHint().width()-70,176,60,24); button->setFont(day_font); @@ -217,7 +222,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_normalize_box,tr("Normalize"),this); label->setGeometry(135,206,83,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(edit_normalize_box,SIGNAL(toggled(bool)), this,SLOT(normalizeCheckData(bool))); @@ -230,11 +235,11 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, edit_normalize_label=new QLabel(edit_normalize_spin,tr("Level:"),this); edit_normalize_label->setGeometry(215,206,45,20); edit_normalize_label->setFont(label_font); - edit_normalize_label->setAlignment(AlignRight|AlignVCenter); + edit_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); edit_normalize_unit=new QLabel(tr("dBFS"),this); edit_normalize_unit->setGeometry(310,206,40,20); edit_normalize_unit->setFont(label_font); - edit_normalize_unit->setAlignment(AlignLeft|AlignVCenter); + edit_normalize_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Export Metadata Box @@ -244,7 +249,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_metadata_box,tr("Export Library Metadata"),this); label->setGeometry(135,231,160,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Button Label @@ -252,7 +257,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(tr("Active Days"),this); label->setGeometry(47,263,90,19); label->setFont(label_font); - label->setAlignment(AlignHCenter|ShowPrefix); + label->setAlignment(Qt::AlignHCenter|Qt::TextShowMnemonic); // // Monday Button @@ -262,7 +267,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_mon_button,tr("Monday"),this); label->setGeometry(40,282,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Tuesday Button @@ -272,7 +277,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_tue_button,tr("Tuesday"),this); label->setGeometry(135,282,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Wednesday Button @@ -282,7 +287,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_wed_button,tr("Wednesday"),this); label->setGeometry(235,282,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Thursday Button @@ -292,7 +297,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_thu_button,tr("Thursday"),this); label->setGeometry(355,282,115,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Friday Button @@ -302,7 +307,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_fri_button,tr("Friday"),this); label->setGeometry(460,282,40,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Saturday Button @@ -312,7 +317,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_sat_button,tr("Saturday"),this); label->setGeometry(150,307,60,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Sunday Button @@ -322,7 +327,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_sun_button,tr("Sunday"),this); label->setGeometry(320,307,60,20); label->setFont(day_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // OneShot Button @@ -332,7 +337,7 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this); label->setGeometry(40,343,115,20); label->setFont(label_font); - label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Event Offset @@ -343,11 +348,11 @@ EditUpload::EditUpload(int id,std::vector *adds,QString *filter, label=new QLabel(edit_eventoffset_spin,tr("Event Offset:"),this); label->setGeometry(140,340,100,20); label->setFont(label_font); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); label=new QLabel(edit_eventoffset_spin,tr("days"),this); label->setGeometry(295,335,40,20); label->setFont(label_font); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Save As Button @@ -469,7 +474,7 @@ void EditUpload::stationChangedData(const QString &str) void EditUpload::urlChangedData(const QString &str) { - QUrl url(str); + Q3Url url(str); QString protocol=url.protocol().lower(); if((protocol=="ftp")||(protocol=="file")|| (protocol=="scp")||(protocol=="sftp")) { @@ -542,7 +547,7 @@ void EditUpload::okData() tr("The currently selected export format is unsupported on host ")+edit_station_box->currentText()+"!"); return; } - if(QUrl::isRelativeUrl(edit_url_edit->text())|| + if(Q3Url::isRelativeUrl(edit_url_edit->text())|| (edit_url_edit->text().right(1)=="/")) { QMessageBox::warning(this,tr("Invalid URL"),tr("The URL is invalid!")); return; @@ -579,7 +584,7 @@ void EditUpload::cancelData() void EditUpload::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); + p->setPen(QColor(Qt::black)); p->drawRect(10,271,sizeHint().width()-20,62); p->end(); } diff --git a/rdcatch/edit_upload.h b/rdcatch/edit_upload.h index 68f7e9b7..d4db0437 100644 --- a/rdcatch/edit_upload.h +++ b/rdcatch/edit_upload.h @@ -26,11 +26,15 @@ #include #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -70,7 +74,7 @@ class EditUpload : public QDialog RDSettings edit_settings; QCheckBox *edit_active_button; QComboBox *edit_station_box; - QTimeEdit *edit_starttime_edit; + Q3TimeEdit *edit_starttime_edit; QComboBox *edit_feed_box; QLineEdit *edit_description_edit; QLineEdit *edit_url_edit; diff --git a/rdcatch/list_reports.cpp b/rdcatch/list_reports.cpp index ac08c6e4..eebbd269 100644 --- a/rdcatch/list_reports.cpp +++ b/rdcatch/list_reports.cpp @@ -69,7 +69,7 @@ ListReports::ListReports(bool today_only,bool active_only,int dow, new QLabel(list_reports_box,tr("Type:"),this); list_reports_label->setGeometry(10,10,35,19); list_reports_label->setFont(font); - list_reports_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + list_reports_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Generate Button diff --git a/rdcatch/rdcatch.cpp b/rdcatch/rdcatch.cpp index 1dc49485..69b15e39 100644 --- a/rdcatch/rdcatch.cpp +++ b/rdcatch/rdcatch.cpp @@ -25,16 +25,20 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -203,8 +207,8 @@ MainWidget::MainWidget(QWidget *parent) str=QString("RDCatch")+" v"+VERSION+" - "+tr("Host")+":"; setCaption(str+" "+rda->config()->stationName()); - connect(RDDbStatus(),SIGNAL(logText(RDConfig::LogPriority,const QString &)), - this,SLOT(log(RDConfig::LogPriority,const QString &))); + // connect(RDDbStatus(),SIGNAL(logText(RDConfig::LogPriority,const QString &)), + // this,SLOT(log(RDConfig::LogPriority,const QString &))); // // Allocate Global Resources @@ -247,7 +251,7 @@ MainWidget::MainWidget(QWidget *parent) // // Deck Monitors // - catch_monitor_view=new QScrollView(this,"",Qt::WNoAutoErase); + catch_monitor_view=new Q3ScrollView(this,"",Qt::WNoAutoErase); catch_monitor_vbox=new VBox(catch_monitor_view); catch_monitor_vbox->setSpacing(2); catch_monitor_view->addChild(catch_monitor_vbox); @@ -341,21 +345,21 @@ MainWidget::MainWidget(QWidget *parent) tr("Show Only Active Events"), this,"catch_show_active_label"); catch_show_active_label->setFont(label_font); - catch_show_active_label->setAlignment(AlignLeft|AlignVCenter); + catch_show_active_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(catch_show_active_box,SIGNAL(toggled(bool)), this,SLOT(filterChangedData(bool))); catch_show_today_box=new QCheckBox(this); catch_show_today_label= new QLabel(catch_show_active_box,tr("Show Only Today's Events"),this); catch_show_today_label->setFont(label_font); - catch_show_today_label->setAlignment(AlignLeft|AlignVCenter); + catch_show_today_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(catch_show_today_box,SIGNAL(toggled(bool)), this,SLOT(filterChangedData(bool))); catch_dow_box=new QComboBox(this); catch_dow_label=new QLabel(catch_dow_box,tr("Show DayOfWeek:"),this); catch_dow_label->setFont(label_font); - catch_dow_label->setAlignment(AlignRight|AlignVCenter); + catch_dow_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); catch_dow_box->insertItem(tr("All")); catch_dow_box->insertItem(tr("Weekdays")); catch_dow_box->insertItem(tr("Sunday")); @@ -371,7 +375,7 @@ MainWidget::MainWidget(QWidget *parent) connect(catch_type_box,SIGNAL(activated(int)),this,SLOT(filterActivatedData(int))); catch_type_label=new QLabel(catch_type_box,tr("Show Event Type")+":",this); catch_type_label->setFont(label_font); - catch_type_label->setAlignment(AlignRight|AlignVCenter); + catch_type_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); for(int i=0;iinsertItem(*(catch_type_maps[i]), RDRecording::typeString((RDRecording::Type)i)); @@ -392,12 +396,12 @@ MainWidget::MainWidget(QWidget *parent) catch_recordings_list->setAllColumnsShowFocus(true); catch_recordings_list->setItemMargin(5); catch_recordings_list->setFont(list_font); - connect(catch_recordings_list,SIGNAL(selectionChanged(QListViewItem *)), - this,SLOT(selectionChangedData(QListViewItem *))); + connect(catch_recordings_list,SIGNAL(selectionChanged(Q3ListViewItem *)), + this,SLOT(selectionChangedData(Q3ListViewItem *))); connect(catch_recordings_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); catch_recordings_list->addColumn(""); catch_recordings_list->setColumnAlignment(0,Qt::AlignHCenter); @@ -512,7 +516,7 @@ MainWidget::MainWidget(QWidget *parent) // catch_clock_label=new QLabel("00:00:00",this); catch_clock_label->setFont(clock_font); - catch_clock_label->setAlignment(AlignCenter); + catch_clock_label->setAlignment(Qt::AlignCenter); catch_clock_timer=new QTimer(this); connect(catch_clock_timer,SIGNAL(timeout()),this,SLOT(clockData())); clockData(); @@ -536,7 +540,7 @@ MainWidget::MainWidget(QWidget *parent) // catch_stop_button=new RDTransportButton(RDTransportButton::Stop,this); catch_stop_button->setDisabled(true); - catch_stop_button->setOnColor(red); + catch_stop_button->setOnColor(Qt::red); connect(catch_stop_button,SIGNAL(clicked()),this,SLOT(stopButtonData())); catch_stop_button->on(); @@ -1188,7 +1192,7 @@ void MainWidget::monitorData(int id) } -void MainWidget::selectionChangedData(QListViewItem *item) +void MainWidget::selectionChangedData(Q3ListViewItem *item) { if(item==NULL) { catch_head_button->setDisabled(true); @@ -1215,7 +1219,7 @@ void MainWidget::selectionChangedData(QListViewItem *item) } -void MainWidget::doubleClickedData(QListViewItem *,const QPoint &,int) +void MainWidget::doubleClickedData(Q3ListViewItem *,const QPoint &,int) { editData(); } @@ -2201,7 +2205,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(), + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(), "."); a.installTranslator(&qt); diff --git a/rdcatch/rdcatch.h b/rdcatch/rdcatch.h index 6fc86111..58dec880 100644 --- a/rdcatch/rdcatch.h +++ b/rdcatch/rdcatch.h @@ -32,7 +32,11 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include #include #include @@ -103,8 +107,8 @@ class MainWidget : public QWidget void meterLevelData(int,int,int,int); void abortData(int); void monitorData(int); - void selectionChangedData(QListViewItem *item); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void selectionChangedData(Q3ListViewItem *item); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void filterChangedData(bool state); void filterActivatedData(int id); void clockData(); @@ -141,7 +145,7 @@ class MainWidget : public QWidget void LoadGeometry(); void SaveGeometry(); std::vector catch_monitor; - QScrollView *catch_monitor_view; + Q3ScrollView *catch_monitor_view; VBox *catch_monitor_vbox; std::vector catch_connect; QSqlDatabase *catch_db; diff --git a/rdcatch/rdcatch_cs.ts b/rdcatch/rdcatch_cs.ts index 796a1ba4..6973aeff 100644 --- a/rdcatch/rdcatch_cs.ts +++ b/rdcatch/rdcatch_cs.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_de.ts b/rdcatch/rdcatch_de.ts index 182194b1..19206148 100644 --- a/rdcatch/rdcatch_de.ts +++ b/rdcatch/rdcatch_de.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_es.ts b/rdcatch/rdcatch_es.ts index cf0c1b06..3477d5ea 100644 --- a/rdcatch/rdcatch_es.ts +++ b/rdcatch/rdcatch_es.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_fr.ts b/rdcatch/rdcatch_fr.ts index a4d5d5f5..d5612eaa 100644 --- a/rdcatch/rdcatch_fr.ts +++ b/rdcatch/rdcatch_fr.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_nb.ts b/rdcatch/rdcatch_nb.ts index 32dd579e..e1642adf 100644 --- a/rdcatch/rdcatch_nb.ts +++ b/rdcatch/rdcatch_nb.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_nn.ts b/rdcatch/rdcatch_nn.ts index 32dd579e..e1642adf 100644 --- a/rdcatch/rdcatch_nn.ts +++ b/rdcatch/rdcatch_nn.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_pt_BR.ts b/rdcatch/rdcatch_pt_BR.ts index 66cda4b7..f1c48bc7 100644 --- a/rdcatch/rdcatch_pt_BR.ts +++ b/rdcatch/rdcatch_pt_BR.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/vbox.cpp b/rdcatch/vbox.cpp index 902430d9..cfd301ba 100644 --- a/rdcatch/vbox.cpp +++ b/rdcatch/vbox.cpp @@ -18,11 +18,11 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include +#include #include -VBox::VBox(QWidget *parent,const char *name,WFlags f) +VBox::VBox(QWidget *parent,const char *name,Qt::WFlags f) : QWidget(parent,name,f) { box_spacing=0; diff --git a/rdcatch/vbox.h b/rdcatch/vbox.h index 7ec55b17..4bad9e5f 100644 --- a/rdcatch/vbox.h +++ b/rdcatch/vbox.h @@ -31,7 +31,7 @@ class VBox : public QWidget { Q_OBJECT public: - VBox(QWidget *parent=0,const char *name=0,WFlags f=0); + VBox(QWidget *parent=0,const char *name=0,Qt::WFlags f=0); void addWidget(QWidget *widget); void setSpacing(int space); diff --git a/rdcatchd/Makefile.am b/rdcatchd/Makefile.am index 696dc43f..2607baea 100644 --- a/rdcatchd/Makefile.am +++ b/rdcatchd/Makefile.am @@ -2,7 +2,7 @@ ## ## rdcatchd/ Makefile.am for Rivendell ## -## (C) Copyright 2002-2016 Fred Gleason +## (C) Copyright 2002-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +20,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # QT's Meta Object Compiler (moc) @@ -42,7 +42,7 @@ nodist_rdcatchd_SOURCES = moc_event_player.cpp\ moc_rdcatchd.cpp\ moc_rdcatchd_socket.cpp -rdcatchd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdcatchd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ moc_* diff --git a/rdcatchd/batch.cpp b/rdcatchd/batch.cpp index 3a4396f9..6249d1a6 100644 --- a/rdcatchd/batch.cpp +++ b/rdcatchd/batch.cpp @@ -195,7 +195,7 @@ void MainObject::RunDownload(CatchEvent *evt) QString url_username=evt->urlUsername(); QString url_password=evt->urlPassword(); if(url_username.isEmpty()&& - (QUrl(evt->resolvedUrl()).protocol().lower()=="ftp")) { + (Q3Url(evt->resolvedUrl()).protocol().lower()=="ftp")) { url_username=RD_ANON_FTP_USERNAME; url_password=QString(RD_ANON_FTP_PASSWORD)+"-"+VERSION; } @@ -316,7 +316,7 @@ void MainObject::RunUpload(CatchEvent *evt) QString url_username=evt->urlUsername(); QString url_password=evt->urlPassword(); if(url_username.isEmpty()&& - (QUrl(evt->resolvedUrl()).protocol().lower()=="ftp")) { + (Q3Url(evt->resolvedUrl()).protocol().lower()=="ftp")) { url_username=RD_ANON_FTP_USERNAME; url_password=QString(RD_ANON_FTP_PASSWORD)+"-"+VERSION; } diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index 34bbc6fd..43f68e56 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -214,8 +214,8 @@ MainObject::MainObject(QObject *parent) } connect(server,SIGNAL(connection(int)),this,SLOT(newConnection(int))); - connect (RDDbStatus(),SIGNAL(logText(RDConfig::LogPriority,const QString &)), - this,SLOT(log(RDConfig::LogPriority,const QString &))); + // connect (RDDbStatus(),SIGNAL(logText(RDConfig::LogPriority,const QString &)), + // this,SLOT(log(RDConfig::LogPriority,const QString &))); // // Create RDCatchConf @@ -316,7 +316,7 @@ MainObject::MainObject(QObject *parent) if(fork()==0) { execl(QString(RD_PREFIX)+"/sbin/rdvairplayd","rdvairplayd",(char *)NULL); rda->log(RDConfig::LogWarning,QString("failed to start rdvairplayd(1) [")+ - strerror(errno)+"]"); + QString(strerror(errno))+"]"); exit(1); } StartDropboxes(); @@ -1853,7 +1853,7 @@ void MainObject::KillSocket(int ch) void MainObject::EchoCommand(int ch,const char *command) { // LogLine(RDConfig::LogDebug,QString().sprintf("rdcatchd: EchoCommand(%d,%s)",ch,command)); - if(socket[ch]->state()==QSocket::Connection) { + if(socket[ch]->state()==Q3Socket::Connection) { socket[ch]->writeBlock(command,strlen(command)); } } diff --git a/rdcatchd/rdcatchd.h b/rdcatchd/rdcatchd.h index f2050596..ed14c584 100644 --- a/rdcatchd/rdcatchd.h +++ b/rdcatchd/rdcatchd.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include @@ -183,7 +183,7 @@ class MainObject : public QObject bool debug; RDTimeEngine *catch_engine; Q_INT16 tcp_port; - QServerSocket *server; + Q3ServerSocket *server; RDCatchConnect *catch_connect; RDSocket *socket[RDCATCHD_MAX_CONNECTIONS]; char args[RDCATCHD_MAX_CONNECTIONS][RDCATCHD_MAX_ARGS][RDCATCHD_MAX_LENGTH]; diff --git a/rdcatchd/rdcatchd_socket.cpp b/rdcatchd/rdcatchd_socket.cpp index a9ec7c0f..d2f11a67 100644 --- a/rdcatchd/rdcatchd_socket.cpp +++ b/rdcatchd/rdcatchd_socket.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -30,14 +30,14 @@ #include RDCatchdSocket::RDCatchdSocket(Q_UINT16 port,int backlog,QObject *parent) - : QServerSocket(port,0,parent) + : Q3ServerSocket(port,0,parent) { } RDCatchdSocket::RDCatchdSocket(const QHostAddress &address,Q_UINT16 port,int backlog, QObject *parent,const char *name) - : QServerSocket(address,port,0,parent,name) + : Q3ServerSocket(address,port,0,parent,name) { } diff --git a/rdcatchd/rdcatchd_socket.h b/rdcatchd/rdcatchd_socket.h index f6a70a9f..7ebc8b6c 100644 --- a/rdcatchd/rdcatchd_socket.h +++ b/rdcatchd/rdcatchd_socket.h @@ -23,10 +23,10 @@ #include #include -#include +#include #include -class RDCatchdSocket : public QServerSocket +class RDCatchdSocket : public Q3ServerSocket { Q_OBJECT public: @@ -39,7 +39,7 @@ class RDCatchdSocket : public QServerSocket void connection(int); private: - QServerSocket *socket; + Q3ServerSocket *socket; }; diff --git a/rdhpi/Makefile.am b/rdhpi/Makefile.am index 47f6c04e..8bb0f24f 100644 --- a/rdhpi/Makefile.am +++ b/rdhpi/Makefile.am @@ -6,7 +6,7 @@ ## ## Use automake to process this into a Makefile.in ## -## (C) Copyright 2002-2007,2016 Fred Gleason +## (C) Copyright 2002-2007,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -22,8 +22,8 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ CWRAP = ../helpers/cwrap @@ -46,8 +46,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdhpi_*.qm all: - @QT_BIN@/lupdate rdhpi.pro - @QT_BIN@/lrelease rdhpi.pro + lupdate-qt4 rdhpi.pro + lrelease-qt4 rdhpi.pro lib_LTLIBRARIES = librdhpi.la dist_librdhpi_la_SOURCES = rdhpicardselector.cpp rdhpicardselector.h\ diff --git a/rdhpi/rdhpi_cs.ts b/rdhpi/rdhpi_cs.ts index 6efaa214..64832049 100644 --- a/rdhpi/rdhpi_cs.ts +++ b/rdhpi/rdhpi_cs.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_de.ts b/rdhpi/rdhpi_de.ts index 78cd96b9..cfdd965d 100644 --- a/rdhpi/rdhpi_de.ts +++ b/rdhpi/rdhpi_de.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_es.ts b/rdhpi/rdhpi_es.ts index 06927ae4..a2efc5f7 100644 --- a/rdhpi/rdhpi_es.ts +++ b/rdhpi/rdhpi_es.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_fr.ts b/rdhpi/rdhpi_fr.ts index 06927ae4..a2efc5f7 100644 --- a/rdhpi/rdhpi_fr.ts +++ b/rdhpi/rdhpi_fr.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_nb.ts b/rdhpi/rdhpi_nb.ts index 34ad9266..b95eb1bc 100644 --- a/rdhpi/rdhpi_nb.ts +++ b/rdhpi/rdhpi_nb.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_nn.ts b/rdhpi/rdhpi_nn.ts index 34ad9266..b95eb1bc 100644 --- a/rdhpi/rdhpi_nn.ts +++ b/rdhpi/rdhpi_nn.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_pt_BR.ts b/rdhpi/rdhpi_pt_BR.ts index 24cac993..22e48ec0 100644 --- a/rdhpi/rdhpi_pt_BR.ts +++ b/rdhpi/rdhpi_pt_BR.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpicardselector.cpp b/rdhpi/rdhpicardselector.cpp index 1b40ddd1..4ccca604 100644 --- a/rdhpi/rdhpicardselector.cpp +++ b/rdhpi/rdhpicardselector.cpp @@ -23,12 +23,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include @@ -53,7 +53,7 @@ RDHPICardSelector::RDHPICardSelector(QWidget *parent) card_title=new QLabel(this); card_title->setGeometry(0,0,geometry().width(),19); card_title->setFont(font); - card_title->setAlignment(AlignHCenter); + card_title->setAlignment(Qt::AlignHCenter); card_title->hide(); // @@ -68,7 +68,7 @@ RDHPICardSelector::RDHPICardSelector(QWidget *parent) connect(card_card_box,SIGNAL(valueChanged(int)),this,SLOT(cardData(int))); card_card_label=new QLabel(card_card_box,"Card:",this); card_card_label->setGeometry(0,yoffset+2,55,19); - card_card_label->setAlignment(AlignRight|ShowPrefix); + card_card_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Port @@ -81,7 +81,7 @@ RDHPICardSelector::RDHPICardSelector(QWidget *parent) connect(card_port_box,SIGNAL(valueChanged(int)),this,SLOT(portData(int))); card_port_label=new QLabel(card_port_box,"Port:",this); card_port_label->setGeometry(0,yoffset+24,55,19); - card_port_label->setAlignment(AlignRight|ShowPrefix); + card_port_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); } diff --git a/rdhpi/rdhpisoundselector.cpp b/rdhpi/rdhpisoundselector.cpp index a8b0d482..b368324b 100644 --- a/rdhpi/rdhpisoundselector.cpp +++ b/rdhpi/rdhpisoundselector.cpp @@ -36,7 +36,7 @@ RDHPISoundSelector::RDHPISoundSelector(RDHPISoundCard::DeviceClass dev_class, QWidget *parent) - :QListBox(parent) + :Q3ListBox(parent) { sound_card=new RDHPISoundCard(this); diff --git a/rdhpi/rdhpisoundselector.h b/rdhpi/rdhpisoundselector.h index d3ea4ca4..74733407 100644 --- a/rdhpi/rdhpisoundselector.h +++ b/rdhpi/rdhpisoundselector.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include @@ -41,7 +41,7 @@ #include #endif // JACK -class RDHPISoundSelector : public QListBox +class RDHPISoundSelector : public Q3ListBox { Q_OBJECT diff --git a/rdlibrary/Makefile.am b/rdlibrary/Makefile.am index e5575fe9..85a77a55 100644 --- a/rdlibrary/Makefile.am +++ b/rdlibrary/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/rdlibrary ## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +20,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,14 +37,13 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlibrary_*.qm all: - @QT_BIN@/lupdate rdlibrary.pro - @QT_BIN@/lrelease rdlibrary.pro + lupdate-qt4 rdlibrary.pro + lrelease-qt4 rdlibrary.pro bin_PROGRAMS = rdlibrary dist_rdlibrary_SOURCES = audio_cart.cpp audio_cart.h\ audio_controls.h\ - cart_tip.cpp cart_tip.h\ cdripper.cpp cdripper.h\ disk_gauge.cpp disk_gauge.h\ disk_ripper.cpp disk_ripper.h\ @@ -76,7 +75,7 @@ nodist_rdlibrary_SOURCES = moc_audio_cart.cpp\ moc_rdlibrary.cpp\ moc_record_cut.cpp -rdlibrary_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdlibrary_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdlibrary.pro\ rdlibrary_cs.ts\ diff --git a/rdlibrary/audio_cart.cpp b/rdlibrary/audio_cart.cpp index a16774d9..200e7f02 100644 --- a/rdlibrary/audio_cart.cpp +++ b/rdlibrary/audio_cart.cpp @@ -23,14 +23,14 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -82,7 +82,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, // // Progress Dialog // - rdcart_progress_dialog=new QProgressDialog(this); + rdcart_progress_dialog=new Q3ProgressDialog(this); rdcart_progress_dialog->setLabelText(tr("Copying audio...")); rdcart_progress_dialog->setCancelButton(NULL); rdcart_progress_dialog->setTotalSteps(10); @@ -130,13 +130,13 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, rdcart_cut_list=new RDListView(this); rdcart_cut_list->setGeometry(100,0,430,sizeHint().height()); rdcart_cut_list->setAllColumnsShowFocus(true); - rdcart_cut_list->setSelectionMode(QListView::Extended); + rdcart_cut_list->setSelectionMode(Q3ListView::Extended); rdcart_cut_list->setItemMargin(5); rdcart_cut_list->setSorting(11); connect(rdcart_cut_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); rdcart_cut_list->addColumn(tr("WT")); rdcart_cut_list->setColumnAlignment(0,Qt::AlignHCenter); @@ -195,8 +195,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, p->setPen(QColor(system_button_text_color)); p->setFont(button_font); p->drawText((80-m->width(tr("Cut Info")))/2,20,tr("Cut Info")); - p->moveTo(10,24); - p->lineTo(70,24); + p->drawLine(10,24,70,24); p->drawText((80-m->width(tr("Record")))/2,38,tr("Record")); p->end(); QPushButton *record_cut_button=new QPushButton(this); @@ -238,8 +237,7 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, p->setPen(QColor(system_button_text_color)); p->setFont(button_font); p->drawText((80-m->width(tr("Import")))/2,20,tr("Import")); - p->moveTo(10,24); - p->lineTo(70,24); + p->drawLine(10,24,70,24); p->drawText((80-m->width(tr("Export")))/2,38,tr("Export")); p->end(); QPushButton *import_cut_button=new QPushButton(this); @@ -351,7 +349,7 @@ void AudioCart::deleteCutData() QMessageBox::Yes,QMessageBox::No)) { case QMessageBox::No: - case QMessageBox::NoButton: + case Qt::NoButton: return; default: @@ -687,7 +685,7 @@ void AudioCart::importCutData() } -void AudioCart::doubleClickedData(QListViewItem *,const QPoint &,int) +void AudioCart::doubleClickedData(Q3ListViewItem *,const QPoint &,int) { recordCutData(); } diff --git a/rdlibrary/audio_cart.h b/rdlibrary/audio_cart.h index b03d8468..10ecb341 100644 --- a/rdlibrary/audio_cart.h +++ b/rdlibrary/audio_cart.h @@ -25,16 +25,16 @@ #include #include -#include +#include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include @@ -73,7 +73,7 @@ class AudioCart : public QWidget * cut of audio. **/ void extEditorCutData(); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void copyProgressData(const QVariant &step); signals: @@ -92,7 +92,7 @@ class AudioCart : public QWidget bool rdcart_select_cut; AudioControls *rdcart_controls; QPushButton *paste_cut_button; - QProgressDialog *rdcart_progress_dialog; + Q3ProgressDialog *rdcart_progress_dialog; bool rdcart_modification_allowed; bool rdcart_import_metadata; bool rdcart_profile_rip; diff --git a/rdlibrary/audio_controls.h b/rdlibrary/audio_controls.h index 6eec158a..cb1a1550 100644 --- a/rdlibrary/audio_controls.h +++ b/rdlibrary/audio_controls.h @@ -22,7 +22,7 @@ #define AUDIO_CONTROLS_H #include -#include +#include #include #include diff --git a/rdlibrary/cdripper.cpp b/rdlibrary/cdripper.cpp index 90c7357a..07a63f55 100644 --- a/rdlibrary/cdripper.cpp +++ b/rdlibrary/cdripper.cpp @@ -27,10 +27,14 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -131,7 +135,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // rip_title_label=new QLabel(tr("Title:"),this); rip_title_label->setFont(label_font); - rip_title_label->setAlignment(AlignRight|AlignVCenter); + rip_title_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rip_title_box=new QComboBox(this); rip_title_box->insertItem(tr("[none]")); @@ -140,7 +144,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // rip_artist_label=new QLabel(tr("Artist:"),this); rip_artist_label->setFont(label_font); - rip_artist_label->setAlignment(AlignRight|AlignVCenter); + rip_artist_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rip_artist_edit=new QLineEdit(this); // @@ -148,7 +152,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // rip_album_label=new QLabel(tr("Album:"),this); rip_album_label->setFont(label_font); - rip_album_label->setAlignment(AlignRight|AlignVCenter); + rip_album_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rip_album_edit=new QLineEdit(this); // @@ -156,8 +160,8 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // rip_other_label=new QLabel(tr("Other:"),this); rip_other_label->setFont(label_font); - rip_other_label->setAlignment(AlignRight); - rip_other_edit=new QTextEdit(this); + rip_other_label->setAlignment(Qt::AlignRight); + rip_other_edit=new Q3TextEdit(this); rip_other_edit->setReadOnly(true); // @@ -169,7 +173,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, rip_apply_label= new QLabel(rip_apply_box,tr("Apply FreeDB Values to Cart"),this); rip_apply_label->setFont(label_font); - rip_apply_label->setAlignment(AlignLeft); + rip_apply_label->setAlignment(Qt::AlignLeft); rip_apply_box->setChecked(false); rip_apply_label->setDisabled(true); @@ -178,7 +182,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // rip_track_list=new RDListView(this); rip_track_list->setAllColumnsShowFocus(true); - rip_track_list->setSelectionMode(QListView::Extended); + rip_track_list->setSelectionMode(Q3ListView::Extended); rip_track_list->setItemMargin(5); rip_track_list->setSorting(-1); connect(rip_track_list,SIGNAL(selectionChanged()), @@ -199,7 +203,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // // Progress Bar // - rip_bar=new QProgressBar(this); + rip_bar=new Q3ProgressBar(this); // // Eject Button @@ -217,7 +221,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, // Stop Button // rip_stop_button=new RDTransportButton(RDTransportButton::Stop,this); - rip_stop_button->setOnColor(red); + rip_stop_button->setOnColor(Qt::red); rip_stop_button->on(); connect(rip_stop_button,SIGNAL(clicked()),this,SLOT(stopButtonData())); @@ -236,7 +240,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, rip_normalize_box->setChecked(true); rip_normalize_box_label=new QLabel(rip_normalize_box,tr("Normalize"),this); rip_normalize_box_label->setFont(label_font); - rip_normalize_box_label->setAlignment(AlignLeft|AlignVCenter); + rip_normalize_box_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(rip_normalize_box,SIGNAL(toggled(bool)), this,SLOT(normalizeCheckData(bool))); @@ -247,10 +251,10 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, rip_normalize_spin->setRange(-30,0); rip_normalize_label=new QLabel(rip_normalize_spin,tr("Level:"),this); rip_normalize_label->setFont(label_font); - rip_normalize_label->setAlignment(AlignRight|AlignVCenter); + rip_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rip_normalize_unit=new QLabel(tr("dBFS"),this); rip_normalize_unit->setFont(label_font); - rip_normalize_unit->setAlignment(AlignLeft|AlignVCenter); + rip_normalize_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Autotrim Check Box @@ -259,7 +263,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, rip_autotrim_box->setChecked(true); rip_autotrim_box_label=new QLabel(rip_autotrim_box,tr("Autotrim"),this); rip_autotrim_box_label->setFont(label_font); - rip_autotrim_box_label->setAlignment(AlignLeft|AlignVCenter); + rip_autotrim_box_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(rip_autotrim_box,SIGNAL(toggled(bool)), this,SLOT(autotrimCheckData(bool))); @@ -270,10 +274,10 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, rip_autotrim_spin->setRange(-99,0); rip_autotrim_label=new QLabel(rip_autotrim_spin,tr("Level:"),this); rip_autotrim_label->setFont(label_font); - rip_autotrim_label->setAlignment(AlignRight|AlignVCenter); + rip_autotrim_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rip_autotrim_unit=new QLabel(tr("dBFS"),this); rip_autotrim_unit->setFont(label_font); - rip_autotrim_unit->setAlignment(AlignLeft|AlignVCenter); + rip_autotrim_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Channels @@ -281,7 +285,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, rip_channels_box=new QComboBox(this); rip_channels_label=new QLabel(rip_channels_box,tr("Channels:"),this); rip_channels_label->setFont(label_font); - rip_channels_label->setAlignment(AlignRight|AlignVCenter); + rip_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Close Button @@ -305,7 +309,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf, CdRipper::~CdRipper() { QStringList files=rip_cdda_dir.entryList(); - for(unsigned i=0;ifirstChild(); + Q3ListViewItem *item=rip_track_list->firstChild(); QStringList titles; while(item!=NULL) { @@ -368,7 +372,7 @@ void CdRipper::trackSelectionChangedData() default: rip_title_box->insertItem(titles.join(" / ")); - for(unsigned i=0;iinsertItem(titles[i]); } break; @@ -412,7 +416,7 @@ void CdRipper::ripTrackButtonData() tr("This will overwrite the existing recording.\nDo you want to proceed?"), QMessageBox::Yes,QMessageBox::No)) { case QMessageBox::No: - case QMessageBox::NoButton: + case Qt::NoButton: return; default: @@ -426,7 +430,7 @@ void CdRipper::ripTrackButtonData() QMessageBox::Yes, QMessageBox::No)) { case QMessageBox::No: - case QMessageBox::NoButton: + case Qt::NoButton: return; default: @@ -487,7 +491,7 @@ void CdRipper::ripTrackButtonData() rip_track[0]=-1; rip_track[1]=-1; - QListViewItem *item=rip_track_list->firstChild(); + Q3ListViewItem *item=rip_track_list->firstChild(); while(item!=NULL) { if(item->isSelected()) { if(rip_track[0]<0) { @@ -578,14 +582,14 @@ void CdRipper::ejectedData() void CdRipper::mediaChangedData() { - QListViewItem *l; + Q3ListViewItem *l; rip_isrc_read=false; rip_track_list->clear(); rip_track[0]=-1; rip_track[1]=-1; for(int i=rip_cdrom->tracks();i>0;i--) { - l=new QListViewItem(rip_track_list); + l=new Q3ListViewItem(rip_track_list); l->setText(0,QString().sprintf("%d",i)); if(rip_cdrom->isAudio(i)) { l->setText(4,tr("Audio Track")); diff --git a/rdlibrary/cdripper.h b/rdlibrary/cdripper.h index 7060da4e..158b8e20 100644 --- a/rdlibrary/cdripper.h +++ b/rdlibrary/cdripper.h @@ -26,14 +26,17 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -98,13 +101,13 @@ class CdRipper : public QDialog QLabel *rip_artist_label; QLineEdit *rip_artist_edit; QLabel *rip_other_label; - QTextEdit *rip_other_edit; + Q3TextEdit *rip_other_edit; QCheckBox *rip_apply_box; QLabel *rip_apply_label; RDTransportButton *rip_eject_button; RDTransportButton *rip_play_button; RDTransportButton *rip_stop_button; - QProgressBar *rip_bar; + Q3ProgressBar *rip_bar; QLabel *rip_normalize_label; QCheckBox *rip_normalize_box; QLabel *rip_normalize_box_label; diff --git a/rdlibrary/disk_gauge.cpp b/rdlibrary/disk_gauge.cpp index 8cf9963a..88c9e2b7 100644 --- a/rdlibrary/disk_gauge.cpp +++ b/rdlibrary/disk_gauge.cpp @@ -21,6 +21,9 @@ #include #include +//Added by qt3to4: +#include +#include #include #include @@ -46,17 +49,17 @@ DiskGauge::DiskGauge(int samp_rate,int chans,QWidget *parent) disk_label=new QLabel("Free:",this); disk_label->setGeometry(0,0,50,sizeHint().height()); disk_label->setFont(label_font); - disk_label->setAlignment(AlignRight|AlignVCenter); + disk_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); disk_label->setDisabled(true); - disk_bar=new QProgressBar(this); + disk_bar=new Q3ProgressBar(this); disk_bar->setPercentageVisible(false); disk_bar->setGeometry(55,0,sizeHint().width()-55,sizeHint().height()); disk_bar->setDisabled(true); disk_space_label=new QLabel(this); disk_space_label->setFont(label_font); - disk_space_label->setAlignment(AlignCenter); + disk_space_label->setAlignment(Qt::AlignCenter); disk_space_label->setDisabled(true); /* diff --git a/rdlibrary/disk_gauge.h b/rdlibrary/disk_gauge.h index d55e1d7d..83ed0f1a 100644 --- a/rdlibrary/disk_gauge.h +++ b/rdlibrary/disk_gauge.h @@ -26,7 +26,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #define DISK_GAUGE_UPDATE_INTERVAL 60000 @@ -47,7 +49,7 @@ class DiskGauge : public QWidget private: unsigned GetMinutes(uint64_t bytes); QLabel *disk_label; - QProgressBar *disk_bar; + Q3ProgressBar *disk_bar; QLabel *disk_space_label; double disk_sample_rate; double disk_channels; diff --git a/rdlibrary/disk_ripper.cpp b/rdlibrary/disk_ripper.cpp index 5fefd43e..c82bf8d3 100644 --- a/rdlibrary/disk_ripper.cpp +++ b/rdlibrary/disk_ripper.cpp @@ -29,9 +29,13 @@ #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -132,7 +136,7 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, QLabel *label=new QLabel(tr("Artist:"),this); label->setGeometry(10,10,50,18); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rip_artist_edit=new QLineEdit(this); // @@ -141,7 +145,7 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, label=new QLabel(tr("Album:"),this); label->setGeometry(10,32,50,18); label->setFont(label_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rip_album_edit=new QLineEdit(this); // @@ -150,8 +154,8 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, label=new QLabel(tr("Other:"),this); label->setGeometry(10,54,50,16); label->setFont(label_font); - label->setAlignment(AlignRight); - rip_other_edit=new QTextEdit(this); + label->setAlignment(Qt::AlignRight); + rip_other_edit=new Q3TextEdit(this); rip_other_edit->setReadOnly(true); // @@ -163,24 +167,24 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, rip_apply_label= new QLabel(rip_apply_box,tr("Apply FreeDB Values to Carts"),this); rip_apply_label->setFont(label_font); - rip_apply_label->setAlignment(AlignLeft); + rip_apply_label->setAlignment(Qt::AlignLeft); rip_apply_box->setChecked(false); rip_apply_label->setDisabled(true); // // Track List // - rip_track_list=new QListView(this); + rip_track_list=new Q3ListView(this); rip_track_list->setAllColumnsShowFocus(true); rip_track_list->setItemMargin(5); rip_track_list->setSorting(-1); - rip_track_list->setSelectionMode(QListView::Extended); + rip_track_list->setSelectionMode(Q3ListView::Extended); connect(rip_track_list,SIGNAL(selectionChanged()), this,SLOT(selectionChangedData())); connect(rip_track_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); rip_track_label=new QLabel(rip_track_list,tr("Tracks"),this); rip_track_label->setFont(label_font); rip_track_list->addColumn(tr("TRACK")); @@ -199,15 +203,15 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, // // Progress Bars // - rip_disk_bar=new QProgressBar(this); + rip_disk_bar=new Q3ProgressBar(this); rip_diskbar_label=new QLabel(tr("Disk Progress"),this); rip_diskbar_label->setFont(label_font); - rip_diskbar_label->setAlignment(AlignLeft|AlignVCenter); + rip_diskbar_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); rip_diskbar_label->setDisabled(true); - rip_track_bar=new QProgressBar(this); + rip_track_bar=new Q3ProgressBar(this); rip_trackbar_label=new QLabel(tr("Track Progress"),this); rip_trackbar_label->setFont(label_font); - rip_trackbar_label->setAlignment(AlignLeft|AlignVCenter); + rip_trackbar_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); rip_trackbar_label->setDisabled(true); // @@ -226,7 +230,7 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, // Stop Button // rip_stop_button=new RDTransportButton(RDTransportButton::Stop,this); - rip_stop_button->setOnColor(red); + rip_stop_button->setOnColor(Qt::red); rip_stop_button->on(); connect(rip_stop_button,SIGNAL(clicked()),this,SLOT(stopButtonData())); @@ -279,7 +283,7 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, rip_normalize_box->setChecked(true); rip_normalizebox_label=new QLabel(rip_normalize_box,tr("Normalize"),this); rip_normalizebox_label->setFont(label_font); - rip_normalizebox_label->setAlignment(AlignLeft|AlignVCenter); + rip_normalizebox_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(rip_normalize_box,SIGNAL(toggled(bool)), this,SLOT(normalizeCheckData(bool))); @@ -290,10 +294,10 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, rip_normalize_spin->setRange(-30,0); rip_normalize_label=new QLabel(rip_normalize_spin,tr("Level:"),this); rip_normalize_label->setFont(label_font); - rip_normalize_label->setAlignment(AlignRight|AlignVCenter); + rip_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rip_normalize_unit=new QLabel(tr("dBFS"),this); rip_normalize_unit->setFont(label_font); - rip_normalize_unit->setAlignment(AlignLeft|AlignVCenter); + rip_normalize_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Autotrim Check Box @@ -302,7 +306,7 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, rip_autotrim_box->setChecked(true); rip_autotrimbox_label=new QLabel(rip_autotrim_box,tr("Autotrim"),this); rip_autotrimbox_label->setFont(label_font); - rip_autotrimbox_label->setAlignment(AlignLeft|AlignVCenter); + rip_autotrimbox_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); connect(rip_autotrim_box,SIGNAL(toggled(bool)), this,SLOT(autotrimCheckData(bool))); @@ -313,10 +317,10 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, rip_autotrim_spin->setRange(-99,0); rip_autotrim_label=new QLabel(rip_autotrim_spin,tr("Level:"),this); rip_autotrim_label->setFont(label_font); - rip_autotrim_label->setAlignment(AlignRight|AlignVCenter); + rip_autotrim_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); rip_autotrim_unit=new QLabel(tr("dBFS"),this); rip_autotrim_unit->setFont(label_font); - rip_autotrim_unit->setAlignment(AlignLeft|AlignVCenter); + rip_autotrim_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Channels @@ -324,7 +328,7 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, rip_channels_box=new QComboBox(this); rip_channels_label=new QLabel(rip_channels_box,tr("Channels:"),this); rip_channels_label->setFont(label_font); - rip_channels_label->setAlignment(AlignRight|AlignVCenter); + rip_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Rip Disc Button @@ -356,7 +360,7 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode, DiskRipper::~DiskRipper() { QStringList files=rip_cdda_dir.entryList(); - for(unsigned i=0;i #include #include -#include +#include #include #include -#include +#include #include #include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -76,7 +79,7 @@ class DiskRipper : public QDialog void normalizeCheckData(bool); void autotrimCheckData(bool); void selectionChangedData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void closeData(); protected: @@ -93,13 +96,13 @@ class DiskRipper : public QDialog RDCddbRecord rip_cddb_record; RDCddbLookup *rip_cddb_lookup; QLabel *rip_track_label; - QListView *rip_track_list; + Q3ListView *rip_track_list; QPushButton *rip_rip_button; bool rip_rip_aborted; QPushButton *rip_close_button; QLineEdit *rip_album_edit; QLineEdit *rip_artist_edit; - QTextEdit *rip_other_edit; + Q3TextEdit *rip_other_edit; QCheckBox *rip_apply_box; QLabel *rip_apply_label; RDTransportButton *rip_eject_button; @@ -114,9 +117,9 @@ class DiskRipper : public QDialog QString rip_track; QString rip_title; QLabel *rip_diskbar_label; - QProgressBar *rip_disk_bar; + Q3ProgressBar *rip_disk_bar; QLabel *rip_trackbar_label; - QProgressBar *rip_track_bar; + Q3ProgressBar *rip_track_bar; QCheckBox *rip_normalize_box; QSpinBox *rip_normalize_spin; QLabel *rip_normalize_label; diff --git a/rdlibrary/edit_cart.cpp b/rdlibrary/edit_cart.cpp index 7fe52964..6f5a477c 100644 --- a/rdlibrary/edit_cart.cpp +++ b/rdlibrary/edit_cart.cpp @@ -21,18 +21,21 @@ #include #include +//Added by qt3to4: +#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -53,7 +56,7 @@ #include "record_cut.h" EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, - QWidget *parent,const char *name,QListView *lib_cart_list) + QWidget *parent,const char *name,Q3ListView *lib_cart_list) : QDialog(parent,"",true) { bool modification_allowed; @@ -125,7 +128,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, QLabel *rdcart_number_label=new QLabel(rdcart_number_edit,tr("Number:"),this); rdcart_number_label->setGeometry(10,13,120,19); rdcart_number_label->setFont(button_font); - rdcart_number_label->setAlignment(AlignRight|ShowPrefix); + rdcart_number_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); } // @@ -151,7 +154,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, rdcart_group_label->setGeometry(10,38,120,19); } rdcart_group_label->setFont(button_font); - rdcart_group_label->setAlignment(AlignRight|ShowPrefix); + rdcart_group_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Cart Type @@ -164,7 +167,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, QLabel *rdcart_type_label=new QLabel(rdcart_type_edit,tr("Type:"),this); rdcart_type_label->setGeometry(440,13,55,19); rdcart_type_label->setFont(button_font); - rdcart_type_label->setAlignment(AlignRight|ShowPrefix); + rdcart_type_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); if(lib_cart_list_edit!=NULL) { rdcart_type_label->hide(); rdcart_type_edit->hide(); @@ -177,13 +180,13 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, rdcart_average_length_edit->setGeometry(135,36,70,21); rdcart_average_length_edit->setFont(line_edit_font); rdcart_average_length_edit->setMaxLength(10); - rdcart_average_length_edit->setAlignment(AlignRight); + rdcart_average_length_edit->setAlignment(Qt::AlignRight); rdcart_average_length_edit->setReadOnly(true); QLabel *rdcart_average_length_label= new QLabel(rdcart_average_length_edit,tr("Average Length:"),this); rdcart_average_length_label->setGeometry(10,38,120,19); rdcart_average_length_label->setFont(button_font); - rdcart_average_length_label->setAlignment(AlignRight|ShowPrefix); + rdcart_average_length_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); if(lib_cart_list_edit!=NULL) { rdcart_average_length_label->hide(); rdcart_average_length_edit->hide(); @@ -198,7 +201,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.enforce_length_box,tr("Enforce Length"),this); rdcart_enforce_length_label->setGeometry(305,38,110,19); rdcart_enforce_length_label->setFont(button_font); - rdcart_enforce_length_label->setAlignment(AlignLeft|ShowPrefix); + rdcart_enforce_length_label->setAlignment(Qt::AlignLeft|Qt::TextShowMnemonic); connect(rdcart_controls.enforce_length_box,SIGNAL(toggled(bool)), this,SLOT(forcedLengthData(bool))); if(lib_cart_list_edit!=NULL) { @@ -224,7 +227,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.forced_length_edit,tr("Forced Length:"),this); rdcart_forced_length_label->setGeometry(415,38,110,19); rdcart_forced_length_label->setFont(button_font); - rdcart_forced_length_label->setAlignment(AlignRight|ShowPrefix); + rdcart_forced_length_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); if(lib_cart_list_edit!=NULL) { rdcart_forced_length_label->hide(); rdcart_controls.forced_length_edit->hide(); @@ -239,7 +242,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_preserve_pitch_button,tr("Preserve Pitch"),this); rdcart_preserve_pitch_label->setGeometry(450,38,140,19); rdcart_preserve_pitch_label->setFont(button_font); - rdcart_preserve_pitch_label->setAlignment(AlignLeft|ShowPrefix); + rdcart_preserve_pitch_label->setAlignment(Qt::AlignLeft|Qt::TextShowMnemonic); // ??????????????????????????????? rdcart_preserve_pitch_button->hide(); rdcart_preserve_pitch_label->hide(); @@ -255,7 +258,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.title_edit,tr("&Title:"),this); rdcart_title_label->setGeometry(10,62,120,19); rdcart_title_label->setFont(button_font); - rdcart_title_label->setAlignment(AlignRight|ShowPrefix); + rdcart_title_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Cart Start Date @@ -268,7 +271,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_start_date_edit,tr("&Start Date:"),this); rdcart_start_date_label->setGeometry(10,86,120,19); rdcart_start_date_label->setFont(button_font); - rdcart_start_date_label->setAlignment(AlignRight|ShowPrefix); + rdcart_start_date_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); rdcart_start_date_edit->hide(); rdcart_start_date_label->hide(); @@ -283,7 +286,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_end_date_edit,tr("&End Date:"),this); rdcart_end_date_label->setGeometry(260,86,85,19); rdcart_end_date_label->setFont(button_font); - rdcart_end_date_label->setAlignment(AlignRight|ShowPrefix); + rdcart_end_date_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); rdcart_end_date_edit->hide(); rdcart_end_date_label->hide(); @@ -298,7 +301,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.artist_edit,tr("&Artist:"),this); rdcart_artist_label->setGeometry(10,86,120,19); rdcart_artist_label->setFont(button_font); - rdcart_artist_label->setAlignment(AlignRight|ShowPrefix); + rdcart_artist_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Cart Origination Year @@ -314,7 +317,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.year_edit,tr("&Year Released:"),this); rdcart_year_label->setGeometry(10,112,120,19); rdcart_year_label->setFont(button_font); - rdcart_year_label->setAlignment(AlignRight|ShowPrefix); + rdcart_year_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); // // Cart Usage Code @@ -330,7 +333,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, QLabel *label=new QLabel(rdcart_usage_box,tr("U&sage:"),this); label->setGeometry(195,112,70,19); label->setFont(button_font); - label->setAlignment(AlignRight|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); rdcart_usage_edit=new QLineEdit(this); rdcart_usage_edit->setGeometry(270,110,150,21); rdcart_usage_edit->setReadOnly(true); @@ -356,7 +359,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.song_id_edit,tr("Song &ID:"),this); rdcart_song_id_label->setGeometry(10,135,120,21); rdcart_song_id_label->setFont(button_font); - rdcart_song_id_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_song_id_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Beats per Minute @@ -370,7 +373,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.bpm_spin,tr("&Beats per Minute:"),this); rdcart_bpm_label->setGeometry(390,135,120,21); rdcart_bpm_label->setFont(button_font); - rdcart_bpm_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_bpm_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart Album @@ -383,7 +386,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.album_edit,tr("Al&bum:"),this); rdcart_album_label->setGeometry(10,158,120,21); rdcart_album_label->setFont(button_font); - rdcart_album_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_album_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart Label @@ -396,7 +399,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.label_edit,tr("Re&cord Label:"),this); rdcart_label_label->setGeometry(10,182,120,21); rdcart_label_label->setFont(button_font); - rdcart_label_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_label_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart Client @@ -409,7 +412,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.label_edit,tr("C&lient:"),this); rdcart_client_label->setGeometry(10,206,120,21); rdcart_client_label->setFont(button_font); - rdcart_client_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_client_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart Agency @@ -422,7 +425,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.label_edit,tr("A&gency:"),this); rdcart_agency_label->setGeometry(10,230,120,21); rdcart_agency_label->setFont(button_font); - rdcart_agency_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_agency_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart Publisher @@ -435,7 +438,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.label_edit,tr("&Publisher:"),this); rdcart_publisher_label->setGeometry(10,254,120,21); rdcart_publisher_label->setFont(button_font); - rdcart_publisher_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_publisher_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart Composer @@ -448,7 +451,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.label_edit,tr("Compos&er:"),this); rdcart_composer_label->setGeometry(10,278,120,21); rdcart_composer_label->setFont(button_font); - rdcart_composer_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_composer_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart Conductor @@ -461,7 +464,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.label_edit,tr("Cond&uctor:"),this); rdcart_conductor_label->setGeometry(10,302,120,21); rdcart_conductor_label->setFont(button_font); - rdcart_conductor_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_conductor_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart User Defined @@ -474,7 +477,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_controls.label_edit,tr("&User Defined:"),this); rdcart_user_defined_label->setGeometry(10,325,120,21); rdcart_user_defined_label->setFont(button_font); - rdcart_user_defined_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_user_defined_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Synchronous Scheduling Policy @@ -488,7 +491,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_syncronous_box,tr("Execute Asynchronously"),this); rdcart_syncronous_label->setGeometry(155,351,200,19); rdcart_syncronous_label->setFont(button_font); - rdcart_syncronous_label->setAlignment(AlignLeft|ShowPrefix); + rdcart_syncronous_label->setAlignment(Qt::AlignLeft|Qt::TextShowMnemonic); rdcart_syncronous_label->hide(); // @@ -504,7 +507,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, tr("Use Event Length for Now && Next Updates"),this); rdcart_use_event_length_label->setGeometry(350,351,sizeHint().width()-350,19); rdcart_use_event_length_label->setFont(button_font); - rdcart_use_event_length_label->setAlignment(AlignLeft|ShowPrefix); + rdcart_use_event_length_label->setAlignment(Qt::AlignLeft|Qt::TextShowMnemonic); rdcart_use_event_length_label->hide(); // @@ -521,7 +524,7 @@ EditCart::EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, new QLabel(rdcart_cut_sched_box,tr("Schedule Cuts")+":",this); rdcart_cut_sched_label->setGeometry(10,348,120,19); rdcart_cut_sched_label->setFont(button_font); - rdcart_cut_sched_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + rdcart_cut_sched_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Notes Button @@ -809,7 +812,7 @@ void EditCart::lengthChangedData(unsigned len) void EditCart::okData() { - QListViewItemIterator *it; + Q3ListViewItemIterator *it; RDCart *rdcart_cart_medit; RDSystem *system; QString sql; @@ -929,7 +932,7 @@ void EditCart::okData() } } else { // Multi Edit - it=new QListViewItemIterator(lib_cart_list_edit); + it=new Q3ListViewItemIterator(lib_cart_list_edit); while(it->current()) { if(it->current()->isSelected()) { RDListViewItem *item=(RDListViewItem *)it->current(); diff --git a/rdlibrary/edit_cart.h b/rdlibrary/edit_cart.h index 007241bc..34ea22f0 100644 --- a/rdlibrary/edit_cart.h +++ b/rdlibrary/edit_cart.h @@ -23,17 +23,19 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include #include #include +//Added by qt3to4: +#include #include -#include +#include #include #include @@ -48,7 +50,7 @@ class EditCart : public QDialog Q_OBJECT public: EditCart(unsigned number,QString *path,bool new_cart,bool profile_rip, - QWidget *parent=0,const char *name=0,QListView *lib_cart_list=NULL); + QWidget *parent=0,const char *name=0,Q3ListView *lib_cart_list=NULL); ~EditCart(); QSize sizeHint() const; QSizePolicy sizePolicy() const; @@ -69,7 +71,7 @@ class EditCart : public QDialog private: void PopulateGroupList(); - QListView *lib_cart_list_edit; + Q3ListView *lib_cart_list_edit; bool ValidateLengths(); RDCart *rdcart_cart; QLineEdit *rdcart_type_edit; diff --git a/rdlibrary/edit_macro.cpp b/rdlibrary/edit_macro.cpp index 14d5e311..addfa39a 100644 --- a/rdlibrary/edit_macro.cpp +++ b/rdlibrary/edit_macro.cpp @@ -22,6 +22,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include diff --git a/rdlibrary/edit_macro.h b/rdlibrary/edit_macro.h index a7bc6366..ee2aa335 100644 --- a/rdlibrary/edit_macro.h +++ b/rdlibrary/edit_macro.h @@ -24,6 +24,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include diff --git a/rdlibrary/edit_notes.cpp b/rdlibrary/edit_notes.cpp index aa1af85c..5b5e0fea 100644 --- a/rdlibrary/edit_notes.cpp +++ b/rdlibrary/edit_notes.cpp @@ -22,6 +22,8 @@ #include #include +//Added by qt3to4: +#include EditNotes::EditNotes(RDCart *cart,QWidget *parent) : QDialog(parent,"",true) @@ -45,8 +47,8 @@ EditNotes::EditNotes(RDCart *cart,QWidget *parent) // // Variable Name // - notes_view=new QTextView(this); - notes_view->setTextFormat(QTextView::PlainText); + notes_view=new Q3TextView(this); + notes_view->setTextFormat(Qt::PlainText); notes_view->setReadOnly(false); // diff --git a/rdlibrary/edit_notes.h b/rdlibrary/edit_notes.h index 66bcec70..be141c59 100644 --- a/rdlibrary/edit_notes.h +++ b/rdlibrary/edit_notes.h @@ -24,7 +24,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #include @@ -44,7 +46,7 @@ class EditNotes : public QDialog void cancelData(); private: - QTextView *notes_view; + Q3TextView *notes_view; QPushButton *notes_ok_button; QPushButton *notes_cancel_button; RDCart *notes_cart; diff --git a/rdlibrary/edit_schedulercodes.cpp b/rdlibrary/edit_schedulercodes.cpp index 0166aad9..7675d7b5 100644 --- a/rdlibrary/edit_schedulercodes.cpp +++ b/rdlibrary/edit_schedulercodes.cpp @@ -23,6 +23,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -113,11 +115,11 @@ EditSchedulerCodes::EditSchedulerCodes(QString *sched_codes, connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData())); - for(unsigned i=0;ilength()/11;i++) { + for(int i=0;ilength()/11;i++) { codes_sel->destInsertItem(edit_sched_codes->mid(i*11,11).stripWhiteSpace()); } if(edit_remove_codes!=NULL) { - for(unsigned i=0;ilength()/11;i++) { + for(int i=0;ilength()/11;i++) { remove_codes_sel->destInsertItem(remove_codes->mid(i*11,11).stripWhiteSpace()); } } @@ -158,9 +160,8 @@ QSizePolicy EditSchedulerCodes::sizePolicy() const void EditSchedulerCodes::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); - p->moveTo(sizeHint().width(),10); - p->lineTo(sizeHint().width(),210); + p->setPen(QColor(Qt::black)); + p->drawLine(sizeHint().width(),10,sizeHint().width(),210); p->end(); } diff --git a/rdlibrary/edit_schedulercodes.h b/rdlibrary/edit_schedulercodes.h index 22fb4511..fc91d728 100644 --- a/rdlibrary/edit_schedulercodes.h +++ b/rdlibrary/edit_schedulercodes.h @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include #include diff --git a/rdlibrary/filter.cpp b/rdlibrary/filter.cpp index 734446b9..c7ccdb0d 100644 --- a/rdlibrary/filter.cpp +++ b/rdlibrary/filter.cpp @@ -23,12 +23,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include @@ -94,7 +94,7 @@ Filter::Filter(QString *filter,QWidget *parent) QLabel *filter_text_label=new QLabel(filter_text_edit,tr("&Filter:"),this); filter_text_label->setGeometry(10,12,50,19); filter_text_label->setFont(label_font); - filter_text_label->setAlignment(AlignRight|ShowPrefix); + filter_text_label->setAlignment(Qt::AlignRight|Qt::TextShowMnemonic); } diff --git a/rdlibrary/filter.h b/rdlibrary/filter.h index 59821249..d86720a9 100644 --- a/rdlibrary/filter.h +++ b/rdlibrary/filter.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/rdlibrary/lib_listview.cpp b/rdlibrary/lib_listview.cpp index de51887b..61773307 100644 --- a/rdlibrary/lib_listview.cpp +++ b/rdlibrary/lib_listview.cpp @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include LibListView::LibListView(QWidget *parent) : RDListView(parent) @@ -35,13 +37,13 @@ LibListView::LibListView(QWidget *parent) void LibListView::contentsMousePressEvent(QMouseEvent *e) { list_move_count=3; - QListView::contentsMousePressEvent(e); + Q3ListView::contentsMousePressEvent(e); } void LibListView::contentsMouseMoveEvent(QMouseEvent *e) { - QListView::contentsMouseMoveEvent(e); + Q3ListView::contentsMouseMoveEvent(e); list_move_count--; if(list_move_count==0) { RDListViewItem *item=(RDListViewItem *)selectedItem(); @@ -63,5 +65,5 @@ void LibListView::contentsMouseMoveEvent(QMouseEvent *e) void LibListView::contentsMouseReleaseEvent(QMouseEvent *e) { list_move_count=-1; - QListView::contentsMouseReleaseEvent(e); + Q3ListView::contentsMouseReleaseEvent(e); } diff --git a/rdlibrary/lib_listview.h b/rdlibrary/lib_listview.h index d19c35d6..9bebda35 100644 --- a/rdlibrary/lib_listview.h +++ b/rdlibrary/lib_listview.h @@ -23,6 +23,8 @@ #define LIB_LISTVIEW_H #include +//Added by qt3to4: +#include class LibListView : public RDListView { diff --git a/rdlibrary/list_reports.cpp b/rdlibrary/list_reports.cpp index 5f722b88..081700f5 100644 --- a/rdlibrary/list_reports.cpp +++ b/rdlibrary/list_reports.cpp @@ -21,6 +21,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -71,7 +73,7 @@ ListReports::ListReports(const QString &filter,const QString &type_filter, list_reports_label=new QLabel(list_reports_box,tr("Type:"),this); list_reports_label->setGeometry(10,10,35,19); list_reports_label->setFont(font); - list_reports_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + list_reports_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(list_reports_box,SIGNAL(activated(int)), this,SLOT(typeActivatedData(int))); @@ -86,7 +88,7 @@ ListReports::ListReports(const QString &filter,const QString &type_filter, new QLabel(list_fieldnames_check,tr("Prepend Field Names"),this); list_fieldnames_label->setGeometry(75,32,sizeHint().width()-75,19); list_fieldnames_label->setFont(font); - list_fieldnames_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + list_fieldnames_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); list_fieldnames_label->setDisabled(true); // diff --git a/rdlibrary/macro_cart.cpp b/rdlibrary/macro_cart.cpp index a44cfa6d..ef172773 100644 --- a/rdlibrary/macro_cart.cpp +++ b/rdlibrary/macro_cart.cpp @@ -19,17 +19,19 @@ // #include +//Added by qt3to4: +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -103,15 +105,15 @@ MacroCart::MacroCart(RDCart *cart,QWidget *parent) rdcart_events=new RDMacroEvent(rda->station()->address(),rda->ripc(),this); rdcart_events->load(rdcart_cart->macros()); - rdcart_macro_list=new QListView(this); + rdcart_macro_list=new Q3ListView(this); rdcart_macro_list->setGeometry(100,0,430,sizeHint().height()); rdcart_macro_list->setAllColumnsShowFocus(true); rdcart_macro_list->setItemMargin(5); rdcart_macro_list->setSorting(0); connect(rdcart_macro_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); rdcart_macro_list->addColumn(tr("LINE")); rdcart_macro_list->setColumnAlignment(0,Qt::AlignHCenter); @@ -190,7 +192,7 @@ void MacroCart::save() void MacroCart::addMacroData() { - QListViewItem *item=rdcart_macro_list->selectedItem(); + Q3ListViewItem *item=rdcart_macro_list->selectedItem(); RDMacro cmd; unsigned line; @@ -214,7 +216,7 @@ void MacroCart::addMacroData() void MacroCart::deleteMacroData() { - QListViewItem *item=rdcart_macro_list->selectedItem(); + Q3ListViewItem *item=rdcart_macro_list->selectedItem(); if((item==NULL)||(item->text(0).isEmpty())) { return; @@ -226,7 +228,7 @@ void MacroCart::deleteMacroData() void MacroCart::copyMacroData() { - QListViewItem *item=rdcart_macro_list->selectedItem(); + Q3ListViewItem *item=rdcart_macro_list->selectedItem(); if((item==NULL)||(item->text(0).isEmpty())) { return; @@ -238,7 +240,7 @@ void MacroCart::copyMacroData() void MacroCart::pasteMacroData() { - QListViewItem *item=rdcart_macro_list->selectedItem(); + Q3ListViewItem *item=rdcart_macro_list->selectedItem(); unsigned line; if(item==NULL) { @@ -257,7 +259,7 @@ void MacroCart::pasteMacroData() void MacroCart::editMacroData() { - QListViewItem *item=rdcart_macro_list->selectedItem(); + Q3ListViewItem *item=rdcart_macro_list->selectedItem(); if((item==NULL)||(item->text(0).isEmpty())) { return; @@ -274,7 +276,7 @@ void MacroCart::editMacroData() void MacroCart::runLineMacroData() { - QListViewItem *item=rdcart_macro_list->selectedItem(); + Q3ListViewItem *item=rdcart_macro_list->selectedItem(); if((item==NULL)||(item->text(0).isEmpty())) { return; @@ -290,10 +292,10 @@ void MacroCart::runCartMacroData() } -void MacroCart::doubleClickedData(QListViewItem *,const QPoint &,int) +void MacroCart::doubleClickedData(Q3ListViewItem *,const QPoint &,int) { if(rdcart_allow_modification) { - QListViewItem *item=rdcart_macro_list->selectedItem(); + Q3ListViewItem *item=rdcart_macro_list->selectedItem(); if((item==NULL)||(item->text(0).isEmpty())) { addMacroData(); @@ -307,19 +309,19 @@ void MacroCart::doubleClickedData(QListViewItem *,const QPoint &,int) void MacroCart::RefreshList() { - QListViewItem *item; + Q3ListViewItem *item; - item=new QListViewItem(rdcart_macro_list); + item=new Q3ListViewItem(rdcart_macro_list); item->setText(1,tr("--- End of cart ---")); for(int i=0;isize();i++) { - item=new QListViewItem(rdcart_macro_list); + item=new Q3ListViewItem(rdcart_macro_list); item->setText(0,QString().sprintf("%03d",i+1)); item->setText(1,rdcart_events->command(i)->toString()); } } -void MacroCart::RefreshLine(QListViewItem *item) +void MacroCart::RefreshLine(Q3ListViewItem *item) { int line=item->text(0).toInt()-1; item->setText(1,rdcart_events->command(line)->toString()); @@ -330,7 +332,7 @@ void MacroCart::AddLine(unsigned line,RDMacro *cmd) { unsigned curr_line; - QListViewItem *item=rdcart_macro_list->firstChild(); + Q3ListViewItem *item=rdcart_macro_list->firstChild(); for(int i=0;ichildCount();i++) { if(((curr_line=(item->text(0).toUInt()-1))>=line)&& (!item->text(0).isEmpty())) { @@ -339,21 +341,21 @@ void MacroCart::AddLine(unsigned line,RDMacro *cmd) item=item->nextSibling(); } rdcart_events->insert(line,cmd); - item=new QListViewItem(rdcart_macro_list); + item=new Q3ListViewItem(rdcart_macro_list); item->setText(0,QString().sprintf("%03u",line+1)); RefreshLine(item); rdcart_macro_list->setSelected(item,true); } -void MacroCart::DeleteLine(QListViewItem *item) +void MacroCart::DeleteLine(Q3ListViewItem *item) { unsigned line=item->text(0).toUInt()-1; unsigned curr_line; - QListViewItem *next=item->nextSibling(); + Q3ListViewItem *next=item->nextSibling(); rdcart_macro_list->removeItem(item); rdcart_events->remove(line); - QListViewItem *l=rdcart_macro_list->firstChild(); + Q3ListViewItem *l=rdcart_macro_list->firstChild(); for(int i=0;ichildCount();i++) { if(((curr_line=(l->text(0).toUInt()-1))>line)&& (!l->text(0).isEmpty())) { diff --git a/rdlibrary/macro_cart.h b/rdlibrary/macro_cart.h index 0a5f05bc..fc154f71 100644 --- a/rdlibrary/macro_cart.h +++ b/rdlibrary/macro_cart.h @@ -23,10 +23,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -61,16 +61,16 @@ class MacroCart : public QWidget void editMacroData(); void runLineMacroData(); void runCartMacroData(); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); private: void RefreshList(); - void RefreshLine(QListViewItem *item); + void RefreshLine(Q3ListViewItem *item); void AddLine(unsigned line,RDMacro *cmd); - void DeleteLine(QListViewItem *item); + void DeleteLine(Q3ListViewItem *item); void UpdateLength(); RDCart *rdcart_cart; - QListView *rdcart_macro_list; + Q3ListView *rdcart_macro_list; QLabel *rdcart_macro_list_label; RDMacroEvent *rdcart_events; RDMacro rdcart_clipboard; diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index 73bee352..6edafbfc 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -28,15 +28,19 @@ #include #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -52,7 +56,6 @@ #include #include -#include "cart_tip.h" #include "cdripper.h" #include "disk_ripper.h" #include "edit_cart.h" @@ -128,12 +131,12 @@ MainWidget::MainWidget(QWidget *parent) // Progress Dialog // lib_progress_dialog= - new QProgressDialog(tr("Please Wait..."),"Cancel",10,this, + new Q3ProgressDialog(tr("Please Wait..."),"Cancel",10,this, "lib_progress_dialog",false, Qt::WStyle_Customize|Qt::WStyle_NormalBorder); lib_progress_dialog->setCaption(" "); QLabel *label=new QLabel(tr("Please Wait..."),lib_progress_dialog); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label->setFont(filter_font); lib_progress_dialog->setLabel(label); lib_progress_dialog->setCancelButton(NULL); @@ -206,7 +209,7 @@ MainWidget::MainWidget(QWidget *parent) lib_filter_edit->setFont(default_font); lib_filter_label=new QLabel(lib_filter_edit,tr("Filter:"),this); lib_filter_label->setFont(button_font); - lib_filter_label->setAlignment(AlignVCenter|AlignRight); + lib_filter_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); connect(lib_filter_edit,SIGNAL(textChanged(const QString &)), this,SLOT(filterChangedData(const QString &))); connect(lib_filter_edit,SIGNAL(returnPressed()), @@ -242,7 +245,7 @@ MainWidget::MainWidget(QWidget *parent) lib_group_box->setFont(default_font); lib_group_label=new QLabel(lib_group_box,tr("Group:"),this); lib_group_label->setFont(button_font); - lib_group_label->setAlignment(AlignVCenter|AlignRight); + lib_group_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); connect(lib_group_box,SIGNAL(activated(const QString &)), this,SLOT(groupActivatedData(const QString &))); @@ -253,7 +256,7 @@ MainWidget::MainWidget(QWidget *parent) lib_codes_box->setFont(default_font); lib_codes_label=new QLabel(lib_codes_box,tr("Scheduler Code:"),this); lib_codes_label->setFont(button_font); - lib_codes_label->setAlignment(AlignVCenter|AlignRight); + lib_codes_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); connect(lib_codes_box,SIGNAL(activated(const QString &)), this,SLOT(groupActivatedData(const QString &))); @@ -265,7 +268,7 @@ MainWidget::MainWidget(QWidget *parent) lib_allowdrag_label= new QLabel(lib_allowdrag_box,tr("Allow Cart Dragging"),this); lib_allowdrag_label->setFont(button_font); - lib_allowdrag_label->setAlignment(AlignVCenter|AlignLeft); + lib_allowdrag_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); connect(lib_allowdrag_box,SIGNAL(stateChanged(int)), this,SLOT(dragsChangedData(int))); if(!rda->station()->enableDragdrop()) { @@ -280,7 +283,7 @@ MainWidget::MainWidget(QWidget *parent) lib_showaudio_box->setChecked(true); lib_showaudio_label=new QLabel(lib_showaudio_box,tr("Show Audio Carts"),this); lib_showaudio_label->setFont(button_font); - lib_showaudio_label->setAlignment(AlignVCenter|AlignLeft); + lib_showaudio_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); connect(lib_showaudio_box,SIGNAL(stateChanged(int)), this,SLOT(audioChangedData(int))); @@ -291,7 +294,7 @@ MainWidget::MainWidget(QWidget *parent) lib_showmacro_box->setChecked(true); lib_showmacro_label=new QLabel(lib_showmacro_box,tr("Show Macro Carts"),this); lib_showmacro_label->setFont(button_font); - lib_showmacro_label->setAlignment(AlignVCenter|AlignLeft); + lib_showmacro_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); connect(lib_showmacro_box,SIGNAL(stateChanged(int)), this,SLOT(macroChangedData(int))); @@ -303,7 +306,7 @@ MainWidget::MainWidget(QWidget *parent) lib_shownotes_label= new QLabel(lib_shownotes_box,tr("Show Note Bubbles"),this); lib_shownotes_label->setFont(button_font); - lib_shownotes_label->setAlignment(AlignVCenter|AlignLeft); + lib_shownotes_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Show Matches Checkbox @@ -314,7 +317,7 @@ MainWidget::MainWidget(QWidget *parent) QString().sprintf("%d",RD_LIMITED_CART_SEARCH_QUANTITY)+ tr(" Matches"),this); lib_showmatches_label->setFont(button_font); - lib_showmatches_label->setAlignment(AlignVCenter|AlignLeft); + lib_showmatches_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); connect(lib_showmatches_box,SIGNAL(stateChanged(int)), this,SLOT(searchLimitChangedData(int))); @@ -325,16 +328,16 @@ MainWidget::MainWidget(QWidget *parent) lib_cart_list->setFont(default_font); lib_cart_list->setAllColumnsShowFocus(true); lib_cart_list->setItemMargin(5); - lib_cart_list->setSelectionMode(QListView::Extended); - lib_cart_tip=new CartTip(lib_cart_list->viewport()); + lib_cart_list->setSelectionMode(Q3ListView::Extended); + // lib_cart_tip=new CartTip(lib_cart_list->viewport()); connect(lib_cart_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(cartDoubleclickedData(QListViewItem *,const QPoint &,int))); - connect(lib_cart_list,SIGNAL(pressed(QListViewItem *)), - this,SLOT(cartClickedData(QListViewItem *))); - connect(lib_cart_list,SIGNAL(onItem(QListViewItem *)), - this,SLOT(cartOnItemData(QListViewItem *))); + SLOT(cartDoubleclickedData(Q3ListViewItem *,const QPoint &,int))); + connect(lib_cart_list,SIGNAL(pressed(Q3ListViewItem *)), + this,SLOT(cartClickedData(Q3ListViewItem *))); + connect(lib_cart_list,SIGNAL(onItem(Q3ListViewItem *)), + this,SLOT(cartOnItemData(Q3ListViewItem *))); lib_cart_list->addColumn(""); lib_cart_list->setColumnAlignment(0,Qt::AlignHCenter); lib_cart_list->addColumn(tr("CART")); @@ -620,7 +623,7 @@ void MainWidget::addData() item->setText(1,QString().sprintf("%06u",cart_num)); RefreshLine(item); SendNotification(RDNotification::AddAction,cart_num); - QListViewItemIterator it(lib_cart_list); + Q3ListViewItemIterator it(lib_cart_list); while(it.current()) { lib_cart_list->setSelected(it.current(),false); ++it; @@ -638,11 +641,11 @@ void MainWidget::addData() void MainWidget::editData() { int sel_count=0; - QListViewItemIterator *it; + Q3ListViewItemIterator *it; LockUser(); - it=new QListViewItemIterator(lib_cart_list); + it=new Q3ListViewItemIterator(lib_cart_list); while(it->current()) { if (it->current()->isSelected()) { sel_count++; @@ -656,7 +659,7 @@ void MainWidget::editData() return; } if(sel_count==1) { //single edit - it=new QListViewItemIterator(lib_cart_list); + it=new Q3ListViewItemIterator(lib_cart_list); while(!it->current()->isSelected()) { ++(*it); } @@ -680,7 +683,7 @@ void MainWidget::editData() edit_cart->exec(); delete edit_cart; - it=new QListViewItemIterator(lib_cart_list); + it=new Q3ListViewItemIterator(lib_cart_list); while(it->current()) { if (it->current()->isSelected()) { RefreshLine((RDListViewItem *)it->current()); @@ -703,12 +706,12 @@ void MainWidget::deleteData() RDSqlQuery *q; QString str; int sel_count=0; - QListViewItemIterator *it; + Q3ListViewItemIterator *it; bool del_flag; LockUser(); - it=new QListViewItemIterator(lib_cart_list); + it=new Q3ListViewItemIterator(lib_cart_list); while(it->current()) { if (it->current()->isSelected()) { sel_count++; @@ -728,7 +731,7 @@ void MainWidget::deleteData() UnlockUser(); return; } - it=new QListViewItemIterator(lib_cart_list); + it=new Q3ListViewItemIterator(lib_cart_list); while(it->current()) { if (it->current()->isSelected()) { del_flag=true; @@ -797,7 +800,7 @@ void MainWidget::ripData() profile_ripping,this); if(dialog->exec()==0) { for(int i=0;icount();i++) { - if(lib_group_box->text(i)==*group) { + if(lib_group_box->text(i)==group) { lib_filter_edit->setText(lib_filter_text); lib_group_box->setCurrentItem(i); groupActivatedData(lib_group_box->currentText()); @@ -824,23 +827,23 @@ void MainWidget::reportsData() } -void MainWidget::cartOnItemData(QListViewItem *item) +void MainWidget::cartOnItemData(Q3ListViewItem *item) { if((!lib_shownotes_box->isChecked())||(item==NULL)) { return; } - lib_cart_tip-> - setCartNumber(lib_cart_list->itemRect(item),item->text(1).toUInt()); + // lib_cart_tip-> + // setCartNumber(lib_cart_list->itemRect(item),item->text(1).toUInt()); } -void MainWidget::cartClickedData(QListViewItem *item) +void MainWidget::cartClickedData(Q3ListViewItem *item) { int del_count=0; int sel_count=0; - QListViewItemIterator *it; + Q3ListViewItemIterator *it; - it=new QListViewItemIterator(lib_cart_list); + it=new Q3ListViewItemIterator(lib_cart_list); while(it->current()) { if (it->current()->isSelected()) { sel_count++; @@ -872,7 +875,7 @@ void MainWidget::cartClickedData(QListViewItem *item) } -void MainWidget::cartDoubleclickedData(QListViewItem *,const QPoint &,int) +void MainWidget::cartDoubleclickedData(Q3ListViewItem *,const QPoint &,int) { editData(); } @@ -900,10 +903,10 @@ void MainWidget::searchLimitChangedData(int state) void MainWidget::dragsChangedData(int state) { if(state) { - lib_cart_list->setSelectionMode(QListView::Single); + lib_cart_list->setSelectionMode(Q3ListView::Single); } else { - lib_cart_list->setSelectionMode(QListView::Extended); + lib_cart_list->setSelectionMode(Q3ListView::Extended); } } @@ -1173,7 +1176,7 @@ void MainWidget::RefreshList() } } else { - l->setTextColor(3,QColor(black),QFont::Normal); + l->setTextColor(3,QColor(Qt::black),QFont::Normal); } } } @@ -1181,7 +1184,7 @@ void MainWidget::RefreshList() if(count++>RDLIBRARY_STEP_SIZE) { lib_progress_dialog->setProgress(++step); count=0; - qApp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput); + qApp->processEvents(QEventLoop::ExcludeUserInputEvents); } } UpdateItemColor(l,validity,end_datetime,current_datetime); @@ -1338,7 +1341,7 @@ void MainWidget::RefreshLine(RDListViewItem *item) } } else { - item->setTextColor(3,QColor(black),QFont::Normal); + item->setTextColor(3,QColor(Qt::black),QFont::Normal); } } } @@ -1528,7 +1531,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(), + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(), "."); a.installTranslator(&qt); diff --git a/rdlibrary/rdlibrary.h b/rdlibrary/rdlibrary.h index a9ef7120..f6da32b4 100644 --- a/rdlibrary/rdlibrary.h +++ b/rdlibrary/rdlibrary.h @@ -25,13 +25,16 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include #include #include #include #include -#include +#include #include #include @@ -45,7 +48,7 @@ #include #include -#include +//#include #define RDLIBRARY_GEOMETRY_FILE ".rdlibrary" #define RDLIBRARY_STEP_SIZE 5000 @@ -54,10 +57,10 @@ // Cut Length Deviation Values // #define RDLIBRARY_MID_LENGTH_LIMIT 500 -#define RDLIBRARY_MID_LENGTH_COLOR darkYellow +#define RDLIBRARY_MID_LENGTH_COLOR Qt::darkYellow #define RDLIBRARY_MAX_LENGTH_LIMIT 1500 -#define RDLIBRARY_MAX_LENGTH_COLOR red -#define RDLIBRARY_ENFORCE_LENGTH_COLOR blue +#define RDLIBRARY_MAX_LENGTH_COLOR Qt::red +#define RDLIBRARY_ENFORCE_LENGTH_COLOR Qt::blue #define RDLIBRARY_USAGE "[--profile-ripping]\n\n--profile-ripping\n Print profiling information to stdout when performing rips from\n optical media.\n\n" @@ -81,9 +84,9 @@ class MainWidget : public QWidget void deleteData(); void ripData(); void reportsData(); - void cartOnItemData(QListViewItem *item); - void cartClickedData(QListViewItem *item); - void cartDoubleclickedData(QListViewItem *,const QPoint &,int); + void cartOnItemData(Q3ListViewItem *item); + void cartClickedData(Q3ListViewItem *item); + void cartDoubleclickedData(Q3ListViewItem *,const QPoint &,int); void audioChangedData(int state); void macroChangedData(int state); void searchLimitChangedData(int state); @@ -111,7 +114,7 @@ class MainWidget : public QWidget bool UnlockUser(); void SendNotification(RDNotification::Action action,unsigned cartnum); LibListView *lib_cart_list; - CartTip *lib_cart_tip; + // CartTip *lib_cart_tip; QString lib_filter_text; QString lib_search_text; QPixmap *lib_playout_map; @@ -145,7 +148,7 @@ class MainWidget : public QWidget QString lib_import_path; QPixmap *lib_rivendell_map; RDStation::FilterMode lib_filter_mode; - QProgressDialog *lib_progress_dialog; + Q3ProgressDialog *lib_progress_dialog; bool profile_ripping; bool lib_edit_pending; bool lib_user_changed; diff --git a/rdlibrary/rdlibrary_cs.ts b/rdlibrary/rdlibrary_cs.ts index 863935d5..fbe362f1 100644 --- a/rdlibrary/rdlibrary_cs.ts +++ b/rdlibrary/rdlibrary_cs.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1260,9 +1262,9 @@ Přesto smazat? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Smazání vozíku %06u vyprázdní také schránku - Přesto pokračovat? + Přesto pokračovat? Empty Clipboard diff --git a/rdlibrary/rdlibrary_de.ts b/rdlibrary/rdlibrary_de.ts index b36dbeed..34afd60b 100644 --- a/rdlibrary/rdlibrary_de.ts +++ b/rdlibrary/rdlibrary_de.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1237,9 +1239,9 @@ verwendet. Trotzdem löschen? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Den Cart %06u zu löschen wird auch die Zwischenablage leeren - Trotzdem fortfahren? + Trotzdem fortfahren? Empty Clipboard diff --git a/rdlibrary/rdlibrary_es.ts b/rdlibrary/rdlibrary_es.ts index ce8d8980..9c9800a4 100644 --- a/rdlibrary/rdlibrary_es.ts +++ b/rdlibrary/rdlibrary_es.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1254,9 +1256,9 @@ Do you still want to delete it? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Al eliminar el cartucho %06u también se vaciará el portapapeles. - ¿Desea continuar? + ¿Desea continuar? rdlibrary : diff --git a/rdlibrary/rdlibrary_fr.ts b/rdlibrary/rdlibrary_fr.ts index 9b8c28a4..f48d0f9a 100644 --- a/rdlibrary/rdlibrary_fr.ts +++ b/rdlibrary/rdlibrary_fr.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -684,7 +686,7 @@ Script - + Missing Title @@ -1070,7 +1072,7 @@ CD - + Are you sure you want to delete cart(s) @@ -1091,7 +1093,7 @@ Do you still want to delete it? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? diff --git a/rdlibrary/rdlibrary_nb.ts b/rdlibrary/rdlibrary_nb.ts index 689c4e32..0e9b2b17 100644 --- a/rdlibrary/rdlibrary_nb.ts +++ b/rdlibrary/rdlibrary_nb.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1233,9 +1235,9 @@ Vil du sletta ho likevel? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Viss du slettar korga %06u, tømer du utklyppstavla. - Vil du halda fram? + Vil du halda fram? Empty Clipboard diff --git a/rdlibrary/rdlibrary_nn.ts b/rdlibrary/rdlibrary_nn.ts index 689c4e32..0e9b2b17 100644 --- a/rdlibrary/rdlibrary_nn.ts +++ b/rdlibrary/rdlibrary_nn.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1233,9 +1235,9 @@ Vil du sletta ho likevel? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Viss du slettar korga %06u, tømer du utklyppstavla. - Vil du halda fram? + Vil du halda fram? Empty Clipboard diff --git a/rdlibrary/rdlibrary_pt_BR.ts b/rdlibrary/rdlibrary_pt_BR.ts index 81a3e147..e31671e6 100644 --- a/rdlibrary/rdlibrary_pt_BR.ts +++ b/rdlibrary/rdlibrary_pt_BR.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1239,9 +1241,9 @@ Você ainda quer deletá-lo? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Deletar o Cartão %06u também esvaziará o clipboard. - Você ainda quer proceder? + Você ainda quer proceder? Empty Clipboard diff --git a/rdlibrary/record_cut.cpp b/rdlibrary/record_cut.cpp index 46fe0e3f..f5a3f6b2 100644 --- a/rdlibrary/record_cut.cpp +++ b/rdlibrary/record_cut.cpp @@ -25,7 +25,12 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -193,7 +198,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) // Cut Play Counter // cut_playcounter_edit=new QLineEdit(this); - cut_playcounter_edit->setAlignment(AlignRight); + cut_playcounter_edit->setAlignment(Qt::AlignRight); cut_playcounter_edit->setReadOnly(true); cut_playcounter_edit->setMaxLength(64); cut_playcounter_label= @@ -208,7 +213,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) rec_evergreen_label=new QLabel(rec_evergreen_box,tr("Cut is EVERGREEN")+":",this); rec_evergreen_label->setFont(font); - rec_evergreen_label->setAlignment(AlignVCenter|AlignLeft); + rec_evergreen_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); connect(rec_evergreen_box,SIGNAL(toggled(bool)), this,SLOT(evergreenToggledData(bool))); @@ -227,7 +232,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) cut_killdatetime_label=new QLabel(tr("Air Date/Time"),this); cut_killdatetime_label->setAlignment(Qt::AlignHCenter); cut_killdatetime_label->setFont(font); - QButtonGroup *button_group=new QButtonGroup(this); + Q3ButtonGroup *button_group=new Q3ButtonGroup(this); button_group->hide(); connect(button_group,SIGNAL(clicked(int)),this,SLOT(airDateButtonData(int))); cut_startdatetime_enable_button=new QRadioButton(tr("Enabled"),this, @@ -236,15 +241,15 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) cut_startdatetime_disable_button=new QRadioButton(tr("Disabled"),this); button_group->insert(cut_startdatetime_disable_button,false); - cut_startdatetime_edit=new QDateTimeEdit(this); + cut_startdatetime_edit=new Q3DateTimeEdit(this); cut_startdatetime_label=new QLabel(cut_startdatetime_edit,tr("&Start"),this); cut_startdatetime_label->setFont(small_font); - cut_startdatetime_label->setAlignment(AlignRight|ShowPrefix); + cut_startdatetime_label->setAlignment(Qt::AlignRight); - cut_enddatetime_edit=new QDateTimeEdit(this); + cut_enddatetime_edit=new Q3DateTimeEdit(this); cut_enddatetime_label=new QLabel(cut_enddatetime_edit,tr("End"),this); cut_enddatetime_label->setFont(small_font); - cut_enddatetime_label->setAlignment(AlignRight|ShowPrefix); + cut_enddatetime_label->setAlignment(Qt::AlignRight); // // Cut Daypart @@ -252,7 +257,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) cut_daypart_label=new QLabel(tr("Daypart"),this); cut_daypart_label->setAlignment(Qt::AlignHCenter); cut_daypart_label->setFont(font); - button_group=new QButtonGroup(this); + button_group=new Q3ButtonGroup(this); button_group->hide(); connect(button_group,SIGNAL(clicked(int)),this,SLOT(daypartButtonData(int))); cut_starttime_enable_button=new QRadioButton(tr("Enabled"),this); @@ -263,12 +268,12 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) cut_starttime_edit=new RDTimeEdit(this); cut_starttime_label=new QLabel(cut_starttime_edit,tr("&Start Time"),this); cut_starttime_label->setFont(small_font); - cut_starttime_label->setAlignment(AlignRight|ShowPrefix); + cut_starttime_label->setAlignment(Qt::AlignRight); cut_endtime_edit=new RDTimeEdit(this); cut_endtime_label=new QLabel(cut_endtime_edit,tr("End Time"),this); cut_endtime_label->setFont(small_font); - cut_endtime_label->setAlignment(AlignRight|ShowPrefix); + cut_endtime_label->setAlignment(Qt::AlignRight); // // Days of the Week @@ -279,37 +284,37 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) rec_weekpart_button[0]=new QCheckBox(this); rec_weekpart_label[0]=new QLabel(rec_weekpart_button[0],tr("Monday"),this); rec_weekpart_label[0]->setFont(day_font); - rec_weekpart_label[0]->setAlignment(AlignVCenter|AlignLeft); + rec_weekpart_label[0]->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rec_weekpart_button[1]=new QCheckBox(this); rec_weekpart_label[1]=new QLabel(rec_weekpart_button[1],tr("Tuesday"),this); rec_weekpart_label[1]->setFont(day_font); - rec_weekpart_label[1]->setAlignment(AlignVCenter|AlignLeft); + rec_weekpart_label[1]->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rec_weekpart_button[2]=new QCheckBox(this); rec_weekpart_label[2]=new QLabel(rec_weekpart_button[2],tr("Wednesday"),this); rec_weekpart_label[2]->setFont(day_font); - rec_weekpart_label[2]->setAlignment(AlignVCenter|AlignLeft); + rec_weekpart_label[2]->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rec_weekpart_button[3]=new QCheckBox(this); rec_weekpart_label[3]=new QLabel(rec_weekpart_button[3],tr("Thursday"),this); rec_weekpart_label[3]->setFont(day_font); - rec_weekpart_label[3]->setAlignment(AlignVCenter|AlignLeft); + rec_weekpart_label[3]->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rec_weekpart_button[4]=new QCheckBox(this); rec_weekpart_label[4]=new QLabel(rec_weekpart_button[4],tr("Friday"),this); rec_weekpart_label[4]->setFont(day_font); - rec_weekpart_label[4]->setAlignment(AlignVCenter|AlignLeft); + rec_weekpart_label[4]->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rec_weekpart_button[5]=new QCheckBox(this); rec_weekpart_label[5]=new QLabel(rec_weekpart_button[5],tr("Saturday"),this); rec_weekpart_label[5]->setFont(day_font); - rec_weekpart_label[5]->setAlignment(AlignVCenter|AlignLeft); + rec_weekpart_label[5]->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rec_weekpart_button[6]=new QCheckBox(this); rec_weekpart_label[6]=new QLabel(rec_weekpart_button[6],tr("Sunday"),this); rec_weekpart_label[6]->setFont(day_font); - rec_weekpart_label[6]->setAlignment(AlignVCenter|AlignLeft); + rec_weekpart_label[6]->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rec_set_button=new QPushButton(tr("Set All"),this); rec_set_button->setFont(small_font); @@ -333,9 +338,9 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) // AES Alarm // rec_aes_alarm_label=new QLabel(this); - rec_aes_alarm_label->setAlignment(AlignHCenter|AlignVCenter); + rec_aes_alarm_label->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); rec_aes_alarm_label->setFont(large_font); - rec_aes_alarm_label->setPalette(QColor(red)); + rec_aes_alarm_label->setPalette(QColor(Qt::red)); rec_aes_alarm_label->setText(tr("AES ALARM")); rec_aes_alarm_label->hide(); @@ -346,7 +351,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) connect(rec_timer,SIGNAL(timeout()),this,SLOT(recTimerData())); rec_timer_label=new QLabel(this); rec_timer_label->setFont(timer_font); - rec_timer_label->setAlignment(AlignLeft|AlignVCenter); + rec_timer_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); rec_timer_label->setText(RDGetTimeLength(rec_length,true)); // @@ -355,7 +360,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) rec_channels_box=new QComboBox(this); rec_channels_edit=new QLineEdit(this); rec_channels_box_label=new QLabel(rec_channels_box,tr("Channels"),this); - rec_channels_box_label->setAlignment(AlignHCenter); + rec_channels_box_label->setAlignment(Qt::AlignHCenter); rec_channels_box_label->setFont(font); connect(rec_channels_box,SIGNAL(activated(int)), this,SLOT(channelsData(int))); @@ -380,7 +385,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) rec_stop_button=new RDTransportButton(RDTransportButton::Stop,this); rec_stop_button->setDefault(true); rec_stop_button->setState(RDTransportButton::On); - rec_stop_button->setOnColor(QColor(red)); + rec_stop_button->setOnColor(Qt::red); connect(rec_stop_button,SIGNAL(clicked()),this,SLOT(stopData())); // @@ -388,7 +393,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) // rec_mode_box=new QComboBox(this); rec_mode_box_label=new QLabel(rec_mode_box,tr("Record Mode"),this); - rec_mode_box_label->setAlignment(AlignHCenter); + rec_mode_box_label->setAlignment(Qt::AlignHCenter); rec_mode_box_label->setFont(font); // @@ -396,7 +401,7 @@ RecordCut::RecordCut(RDCart *cart,QString cut,bool use_weight,QWidget *parent) // rec_trim_box=new QComboBox(this); rec_trim_box_label=new QLabel(rec_trim_box,tr("AutoTrim"),this); - rec_trim_box_label->setAlignment(AlignHCenter); + rec_trim_box_label->setAlignment(Qt::AlignHCenter); rec_trim_box_label->setFont(font); // @@ -866,7 +871,7 @@ void RecordCut::closeData() tr("The End Date is prior to the Start Date!")); return; } - if((cut_enddatetime_edit->dateTime()dateTime()isChecked())) { switch(QMessageBox::warning(this,tr("Invalid Date"), tr("The End Date has already passed!\nDo you still want to save?"), diff --git a/rdlibrary/record_cut.h b/rdlibrary/record_cut.h index 66f8ace6..843815a7 100644 --- a/rdlibrary/record_cut.h +++ b/rdlibrary/record_cut.h @@ -28,10 +28,14 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -107,9 +111,9 @@ class RecordCut : public QDialog QRadioButton *cut_startdatetime_enable_button; QRadioButton *cut_startdatetime_disable_button; QLabel *cut_startdatetime_label; - QDateTimeEdit *cut_startdatetime_edit; + Q3DateTimeEdit *cut_startdatetime_edit; QLabel *cut_enddatetime_label; - QDateTimeEdit *cut_enddatetime_edit; + Q3DateTimeEdit *cut_enddatetime_edit; QLabel *cut_daypart_label; QRadioButton *cut_starttime_enable_button; QRadioButton *cut_starttime_disable_button; diff --git a/rdlogedit/Makefile.am b/rdlogedit/Makefile.am index e040cd98..5fce061e 100644 --- a/rdlogedit/Makefile.am +++ b/rdlogedit/Makefile.am @@ -1,10 +1,8 @@ -## automake.am -## -## Automake.am for rivendell/rdlogedit +## Makefile.am ## ## Use automake to process this into a Makefile.in ## -## (C) Copyright 2002-2005,2016 Fred Gleason +## (C) Copyright 2002-2005,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +18,8 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,8 +35,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogedit_*.qm all: - @QT_BIN@/lupdate rdlogedit.pro - @QT_BIN@/lrelease rdlogedit.pro + lupdate-qt4 rdlogedit.pro + lrelease-qt4 rdlogedit.pro bin_PROGRAMS = rdlogedit @@ -71,7 +69,7 @@ nodist_rdlogedit_SOURCES = moc_add_meta.cpp\ moc_render_dialog.cpp\ moc_voice_tracker.cpp -rdlogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdlogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdlogedit.pro\ rdlogedit_cs.ts\ diff --git a/rdlogedit/add_meta.cpp b/rdlogedit/add_meta.cpp index 031b3392..22a73935 100644 --- a/rdlogedit/add_meta.cpp +++ b/rdlogedit/add_meta.cpp @@ -21,13 +21,16 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -63,7 +66,7 @@ AddMeta::AddMeta(QWidget *parent) QLabel *label=new QLabel(tr("Insert a:"),this); label->setGeometry(0,0,sizeHint().width(),30); label->setFont(label_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Marker Button diff --git a/rdlogedit/add_meta.h b/rdlogedit/add_meta.h index a9a49a76..91d1bfc8 100644 --- a/rdlogedit/add_meta.h +++ b/rdlogedit/add_meta.h @@ -24,11 +24,13 @@ #include #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include class AddMeta : public QDialog { diff --git a/rdlogedit/drop_listview.cpp b/rdlogedit/drop_listview.cpp index 1e0da7c2..7cd91882 100644 --- a/rdlogedit/drop_listview.cpp +++ b/rdlogedit/drop_listview.cpp @@ -19,7 +19,10 @@ // // -#include +#include +//Added by qt3to4: +#include +#include #include diff --git a/rdlogedit/drop_listview.h b/rdlogedit/drop_listview.h index e0704f13..5f68e946 100644 --- a/rdlogedit/drop_listview.h +++ b/rdlogedit/drop_listview.h @@ -24,6 +24,9 @@ #include #include +//Added by qt3to4: +#include +#include class DropListView : public RDListView { diff --git a/rdlogedit/edit_chain.cpp b/rdlogedit/edit_chain.cpp index fc84b462..4ca6f0e1 100644 --- a/rdlogedit/edit_chain.cpp +++ b/rdlogedit/edit_chain.cpp @@ -20,6 +20,9 @@ #include #include +//Added by qt3to4: +#include +#include #include #include @@ -63,7 +66,7 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent) edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); edit_timetype_label->setGeometry(30,21,85,17); edit_timetype_label->setFont(label_font); - edit_timetype_label->setAlignment(AlignLeft|AlignVCenter); + edit_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Start Time @@ -79,7 +82,7 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent) // Grace Time // edit_grace_group - =new QButtonGroup(1,Qt::Vertical, + =new Q3ButtonGroup(1,Qt::Vertical, tr("Action If Previous Event Still Playing"),this); edit_grace_group->setGeometry(175,11,435,50); edit_grace_group->setFont(label_font); @@ -94,9 +97,9 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent) radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); edit_grace_group->insert(radio_button); radio_button->setFont(radio_font); - edit_grace_box=new QTimeEdit(this); + edit_grace_box=new Q3TimeEdit(this); edit_grace_box->setGeometry(543,31,60,20); - edit_grace_box->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); + edit_grace_box->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); connect(edit_timetype_box,SIGNAL(toggled(bool)), this,SLOT(timeToggledData(bool))); connect(edit_grace_group,SIGNAL(clicked(int)), @@ -113,7 +116,7 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent) edit_time_label=new QLabel(edit_transtype_box,tr("Transition Type:"),this); edit_time_label->setGeometry(10,68,370,26); edit_time_label->setFont(label_font); - edit_time_label->setAlignment(AlignRight|AlignVCenter); + edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Label diff --git a/rdlogedit/edit_chain.h b/rdlogedit/edit_chain.h index 4a9eca1c..552e34b2 100644 --- a/rdlogedit/edit_chain.h +++ b/rdlogedit/edit_chain.h @@ -22,14 +22,16 @@ #define EDIT_CHAIN_H #include -#include +#include #include #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -66,9 +68,9 @@ class EditChain : public QDialog QComboBox *edit_transtype_box; QLineEdit *edit_comment_edit; QLineEdit *edit_label_edit; - QButtonGroup *edit_grace_group; + Q3ButtonGroup *edit_grace_group; QFont normal_font; - QTimeEdit *edit_grace_box; + Q3TimeEdit *edit_grace_box; }; diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index 622e0bb8..d9ff18b0 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -22,13 +22,18 @@ #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -168,24 +173,24 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_modified_label->setFont(modified_font); edit_logname_label=new QLabel(logname,this); edit_logname_label->setBackgroundColor(QColor(system_mid_color)); - edit_logname_label->setAlignment(AlignLeft|AlignVCenter); + edit_logname_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_logname_label->setFont(title_font); edit_logname_label_label=new QLabel(tr("Log Name:"),this); edit_logname_label_label->setBackgroundColor(QColor(system_mid_color)); edit_logname_label_label->setFont(label_font); - edit_logname_label_label->setAlignment(AlignRight|AlignVCenter); + edit_logname_label_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Track Counts // edit_track_label=new QLabel(this); edit_track_label->setBackgroundColor(QColor(system_mid_color)); - edit_track_label->setAlignment(AlignLeft|AlignVCenter); + edit_track_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_track_label->setFont(title_font); edit_track_label_label=new QLabel(tr("Tracks:"),this); edit_track_label_label->setBackgroundColor(QColor(system_mid_color)); edit_track_label_label->setFont(label_font); - edit_track_label_label->setAlignment(AlignRight|AlignVCenter); + edit_track_label_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Log Origin @@ -195,12 +200,12 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_log->originDatetime().toString("MM/dd/yyyy - hh:mm:ss"), this); edit_origin_label->setBackgroundColor(QColor(system_mid_color)); - edit_origin_label->setAlignment(AlignLeft|AlignVCenter); + edit_origin_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); edit_origin_label->setFont(title_font); edit_origin_label_label=new QLabel(tr("Origin:"),this); edit_origin_label_label->setBackgroundColor(QColor(system_mid_color)); edit_origin_label_label->setFont(label_font); - edit_origin_label_label->setAlignment(AlignRight|AlignVCenter); + edit_origin_label_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Description @@ -212,7 +217,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_description_label= new QLabel(edit_description_edit,tr("Description:"),this); edit_description_label->setFont(label_font); - edit_description_label->setAlignment(AlignRight|AlignVCenter); + edit_description_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Purge Date @@ -220,8 +225,8 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_purgedate_box=new QCheckBox(this); edit_purgedate_label=new QLabel(edit_purgedate_box,tr("Delete on"),this); edit_purgedate_label->setFont(label_font); - edit_purgedate_label->setAlignment(AlignRight|AlignVCenter); - edit_purgedate_edit=new QDateEdit(this); + edit_purgedate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + edit_purgedate_edit=new Q3DateEdit(this); edit_purgedate_button=new QPushButton(tr("Select"),this); edit_purgedate_button->setFont(label_font); connect(edit_purgedate_box,SIGNAL(toggled(bool)), @@ -243,7 +248,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_service_edit->setReadOnly(true); edit_service_label=new QLabel(edit_service_box,tr("Service:"),this); edit_service_label->setFont(label_font); - edit_service_label->setAlignment(AlignRight|AlignVCenter); + edit_service_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_service_box,SIGNAL(activated(const QString &)), this,SLOT(serviceActivatedData(const QString &))); @@ -258,17 +263,17 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_autorefresh_label= new QLabel(edit_autorefresh_box,tr("Enable AutoRefresh:"),this); edit_autorefresh_label->setFont(label_font); - edit_autorefresh_label->setAlignment(AlignRight|AlignVCenter); + edit_autorefresh_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_autorefresh_box,SIGNAL(activated(int)), this,SLOT(autorefreshChangedData(int))); // // Start Date // - edit_startdate_edit=new QDateEdit(this); + edit_startdate_edit=new Q3DateEdit(this); edit_startdate_label=new QLabel(edit_startdate_edit,tr("Start Date:"),this); edit_startdate_label->setFont(label_font); - edit_startdate_label->setAlignment(AlignRight|AlignVCenter); + edit_startdate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_startdate_edit,SIGNAL(valueChanged(const QDate &)), this,SLOT(dateValueChangedData(const QDate &))); @@ -276,10 +281,10 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, // // End Date // - edit_enddate_edit=new QDateEdit(this); + edit_enddate_edit=new Q3DateEdit(this); edit_enddate_label=new QLabel(edit_startdate_edit,tr("End Date:"),this); edit_enddate_label->setFont(label_font); - edit_enddate_label->setAlignment(AlignRight|AlignVCenter); + edit_enddate_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_enddate_edit,SIGNAL(valueChanged(const QDate &)), this,SLOT(dateValueChangedData(const QDate &))); @@ -292,7 +297,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_startdate_box_label= new QLabel(edit_startdate_box,tr("Start Date Enabled"),this); edit_startdate_box_label->setFont(label_font); - edit_startdate_box_label->setAlignment(AlignLeft|AlignVCenter); + edit_startdate_box_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // End Date Checkbox @@ -303,14 +308,14 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_enddate_box_label= new QLabel(edit_enddate_box,tr("End Date Enabled"),this); edit_enddate_box_label->setFont(label_font); - edit_enddate_box_label->setAlignment(AlignLeft|AlignVCenter); + edit_enddate_box_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Time Counter Section // edit_time_label=new QLabel(tr("Run Length"),this); edit_time_label->setFont(label_font); - edit_time_label->setAlignment(AlignCenter); + edit_time_label->setAlignment(Qt::AlignCenter); // // Stop Time Counter @@ -318,7 +323,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_stoptime_edit=new QLineEdit(this); edit_stoptime_label=new QLabel(edit_stoptime_edit,tr("Next Stop:"),this); edit_stoptime_label->setFont(label_font); - edit_stoptime_label->setAlignment(AlignRight|AlignVCenter); + edit_stoptime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // End Time Counter @@ -326,55 +331,55 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_endtime_edit=new QLineEdit(this); edit_endtime_label=new QLabel(edit_endtime_edit,tr("Log End:"),this); edit_endtime_label->setFont(label_font); - edit_endtime_label->setAlignment(AlignRight|AlignVCenter); + edit_endtime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Log Event List // edit_log_list=new DropListView(this); edit_log_list->setAllColumnsShowFocus(true); - edit_log_list->setSelectionMode(QListView::Extended); + edit_log_list->setSelectionMode(Q3ListView::Extended); edit_log_list->setItemMargin(5); edit_log_list->addColumn(""); edit_log_list->setColumnAlignment(0,Qt::AlignHCenter); - edit_log_list->addColumn(tr("TIME")); + edit_log_list->addColumn(tr("Time")); edit_log_list->setColumnAlignment(1,Qt::AlignRight); - edit_log_list->addColumn(tr("TRANS")); + edit_log_list->addColumn(tr("Trans")); edit_log_list->setColumnAlignment(2,Qt::AlignHCenter); - edit_log_list->addColumn(tr("CART")); + edit_log_list->addColumn(tr("Cart")); edit_log_list->setColumnAlignment(3,Qt::AlignHCenter); - edit_log_list->addColumn(tr("GROUP")); + edit_log_list->addColumn(tr("Group")); edit_log_list->setColumnAlignment(4,Qt::AlignHCenter); - edit_log_list->addColumn(tr("LENGTH")); + edit_log_list->addColumn(tr("Length")); edit_log_list->setColumnAlignment(5,Qt::AlignRight); - edit_log_list->addColumn(tr("TITLE")); + edit_log_list->addColumn(tr("Title")); edit_log_list->setColumnAlignment(6,Qt::AlignLeft); - edit_log_list->addColumn(tr("ARTIST")); + edit_log_list->addColumn(tr("Artist")); edit_log_list->setColumnAlignment(7,Qt::AlignLeft); - edit_log_list->addColumn(tr("CLIENT")); + edit_log_list->addColumn(tr("Client")); edit_log_list->setColumnAlignment(8,Qt::AlignLeft); - edit_log_list->addColumn(tr("AGENCY")); + edit_log_list->addColumn(tr("Agency")); edit_log_list->setColumnAlignment(9,Qt::AlignLeft); - edit_log_list->addColumn(tr("LABEL")); + edit_log_list->addColumn(tr("Label")); edit_log_list->setColumnAlignment(10,Qt::AlignHCenter); - edit_log_list->addColumn(tr("SOURCE")); + edit_log_list->addColumn(tr("Source")); edit_log_list->setColumnAlignment(11,Qt::AlignHCenter); - edit_log_list->addColumn(tr("EXT DATA")); + edit_log_list->addColumn(tr("Ext Data")); edit_log_list->setColumnAlignment(12,Qt::AlignHCenter); - edit_log_list->addColumn(tr("LINE ID")); + edit_log_list->addColumn(tr("Line ID")); edit_log_list->setColumnAlignment(13,Qt::AlignHCenter); - edit_log_list->addColumn(tr("COUNT")); + edit_log_list->addColumn(tr("Count")); edit_log_list->setColumnAlignment(14,Qt::AlignHCenter); edit_log_list->setHardSortColumn(14); edit_log_list->setColumnSortType(14,RDListView::LineSort); if(editing_allowed) { - connect(edit_log_list,SIGNAL(doubleClicked(QListViewItem *)), - this,SLOT(doubleClickData(QListViewItem *))); + connect(edit_log_list,SIGNAL(doubleClicked(Q3ListViewItem *)), + this,SLOT(doubleClickData(Q3ListViewItem *))); connect(edit_log_list,SIGNAL(cartDropped(int,RDLogLine *)), this,SLOT(cartDroppedData(int,RDLogLine *))); } - connect(edit_log_list,SIGNAL(clicked(QListViewItem *)), - this,SLOT(clickedData(QListViewItem *))); + connect(edit_log_list,SIGNAL(clicked(Q3ListViewItem *)), + this,SLOT(clickedData(Q3ListViewItem *))); connect(edit_log_list,SIGNAL(selectionChanged()), this,SLOT(selectionChangedData())); @@ -501,7 +506,7 @@ EditLog::EditLog(QString logname,QString *filter,QString *group, edit_player= new RDSimplePlayer(rda->cae(),rda->ripc(),edit_output_card,edit_output_port, edit_start_macro,edit_end_macro,this); - edit_player->stopButton()->setOnColor(red); + edit_player->stopButton()->setOnColor(Qt::red); #endif // WIN32 // @@ -747,7 +752,7 @@ void EditLog::insertCartButtonData() int line; int id; - QListViewItem *item=SingleSelection(); + Q3ListViewItem *item=SingleSelection(); if(item==NULL || (line=item->text(14).toInt())<0) { line=edit_log_event->size(); id=END_MARKER_ID; @@ -788,7 +793,7 @@ void EditLog::insertMarkerButtonData() EditTrack *edit_track; EditChain *edit_chain; - QListViewItem *item=SingleSelection(); + Q3ListViewItem *item=SingleSelection(); if(item==NULL) { return; } @@ -853,7 +858,7 @@ void EditLog::insertMarkerButtonData() } -void EditLog::clickedData(QListViewItem *item) +void EditLog::clickedData(Q3ListViewItem *item) { #ifndef WIN32 RDListViewItem *rditem=SingleSelection(); @@ -874,7 +879,7 @@ void EditLog::selectionChangedData() } -void EditLog::doubleClickData(QListViewItem *item) +void EditLog::doubleClickData(Q3ListViewItem *item) { if(item->text(13).toInt()==END_MARKER_ID) { insertCartButtonData(); @@ -952,7 +957,7 @@ void EditLog::deleteButtonData() { int count=0; - QListViewItem *next=edit_log_list->firstChild(); + Q3ListViewItem *next=edit_log_list->firstChild(); int line=0; while(next!=NULL) { @@ -972,7 +977,7 @@ void EditLog::deleteButtonData() void EditLog::upButtonData() { - QListViewItem *item=SingleSelection(); + Q3ListViewItem *item=SingleSelection(); if((item==NULL)||(item->text(14).toInt()==0)|| (item->text(13).toInt()==END_MARKER_ID)) { return; @@ -990,7 +995,7 @@ void EditLog::upButtonData() void EditLog::downButtonData() { - QListViewItem *item=SingleSelection(); + Q3ListViewItem *item=SingleSelection(); if((item==NULL)||(item->text(14).toInt()==(edit_log_list->childCount()-2))|| (item->text(13).toInt()==END_MARKER_ID)) { @@ -1023,7 +1028,7 @@ void EditLog::copyButtonData() void EditLog::pasteButtonData() { - QListViewItem *item=SingleSelection(); + Q3ListViewItem *item=SingleSelection(); if((item==NULL)||(edit_clipboard->size()==0)) { return; } @@ -1182,7 +1187,7 @@ void EditLog::renderasData() int first_line=-1; int last_line=-1; - QListViewItem *next=edit_log_list->firstChild(); + Q3ListViewItem *next=edit_log_list->firstChild(); while(next!=NULL) { if(edit_log_list->isSelected(next)) { if(next->text(13).toInt()!=END_MARKER_ID) { @@ -1357,13 +1362,12 @@ void EditLog::paintEvent(QPaintEvent *e) p->fillRect(9,size().height()-130,size().width()-20,60, QColor(system_mid_color)); - p->setPen(black); - p->setBrush(black); - p->moveTo(624,70); - p->lineTo(760,70); - p->lineTo(760,124); - p->lineTo(624,124); - p->lineTo(624,70); + p->setPen(Qt::black); + p->setBrush(Qt::black); + p->drawLine(624,70,760,70); + p->drawLine(760,70,760,124); + p->drawLine(760,124,624,124); + p->drawLine(624,124,624,70); p->end(); delete p; @@ -1644,7 +1648,7 @@ void EditLog::UpdateSelection() if(rditem==NULL) { // Multiple items selected? edit_endtime_edit->setText(""); edit_stoptime_label->setText(tr("Selected:")); - QListViewItem *next=edit_log_list->firstChild(); + Q3ListViewItem *next=edit_log_list->firstChild(); int start_line=-1; int end_line=-1; while(next!=NULL) { @@ -1740,8 +1744,8 @@ bool EditLog::UpdateColor(RDListViewItem *item,RDLogLine *logline) void EditLog::RenumberList(int line) { - QListViewItem *prev=NULL; - QListViewItem *item=edit_log_list->firstChild(); + Q3ListViewItem *prev=NULL; + Q3ListViewItem *item=edit_log_list->firstChild(); if(item==NULL) { return; } @@ -1759,7 +1763,7 @@ void EditLog::RenumberList(int line) void EditLog::SelectRecord(int id) { - QListViewItem *item=edit_log_list->firstChild(); + Q3ListViewItem *item=edit_log_list->firstChild(); while(item!=NULL) { if(item->text(13).toInt()==id) { @@ -1844,7 +1848,7 @@ bool EditLog::DeleteTracks() void EditLog::LoadClipboard(bool clear_ext) { - QListViewItem *next=edit_log_list->firstChild(); + Q3ListViewItem *next=edit_log_list->firstChild(); edit_clipboard->clear(); while(next!=NULL) { diff --git a/rdlogedit/edit_log.h b/rdlogedit/edit_log.h index 634cc5ec..55bbfb13 100644 --- a/rdlogedit/edit_log.h +++ b/rdlogedit/edit_log.h @@ -24,11 +24,16 @@ #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -79,9 +84,9 @@ class EditLog : public QDialog void endDateEnabledData(bool); void insertCartButtonData(); void insertMarkerButtonData(); - void clickedData(QListViewItem *item); + void clickedData(Q3ListViewItem *item); void selectionChangedData(); - void doubleClickData(QListViewItem *item); + void doubleClickData(Q3ListViewItem *item); void editButtonData(); void deleteButtonData(); void upButtonData(); @@ -136,8 +141,8 @@ class EditLog : public QDialog QLabel *edit_autorefresh_label; QComboBox *edit_autorefresh_box; QLineEdit *edit_autorefresh_edit; - QDateEdit *edit_startdate_edit; - QDateEdit *edit_enddate_edit; + Q3DateEdit *edit_startdate_edit; + Q3DateEdit *edit_enddate_edit; QLabel *edit_startdate_label; QLabel *edit_startdate_box_label; QLabel *edit_enddate_box_label; @@ -192,7 +197,7 @@ class EditLog : public QDialog QLineEdit *edit_endtime_edit; QCheckBox *edit_purgedate_box; QLabel *edit_purgedate_label; - QDateEdit *edit_purgedate_edit; + Q3DateEdit *edit_purgedate_edit; QPushButton *edit_purgedate_button; RDLogLock *edit_log_lock; #ifndef WIN32 diff --git a/rdlogedit/edit_logline.cpp b/rdlogedit/edit_logline.cpp index d3f2ca69..57c500b1 100644 --- a/rdlogedit/edit_logline.cpp +++ b/rdlogedit/edit_logline.cpp @@ -21,6 +21,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -80,7 +83,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); edit_timetype_label->setGeometry(30,21,80,17); edit_timetype_label->setFont(label_font); - edit_timetype_label->setAlignment(AlignLeft|AlignVCenter); + edit_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Start Time @@ -96,7 +99,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, // Grace Time // edit_grace_group - =new QButtonGroup(1,Qt::Vertical, + =new Q3ButtonGroup(1,Qt::Vertical, tr("Action If Previous Event Still Playing"),this); edit_grace_group->setGeometry(175,11,435,50); edit_grace_group->setFont(label_font); @@ -132,7 +135,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, edit_time_label=new QLabel(edit_transtype_box,tr("Transition Type:"),this); edit_time_label->setGeometry(190,68,290,26); edit_time_label->setFont(label_font); - edit_time_label->setAlignment(AlignRight|AlignVCenter); + edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // Overlap Box edit_overlap_box=new QCheckBox(this); @@ -141,7 +144,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, new QLabel(edit_overlap_box,tr("No Fade on Segue Out"),this); edit_overlap_label->setGeometry(50,68,130,26); edit_overlap_label->setFont(button_font); - edit_overlap_label->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + edit_overlap_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Cart Number diff --git a/rdlogedit/edit_logline.h b/rdlogedit/edit_logline.h index 1906dd10..615686ec 100644 --- a/rdlogedit/edit_logline.h +++ b/rdlogedit/edit_logline.h @@ -22,13 +22,15 @@ #define EDIT_LOGLINE_H #include -#include +#include #include #include #include #include -#include +#include #include +//Added by qt3to4: +#include #include #include @@ -76,7 +78,7 @@ class EditLogLine : public QDialog QString *edit_filter; QString *edit_group; QString *edit_schedcode; - QButtonGroup *edit_grace_group; + Q3ButtonGroup *edit_grace_group; RDTimeEdit *edit_grace_edit; QString edit_service; RDGroupList *edit_group_list; diff --git a/rdlogedit/edit_marker.cpp b/rdlogedit/edit_marker.cpp index bc40d9ba..decc3e1c 100644 --- a/rdlogedit/edit_marker.cpp +++ b/rdlogedit/edit_marker.cpp @@ -20,6 +20,9 @@ #include #include +//Added by qt3to4: +#include +#include #include "edit_marker.h" @@ -56,7 +59,7 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent) edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); edit_timetype_label->setGeometry(30,21,85,17); edit_timetype_label->setFont(label_font); - edit_timetype_label->setAlignment(AlignLeft|AlignVCenter); + edit_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Start Time @@ -72,7 +75,7 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent) // Grace Time // edit_grace_group - =new QButtonGroup(1,Qt::Vertical, + =new Q3ButtonGroup(1,Qt::Vertical, tr("Action If Previous Event Still Playing"),this); edit_grace_group->setGeometry(175,11,435,50); edit_grace_group->setFont(label_font); @@ -87,9 +90,9 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent) radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); edit_grace_group->insert(radio_button); radio_button->setFont(radio_font); - edit_grace_box=new QTimeEdit(this); + edit_grace_box=new Q3TimeEdit(this); edit_grace_box->setGeometry(543,31,60,20); - edit_grace_box->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); + edit_grace_box->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); connect(edit_timetype_box,SIGNAL(toggled(bool)), this,SLOT(timeToggledData(bool))); connect(edit_grace_group,SIGNAL(clicked(int)), @@ -106,7 +109,7 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent) edit_time_label=new QLabel(edit_transtype_box,"Transition Type:",this); edit_time_label->setGeometry(10,68,370,26); edit_time_label->setFont(label_font); - edit_time_label->setAlignment(AlignRight|AlignVCenter); + edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Comment diff --git a/rdlogedit/edit_marker.h b/rdlogedit/edit_marker.h index ad9f076f..e9631695 100644 --- a/rdlogedit/edit_marker.h +++ b/rdlogedit/edit_marker.h @@ -22,14 +22,16 @@ #define EDIT_MARKER_H #include -#include +#include #include #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -64,9 +66,9 @@ class EditMarker : public QDialog QComboBox *edit_transtype_box; QLineEdit *edit_comment_edit; QLineEdit *edit_label_edit; - QButtonGroup *edit_grace_group; + Q3ButtonGroup *edit_grace_group; QFont normal_font; - QTimeEdit *edit_grace_box; + Q3TimeEdit *edit_grace_box; }; diff --git a/rdlogedit/edit_track.cpp b/rdlogedit/edit_track.cpp index 24cb8889..0a4465d7 100644 --- a/rdlogedit/edit_track.cpp +++ b/rdlogedit/edit_track.cpp @@ -20,6 +20,9 @@ #include #include +//Added by qt3to4: +#include +#include #include @@ -56,7 +59,7 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent) edit_timetype_label=new QLabel(edit_timetype_box,tr("Start at:"),this); edit_timetype_label->setGeometry(30,21,85,17); edit_timetype_label->setFont(label_font); - edit_timetype_label->setAlignment(AlignLeft|AlignVCenter); + edit_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Start Time @@ -72,7 +75,7 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent) // Grace Time // edit_grace_group - =new QButtonGroup(1,Qt::Vertical, + =new Q3ButtonGroup(1,Qt::Vertical, tr("Action If Previous Event Still Playing"),this); edit_grace_group->setGeometry(175,11,435,50); edit_grace_group->setFont(label_font); @@ -87,9 +90,9 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent) radio_button=new QRadioButton(tr("Wait up to"),edit_grace_group); edit_grace_group->insert(radio_button); radio_button->setFont(radio_font); - edit_grace_box=new QTimeEdit(this); + edit_grace_box=new Q3TimeEdit(this); edit_grace_box->setGeometry(543,31,60,20); - edit_grace_box->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); + edit_grace_box->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); connect(edit_timetype_box,SIGNAL(toggled(bool)), this,SLOT(timeToggledData(bool))); connect(edit_grace_group,SIGNAL(clicked(int)), @@ -106,7 +109,7 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent) edit_time_label=new QLabel(edit_transtype_box,"Transition Type:",this); edit_time_label->setGeometry(10,68,370,26); edit_time_label->setFont(label_font); - edit_time_label->setAlignment(AlignRight|AlignVCenter); + edit_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Comment diff --git a/rdlogedit/edit_track.h b/rdlogedit/edit_track.h index a348ce73..47d67de6 100644 --- a/rdlogedit/edit_track.h +++ b/rdlogedit/edit_track.h @@ -22,14 +22,16 @@ #define EDIT_TRACK_H #include -#include +#include #include #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -65,9 +67,9 @@ class EditTrack : public QDialog QCheckBox *edit_overlap_box; QLabel *edit_overlap_label; QLineEdit *edit_comment_edit; - QButtonGroup *edit_grace_group; + Q3ButtonGroup *edit_grace_group; QFont normal_font; - QTimeEdit *edit_grace_box; + Q3TimeEdit *edit_grace_box; QLabel *edit_grace_label; }; diff --git a/rdlogedit/import_track.cpp b/rdlogedit/import_track.cpp index aa58be8b..507be60b 100644 --- a/rdlogedit/import_track.cpp +++ b/rdlogedit/import_track.cpp @@ -23,12 +23,16 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -72,7 +76,7 @@ ImportTrack::ImportTrack(QString *filter,QString *group,QWidget *parent) QLabel *label=new QLabel(tr("Insert audio from a:"),this); label->setGeometry(0,0,sizeHint().width(),30); label->setFont(label_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Cart Button diff --git a/rdlogedit/import_track.h b/rdlogedit/import_track.h index 899c6783..11aa5c0f 100644 --- a/rdlogedit/import_track.h +++ b/rdlogedit/import_track.h @@ -24,11 +24,14 @@ #include #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include #include #include diff --git a/rdlogedit/list_listviewitem.cpp b/rdlogedit/list_listviewitem.cpp index 1bbd607d..3e80eb91 100644 --- a/rdlogedit/list_listviewitem.cpp +++ b/rdlogedit/list_listviewitem.cpp @@ -20,6 +20,8 @@ #include #include +//Added by qt3to4: +#include #include @@ -27,8 +29,8 @@ #include "../icons/redball.xpm" #include "../icons/whiteball.xpm" -ListListViewItem::ListListViewItem(QListView *parent) - : QListViewItem(parent) +ListListViewItem::ListListViewItem(Q3ListView *parent) + : Q3ListViewItem(parent) { list_track_column=-1; list_tracks=-1; @@ -84,7 +86,7 @@ void ListListViewItem::paintCell(QPainter *p,const QColorGroup &cg,int column, int width,int align) { if(column!=list_track_column) { - QListViewItem::paintCell(p,cg,column,width,align); + Q3ListViewItem::paintCell(p,cg,column,width,align); return; } QColor fg=cg.text(); diff --git a/rdlogedit/list_listviewitem.h b/rdlogedit/list_listviewitem.h index 9ea7095d..4488b32d 100644 --- a/rdlogedit/list_listviewitem.h +++ b/rdlogedit/list_listviewitem.h @@ -21,15 +21,15 @@ #ifndef LIST_LISTVIEWITEM_H #define LIST_LISTVIEWITEM_H -#include +#include #include -#include +#include -class ListListViewItem : public QListViewItem +class ListListViewItem : public Q3ListViewItem { public: - ListListViewItem(QListView *parent); + ListListViewItem(Q3ListView *parent); int trackColumn() const; void setTrackColumn(int col); int tracks() const; @@ -46,7 +46,7 @@ class ListListViewItem : public QListViewItem QPixmap *list_whiteball_map; QPixmap *list_redball_map; QPixmap *list_greenball_map; - QListView *list_parent; + Q3ListView *list_parent; }; diff --git a/rdlogedit/list_reports.cpp b/rdlogedit/list_reports.cpp index a30fd3f6..0842750a 100644 --- a/rdlogedit/list_reports.cpp +++ b/rdlogedit/list_reports.cpp @@ -19,6 +19,8 @@ // #include +//Added by qt3to4: +#include #include #include @@ -71,17 +73,17 @@ ListReports::ListReports(const QString &logname,const QString &description, new QLabel(list_reports_box,tr("Type:"),this); list_reports_label->setGeometry(10,10,35,19); list_reports_label->setFont(font); - list_reports_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + list_reports_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Effective Date // - list_date_edit=new QDateEdit(this); + list_date_edit=new Q3DateEdit(this); list_date_edit->setGeometry(110,34,100,19); QLabel *list_date_label=new QLabel(list_date_edit,tr("Effective Date:"),this); list_date_label->setGeometry(10,34,95,19); list_date_label->setFont(font); - list_date_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + list_date_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QPushButton *button=new QPushButton(this); button->setGeometry(215,32,60,24); button->setFont(select_font); diff --git a/rdlogedit/list_reports.h b/rdlogedit/list_reports.h index 83443894..7069b473 100644 --- a/rdlogedit/list_reports.h +++ b/rdlogedit/list_reports.h @@ -22,7 +22,7 @@ #define LIST_REPORTS_H #include -#include +#include #include #include @@ -57,7 +57,7 @@ class ListReports : public QDialog QDate list_end_date; bool list_auto_refresh; RDLogEvent *list_events; - QDateEdit *list_date_edit; + Q3DateEdit *list_date_edit; }; diff --git a/rdlogedit/log_listview.cpp b/rdlogedit/log_listview.cpp index 75401dba..16151b8e 100644 --- a/rdlogedit/log_listview.cpp +++ b/rdlogedit/log_listview.cpp @@ -19,7 +19,10 @@ // // -#include +#include +//Added by qt3to4: +#include +#include #include @@ -31,7 +34,7 @@ LogListView::LogListView(QWidget *parent) // // Right Button Menu // - log_menu=new QPopupMenu(this,"log_menu"); + log_menu=new Q3PopupMenu(this,"log_menu"); connect(log_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); log_menu->insertItem(tr("PLAY Transition"),this,SLOT(playData()),0,0); log_menu->insertItem(tr("SEGUE Transition"),this,SLOT(segueData()),0,1); @@ -84,10 +87,10 @@ void LogListView::stopData() void LogListView::contentsMousePressEvent(QMouseEvent *e) { - QListView::contentsMousePressEvent(e); + Q3ListView::contentsMousePressEvent(e); log_menu_item=(RDListViewItem *)selectedItem(); switch(e->button()) { - case QMouseEvent::RightButton: + case Qt::RightButton: log_menu->setGeometry(e->globalX(),e->globalY(), log_menu->sizeHint().width(), log_menu->sizeHint().height()); diff --git a/rdlogedit/log_listview.h b/rdlogedit/log_listview.h index ac5af90a..a267878a 100644 --- a/rdlogedit/log_listview.h +++ b/rdlogedit/log_listview.h @@ -21,9 +21,11 @@ #ifndef LOG_LISTVIEW_H #define LOG_LISTVIEW_H -#include +#include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -51,7 +53,7 @@ class LogListView : public RDListView void contentsMousePressEvent(QMouseEvent *e); private: - QPopupMenu *log_menu; + Q3PopupMenu *log_menu; RDListViewItem *log_menu_item; QWidget *log_parent; QString log_transition_type; diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 59ef626c..9cec9fd8 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -28,17 +28,19 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include #include #include +//Added by qt3to4: +#include #include #include @@ -98,7 +100,7 @@ void SigHandler(int signo) MainWidget::MainWidget(QWidget *parent) - :QMainWindow(parent) + :Q3MainWindow(parent) { QString err_msg; @@ -204,42 +206,42 @@ MainWidget::MainWidget(QWidget *parent) // // Log List // - log_log_list=new QListView(this); + log_log_list=new Q3ListView(this); log_log_list->setFont(default_font); log_log_list->setAllColumnsShowFocus(true); - log_log_list->setSelectionMode(QListView::Extended); + log_log_list->setSelectionMode(Q3ListView::Extended); log_log_list->setItemMargin(5); connect(log_log_list,SIGNAL(selectionChanged()), this,SLOT(logSelectionChangedData())); connect(log_log_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(logDoubleclickedData(QListViewItem *,const QPoint &,int))); + SLOT(logDoubleclickedData(Q3ListViewItem *,const QPoint &,int))); log_log_list->addColumn(""); log_log_list->setColumnAlignment(0,Qt::AlignCenter); - log_log_list->addColumn(tr("LOG NAME")); + log_log_list->addColumn(tr("Log Name")); log_log_list->setColumnAlignment(1,Qt::AlignHCenter); - log_log_list->addColumn(tr("DESCRIPTION")); + log_log_list->addColumn(tr("Description")); log_log_list->setColumnAlignment(2,Qt::AlignLeft); - log_log_list->addColumn(tr("SERVICE")); + log_log_list->addColumn(tr("Service")); log_log_list->setColumnAlignment(3,Qt::AlignLeft); - log_log_list->addColumn(tr("MUSIC")); + log_log_list->addColumn(tr("Music")); log_log_list->setColumnAlignment(4,Qt::AlignCenter); - log_log_list->addColumn(tr("TRAFFIC")); + log_log_list->addColumn(tr("Traffic")); log_log_list->setColumnAlignment(5,Qt::AlignCenter); - log_log_list->addColumn(tr("TRACKS")); + log_log_list->addColumn(tr("Tracks")); log_log_list->setColumnAlignment(6,Qt::AlignHCenter); - log_log_list->addColumn(tr("VALID FROM")); + log_log_list->addColumn(tr("Valid From")); log_log_list->setColumnAlignment(7,Qt::AlignHCenter); - log_log_list->addColumn(tr("VALID TO")); + log_log_list->addColumn(tr("Valid To")); log_log_list->setColumnAlignment(8,Qt::AlignHCenter); - log_log_list->addColumn(tr("AUTO REFRESH")); + log_log_list->addColumn(tr("Auto Refresh")); log_log_list->setColumnAlignment(9,Qt::AlignHCenter); - log_log_list->addColumn(tr("ORIGIN")); + log_log_list->addColumn(tr("Origin")); log_log_list->setColumnAlignment(10,Qt::AlignLeft); - log_log_list->addColumn(tr("LAST LINKED")); + log_log_list->addColumn(tr("Last Linked")); log_log_list->setColumnAlignment(11,Qt::AlignLeft); - log_log_list->addColumn(tr("LAST MODIFIED")); + log_log_list->addColumn(tr("Last Modified")); log_log_list->setColumnAlignment(12,Qt::AlignLeft); // @@ -390,7 +392,7 @@ void MainWidget::addData() item->setText(1,logname); RefreshItem(item); log_log_list->setSelected(item,true); - log_log_list->ensureItemVisible((QListViewItem *)item); + log_log_list->ensureItemVisible((Q3ListViewItem *)item); for(unsigned i=0;isetText(1,newlogs[i]); @@ -685,7 +687,7 @@ void MainWidget::logSelectionChangedData() } -void MainWidget::logDoubleclickedData(QListViewItem *,const QPoint &,int) +void MainWidget::logDoubleclickedData(Q3ListViewItem *,const QPoint &,int) { editData(); } @@ -912,7 +914,7 @@ void MainWidget::UnlockList() { ListListViewItem *item=NULL; - for(unsigned i=0;i findItem(log_deleted_logs[i],1))!=NULL) { delete item; @@ -941,7 +943,7 @@ int main(int argc,char *argv[]) qt_path=tr_path; #else tr_path=QString(PREFIX)+QString("/share/rivendell/"); - qt_path=QString(QTDIR)+QString("/translation/"); + qt_path=QString("/usr/share/qt4/translation/"); #endif // WIN32 QTranslator qt(0); qt.load(qt_path+QString("qt_")+QTextCodec::locale(),"."); diff --git a/rdlogedit/rdlogedit.h b/rdlogedit/rdlogedit.h index f0215d0c..8b5d14da 100644 --- a/rdlogedit/rdlogedit.h +++ b/rdlogedit/rdlogedit.h @@ -23,16 +23,18 @@ #include -#include +#include #include #include #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include #include #include @@ -42,7 +44,7 @@ #define RDLOGEDIT_USAGE "\n" -class MainWidget : public QMainWindow +class MainWidget : public Q3MainWindow { Q_OBJECT public: @@ -61,7 +63,7 @@ class MainWidget : public QMainWindow void reportData(); void filterChangedData(const QString &str); void logSelectionChangedData(); - void logDoubleclickedData(QListViewItem *item,const QPoint &pt,int col); + void logDoubleclickedData(Q3ListViewItem *item,const QPoint &pt,int col); void notificationReceivedData(RDNotification *notify); void quitMainWidget(); @@ -82,7 +84,7 @@ class MainWidget : public QMainWindow int log_card_no; int log_stream_no; RDLogFilter *log_filter_widget; - QListView *log_log_list; + Q3ListView *log_log_list; std::vector log_clipboard; QPushButton *log_add_button; QPushButton *log_edit_button; diff --git a/rdlogedit/rdlogedit_cs.ts b/rdlogedit/rdlogedit_cs.ts index 480bf031..0ac5e610 100644 --- a/rdlogedit/rdlogedit_cs.ts +++ b/rdlogedit/rdlogedit_cs.ts @@ -1,4 +1,6 @@ - + + + AddMeta @@ -149,55 +151,55 @@ TIME - ČAS + ČAS TRANS - PŘECHOD + PŘECHOD CART - VOZÍK + VOZÍK GROUP - SKUPINA + SKUPINA LENGTH - DÉLKA + DÉLKA TITLE - NÁZEV + NÁZEV ARTIST - UMĚLEC + UMĚLEC CLIENT - ZÁKAZNÍK + ZÁKAZNÍK AGENCY - AGENTURA + AGENTURA LABEL - ŠTÍTEK + ŠTÍTEK SOURCE - ZDROJ + ZDROJ LINE ID - ID ŘÁDKU + ID ŘÁDKU COUNT - POČÍTADLO + POČÍTADLO Insert @@ -401,10 +403,6 @@ jež jsou pro vybranou službu zakázány! Unable to save log, audio deletion error! Soubor se zápisem nelze uložit, chyba při mazání zvuku! - - EXT DATA - - Link Start @@ -441,6 +439,62 @@ jež jsou pro vybranou službu zakázány! Log already being edited by + + Time + + + + Trans + + + + Cart + Vozík + + + Group + + + + Length + + + + Title + Název + + + Artist + Umělec + + + Client + + + + Agency + + + + Label + Štítek + + + Source + + + + Ext Data + + + + Line ID + + + + Count + + EditLogLine @@ -769,51 +823,51 @@ vybrané služby! LOG NAME - NÁZEV ZÁPISU + NÁZEV ZÁPISU DESCRIPTION - POPIS + POPIS SERVICE - SLUŽBA + SLUŽBA MUSIC - HUDBA + HUDBA TRAFFIC - PŘENOS + PŘENOS TRACKS - STOPY + STOPY VALID FROM - PLATNÉ OD + PLATNÉ OD VALID TO - PLATNÉ DO + PLATNÉ DO AUTO REFRESH - AUTOOBNOVA + AUTOOBNOVA ORIGIN - PŮVOD + PŮVOD LAST LINKED - NAPOSLEDY SPOJENO + NAPOSLEDY SPOJENO LAST MODIFIED - NAPOSLEDY ZMĚNĚNO + NAPOSLEDY ZMĚNĚNO &Add @@ -963,6 +1017,54 @@ Vyhledejte svého správce systému kvůli aktualizaci! Unknown command option + + Log Name + Název zápisu + + + Description + + + + Service + + + + Music + Hudba + + + Traffic + Přenos + + + Tracks + + + + Valid From + + + + Valid To + + + + Auto Refresh + + + + Origin + + + + Last Linked + + + + Last Modified + + RenderDialog @@ -1125,31 +1227,31 @@ Track TIME - ČAS + ČAS TRANS - PŘECHOD + PŘECHOD CART - VOZÍK + VOZÍK GROUP - SKUPINA + SKUPINA LENGTH - DÉLKA + DÉLKA TITLE - NÁZEV + NÁZEV ARTIST - UMĚLEC + UMĚLEC Do Over @@ -1278,13 +1380,9 @@ therefore only existing transitions will be editable. This cart cannot contain any additional cuts! - - ALBUM - - LABEL - ŠTÍTEK + ŠTÍTEK Log Locked @@ -1298,5 +1396,37 @@ therefore only existing transitions will be editable. Talk + + Trans + + + + Cart + Vozík + + + Group + + + + Length + + + + Title + Název + + + Artist + Umělec + + + Album + + + + Label + Štítek + diff --git a/rdlogedit/rdlogedit_de.ts b/rdlogedit/rdlogedit_de.ts index ea6d1ce5..81adb2c3 100644 --- a/rdlogedit/rdlogedit_de.ts +++ b/rdlogedit/rdlogedit_de.ts @@ -1,4 +1,6 @@ - + + + AddMeta @@ -149,55 +151,55 @@ TIME - Zeit + Zeit TRANS - ÜBERGANG + ÜBERGANG CART - CART + CART GROUP - GRUPPE + GRUPPE LENGTH - LÄNGE + LÄNGE TITLE - TITEL + TITEL ARTIST - KÜNSTLER + KÜNSTLER CLIENT - KUNDE + KUNDE AGENCY - AGENTUR + AGENTUR LABEL - LABEL + LABEL SOURCE - QUELLE + QUELLE LINE ID - LINE ID + LINE ID COUNT - ZÄHLER + ZÄHLER Insert @@ -401,10 +403,6 @@ die für den gewählten Service ungültig sind! Unable to save log, audio deletion error! Kann Logdatei nicht speichern, Audiolöschfehler! - - EXT DATA - - Link Start @@ -441,6 +439,62 @@ die für den gewählten Service ungültig sind! Log already being edited by + + Time + + + + Trans + + + + Cart + Cart + + + Group + + + + Length + + + + Title + Titel + + + Artist + Künstler + + + Client + + + + Agency + + + + Label + Label + + + Source + + + + Ext Data + + + + Line ID + + + + Count + + EditLogLine @@ -769,51 +823,51 @@ Gruppe des ausgewählten Service! LOG NAME - LOGNAME + LOGNAME DESCRIPTION - BESCHREIBUNG + BESCHREIBUNG SERVICE - SERVICE + SERVICE MUSIC - MUSIK + MUSIK TRAFFIC - TRAFFIC + TRAFFIC TRACKS - TRACKS + TRACKS VALID FROM - GÜLTIG VON + GÜLTIG VON VALID TO - GÜLTIG BIS + GÜLTIG BIS AUTO REFRESH - AUTO REFRESH + AUTO REFRESH ORIGIN - HERKUNFT + HERKUNFT LAST LINKED - ZULETZT GELINKT + ZULETZT GELINKT LAST MODIFIED - ZULETZT GEÄNDERT + ZULETZT GEÄNDERT &Add @@ -953,6 +1007,54 @@ Fortfahren? Unknown command option + + Log Name + Logname + + + Description + + + + Service + + + + Music + Musik + + + Traffic + Traffic + + + Tracks + + + + Valid From + + + + Valid To + + + + Auto Refresh + + + + Origin + + + + Last Linked + + + + Last Modified + + RenderDialog @@ -1115,31 +1217,31 @@ Track TIME - Zeit + Zeit TRANS - ÜBERGANG + ÜBERGANG CART - CART + CART GROUP - GRUPPE + GRUPPE LENGTH - LÄNGE + LÄNGE TITLE - TITEL + TITEL ARTIST - KÜNSTLER + KÜNSTLER Do Over @@ -1268,13 +1370,9 @@ therefore only existing transitions will be editable. This cart cannot contain any additional cuts! - - ALBUM - - LABEL - LABEL + LABEL Log Locked @@ -1288,5 +1386,37 @@ therefore only existing transitions will be editable. Talk + + Trans + + + + Cart + Cart + + + Group + + + + Length + + + + Title + Titel + + + Artist + Künstler + + + Album + + + + Label + Label + diff --git a/rdlogedit/rdlogedit_es.ts b/rdlogedit/rdlogedit_es.ts index 038c9b0c..4b00ac0c 100644 --- a/rdlogedit/rdlogedit_es.ts +++ b/rdlogedit/rdlogedit_es.ts @@ -1,4 +1,6 @@ - + + + AddMeta @@ -133,51 +135,51 @@ TIME - TIEMPO + TIEMPO TRANS - TRANS + TRANS CART - CARTUCHO + CARTUCHO GROUP - GRUPO + GRUPO LENGTH - DURACIÓN + DURACIÓN TITLE - TÍTULO + TÍTULO ARTIST - ARTISTA + ARTISTA CLIENT - CLIENTE + CLIENTE AGENCY - AGENCIA + AGENCIA LABEL - ETIQUETA + ETIQUETA LINE ID - ID LÍNEA + ID LÍNEA COUNT - CUENTA + CUENTA Insert @@ -297,7 +299,7 @@ Do you want to save your changes? SOURCE - FUENTE + FUENTE Manual @@ -401,10 +403,6 @@ desactivados para el servicio actual! Unable to save log, audio deletion error! No es posible guardar la Lista, ¡error por eliminación de audio! - - EXT DATA - - Link Start @@ -441,6 +439,62 @@ desactivados para el servicio actual! Log already being edited by + + Time + Tiempo + + + Trans + + + + Cart + Cartucho + + + Group + + + + Length + + + + Title + Título + + + Artist + Artista + + + Client + + + + Agency + + + + Label + Etiqueta + + + Source + + + + Ext Data + + + + Line ID + + + + Count + + EditLogLine @@ -769,27 +823,27 @@ desactivado para el servicio especificado! LOG NAME - NOMBRE DE LA LISTA + NOMBRE DE LA LISTA DESCRIPTION - DESCRIPCIÓN + DESCRIPCIÓN SERVICE - SERVICIO + SERVICIO VALID FROM - VÁLIDO DESDE + VÁLIDO DESDE VALID TO - VÁLIDO HASTA + VÁLIDO HASTA ORIGIN - ORIGEN + ORIGEN &Add @@ -847,7 +901,7 @@ Continue? TRACKS - PISTAS + PISTAS Voice @@ -861,23 +915,23 @@ de &Voz MUSIC - MÚSICA + MÚSICA TRAFFIC - TRÁFICO + TRÁFICO LAST LINKED - ÚLTIMO ENLACE + ÚLTIMO ENLACE LAST MODIFIED - ÚLTIMO CAMBIO + ÚLTIMO CAMBIO AUTO REFRESH - AUTO ACTUALIZAR + AUTO ACTUALIZAR Log @@ -959,6 +1013,54 @@ See your system administrator for an update! Unknown command option + + Log Name + Nombre de la Lista + + + Description + + + + Service + + + + Music + Música + + + Traffic + Tráfico + + + Tracks + Pistas + + + Valid From + + + + Valid To + + + + Auto Refresh + + + + Origin + + + + Last Linked + + + + Last Modified + + RenderDialog @@ -1123,31 +1225,31 @@ Track TIME - TIEMPO + TIEMPO TRANS - TRANS + TRANS CART - CARTUCHO + CARTUCHO GROUP - GRUPO + GRUPO LENGTH - DURACIÓN + DURACIÓN TITLE - TÍTULO + TÍTULO ARTIST - ARTISTA + ARTISTA Do Over @@ -1280,13 +1382,9 @@ sólo podrás editar transiciones ya existentes. This cart cannot contain any additional cuts! - - ALBUM - - LABEL - ETIQUETA + ETIQUETA Log Locked @@ -1300,5 +1398,37 @@ sólo podrás editar transiciones ya existentes. Talk + + Trans + + + + Cart + Cartucho + + + Group + + + + Length + + + + Title + Título + + + Artist + Artista + + + Album + + + + Label + Etiqueta + diff --git a/rdlogedit/rdlogedit_fr.ts b/rdlogedit/rdlogedit_fr.ts index df81142f..b92d3ea7 100644 --- a/rdlogedit/rdlogedit_fr.ts +++ b/rdlogedit/rdlogedit_fr.ts @@ -1,4 +1,6 @@ - + + + AddMeta @@ -147,58 +149,6 @@ End Date Enabled - - TIME - - - - TRANS - - - - CART - - - - GROUP - - - - LENGTH - - - - TITLE - - - - ARTIST - - - - CLIENT - - - - AGENCY - - - - LABEL - - - - SOURCE - - - - LINE ID - - - - COUNT - - Insert Cart @@ -379,10 +329,6 @@ for the selected service! Unable to save log, audio deletion error! - - EXT DATA - - Link Start @@ -415,6 +361,62 @@ for the selected service! Log already being edited by + + Time + + + + Trans + + + + Cart + + + + Group + + + + Length + + + + Title + + + + Artist + + + + Client + + + + Agency + + + + Label + + + + Source + + + + Ext Data + + + + Line ID + + + + Count + + EditLogLine @@ -692,54 +694,6 @@ group for the specified service! MainWidget - - LOG NAME - - - - DESCRIPTION - - - - SERVICE - - - - MUSIC - - - - TRAFFIC - - - - TRACKS - - - - VALID FROM - - - - VALID TO - - - - AUTO REFRESH - - - - ORIGIN - - - - LAST LINKED - - - - LAST MODIFIED - - &Add @@ -854,6 +808,54 @@ Report Unknown command option + + Log Name + + + + Description + + + + Service + + + + Music + + + + Traffic + + + + Tracks + + + + Valid From + + + + Valid To + + + + Auto Refresh + + + + Origin + + + + Last Linked + + + + Last Modified + + RenderDialog @@ -1014,34 +1016,6 @@ Track - - TIME - - - - TRANS - - - - CART - - - - GROUP - - - - LENGTH - - - - TITLE - - - - ARTIST - - Do Over @@ -1169,14 +1143,6 @@ therefore only existing transitions will be editable. This cart cannot contain any additional cuts! - - ALBUM - - - - LABEL - - Log Locked @@ -1189,5 +1155,37 @@ therefore only existing transitions will be editable. Talk + + Trans + + + + Cart + + + + Group + + + + Length + + + + Title + + + + Artist + + + + Album + + + + Label + + diff --git a/rdlogedit/rdlogedit_nb.ts b/rdlogedit/rdlogedit_nb.ts index e714e7b6..23a621bb 100644 --- a/rdlogedit/rdlogedit_nb.ts +++ b/rdlogedit/rdlogedit_nb.ts @@ -1,4 +1,6 @@ - + + + AddMeta @@ -153,55 +155,55 @@ TIME - TID + TID TRANS - OVERG + OVERG CART - KORG + KORG GROUP - GRUPPE + GRUPPE LENGTH - LENGD + LENGD TITLE - TITTEL + TITTEL ARTIST - ARTIST + ARTIST CLIENT - KLIENT + KLIENT AGENCY - AGENT + AGENT LABEL - SELSKAP + SELSKAP SOURCE - KJELDE + KJELDE LINE ID - LINE-ID + LINE-ID COUNT - TELLING + TELLING Insert @@ -408,10 +410,6 @@ skrudd av for denne tenesta! Unable to save log, audio deletion error! - - EXT DATA - - Link Start @@ -448,6 +446,62 @@ skrudd av for denne tenesta! Log already being edited by + + Time + + + + Trans + + + + Cart + Korg + + + Group + + + + Length + + + + Title + Tittel + + + Artist + Artist + + + Client + + + + Agency + + + + Label + Selskap + + + Source + + + + Ext Data + + + + Line ID + + + + Count + + EditLogLine @@ -791,51 +845,51 @@ som er skrudd av for denne tenesta! LOG NAME - LOGGNAMN + LOGGNAMN DESCRIPTION - SKILDRING + SKILDRING SERVICE - TENEST + TENEST MUSIC - MUSIKK + MUSIKK TRAFFIC - TRAFIKK + TRAFIKK TRACKS - SPOR + SPOR VALID FROM - GYLDIG FRÅ + GYLDIG FRÅ VALID TO - GYLDIG TIL + GYLDIG TIL AUTO REFRESH - AUTO-OPPDATER + AUTO-OPPDATER ORIGIN - OPPHAV + OPPHAV LAST LINKED - SIST LENKA + SIST LENKA LAST MODIFIED - SIST ENDRA + SIST ENDRA &Add @@ -971,6 +1025,54 @@ Vil du halda fram? Unknown command option + + Log Name + Loggnamn + + + Description + + + + Service + + + + Music + Musikk + + + Traffic + Trafikk + + + Tracks + + + + Valid From + + + + Valid To + + + + Auto Refresh + + + + Origin + + + + Last Linked + + + + Last Modified + + RenderDialog @@ -1133,31 +1235,31 @@ Track TIME - TID + TID TRANS - OVERG + OVERG CART - KORG + KORG GROUP - GRUPPE + GRUPPE LENGTH - LENGD + LENGD TITLE - TITTEL + TITTEL ARTIST - ARTIST + ARTIST Do Over @@ -1286,13 +1388,9 @@ therefore only existing transitions will be editable. This cart cannot contain any additional cuts! - - ALBUM - - LABEL - SELSKAP + SELSKAP Log Locked @@ -1306,5 +1404,37 @@ therefore only existing transitions will be editable. Talk + + Trans + + + + Cart + Korg + + + Group + + + + Length + + + + Title + Tittel + + + Artist + Artist + + + Album + + + + Label + Selskap + diff --git a/rdlogedit/rdlogedit_nn.ts b/rdlogedit/rdlogedit_nn.ts index e714e7b6..23a621bb 100644 --- a/rdlogedit/rdlogedit_nn.ts +++ b/rdlogedit/rdlogedit_nn.ts @@ -1,4 +1,6 @@ - + + + AddMeta @@ -153,55 +155,55 @@ TIME - TID + TID TRANS - OVERG + OVERG CART - KORG + KORG GROUP - GRUPPE + GRUPPE LENGTH - LENGD + LENGD TITLE - TITTEL + TITTEL ARTIST - ARTIST + ARTIST CLIENT - KLIENT + KLIENT AGENCY - AGENT + AGENT LABEL - SELSKAP + SELSKAP SOURCE - KJELDE + KJELDE LINE ID - LINE-ID + LINE-ID COUNT - TELLING + TELLING Insert @@ -408,10 +410,6 @@ skrudd av for denne tenesta! Unable to save log, audio deletion error! - - EXT DATA - - Link Start @@ -448,6 +446,62 @@ skrudd av for denne tenesta! Log already being edited by + + Time + + + + Trans + + + + Cart + Korg + + + Group + + + + Length + + + + Title + Tittel + + + Artist + Artist + + + Client + + + + Agency + + + + Label + Selskap + + + Source + + + + Ext Data + + + + Line ID + + + + Count + + EditLogLine @@ -791,51 +845,51 @@ som er skrudd av for denne tenesta! LOG NAME - LOGGNAMN + LOGGNAMN DESCRIPTION - SKILDRING + SKILDRING SERVICE - TENEST + TENEST MUSIC - MUSIKK + MUSIKK TRAFFIC - TRAFIKK + TRAFIKK TRACKS - SPOR + SPOR VALID FROM - GYLDIG FRÅ + GYLDIG FRÅ VALID TO - GYLDIG TIL + GYLDIG TIL AUTO REFRESH - AUTO-OPPDATER + AUTO-OPPDATER ORIGIN - OPPHAV + OPPHAV LAST LINKED - SIST LENKA + SIST LENKA LAST MODIFIED - SIST ENDRA + SIST ENDRA &Add @@ -971,6 +1025,54 @@ Vil du halda fram? Unknown command option + + Log Name + Loggnamn + + + Description + + + + Service + + + + Music + Musikk + + + Traffic + Trafikk + + + Tracks + + + + Valid From + + + + Valid To + + + + Auto Refresh + + + + Origin + + + + Last Linked + + + + Last Modified + + RenderDialog @@ -1133,31 +1235,31 @@ Track TIME - TID + TID TRANS - OVERG + OVERG CART - KORG + KORG GROUP - GRUPPE + GRUPPE LENGTH - LENGD + LENGD TITLE - TITTEL + TITTEL ARTIST - ARTIST + ARTIST Do Over @@ -1286,13 +1388,9 @@ therefore only existing transitions will be editable. This cart cannot contain any additional cuts! - - ALBUM - - LABEL - SELSKAP + SELSKAP Log Locked @@ -1306,5 +1404,37 @@ therefore only existing transitions will be editable. Talk + + Trans + + + + Cart + Korg + + + Group + + + + Length + + + + Title + Tittel + + + Artist + Artist + + + Album + + + + Label + Selskap + diff --git a/rdlogedit/rdlogedit_pt_BR.ts b/rdlogedit/rdlogedit_pt_BR.ts index 2996232b..3c899423 100644 --- a/rdlogedit/rdlogedit_pt_BR.ts +++ b/rdlogedit/rdlogedit_pt_BR.ts @@ -1,4 +1,6 @@ - + + + AddMeta @@ -170,55 +172,55 @@ Ação se Evento anterior estiver sendo executado TIME - HORA + HORA TRANS - TRANS + TRANS CART - CARTÃO + CARTÃO GROUP - GRUPO + GRUPO LENGTH - DURAÇÃO + DURAÇÃO TITLE - TÍTULO + TÍTULO ARTIST - ARTISTA + ARTISTA CLIENT - CLIENTE + CLIENTE AGENCY - AGÊNCIA + AGÊNCIA LABEL - SELO + SELO SOURCE - FONTE + FONTE LINE ID - ID DE LINHA + ID DE LINHA COUNT - CONTADOR + CONTADOR Insert @@ -403,10 +405,6 @@ para o serviço selecionado! Unable to save log, audio deletion error! - - EXT DATA - - Link Start @@ -417,7 +415,7 @@ para o serviço selecionado! Save - + Salvar As @@ -443,6 +441,62 @@ para o serviço selecionado! Log already being edited by + + Time + Tempo + + + Trans + + + + Cart + Cartão + + + Group + + + + Length + + + + Title + Título + + + Artist + Artista + + + Client + + + + Agency + + + + Label + Selo + + + Source + + + + Ext Data + + + + Line ID + + + + Count + + EditLogLine @@ -771,51 +825,51 @@ Ação se Evento anterior estiver sendo executado LOG NAME - NOME DA LISTA + NOME DA LISTA DESCRIPTION - DESCRIÇÃO + DESCRIÇÃO SERVICE - SERVIÇO + SERVIÇO MUSIC - MÚSICAS + MÚSICAS TRAFFIC - TRÁFEGO + TRÁFEGO TRACKS - FAIXAS + FAIXAS VALID FROM - VÁLIDO A PARTIR DE + VÁLIDO A PARTIR DE VALID TO - VÁLIDO ATÉ + VÁLIDO ATÉ AUTO REFRESH - AUTO ATUALIZAÇÃO + AUTO ATUALIZAÇÃO ORIGIN - ORIGEM + ORIGEM LAST LINKED - ÚLTIMO LINKADO + ÚLTIMO LINKADO LAST MODIFIED - ÚLTIMO MODIFICADO + ÚLTIMO MODIFICADO &Add @@ -950,6 +1004,54 @@ Continuar? Unknown command option + + Log Name + Nome da Lista + + + Description + + + + Service + + + + Music + Músicas + + + Traffic + Tráfego + + + Tracks + Faixas + + + Valid From + + + + Valid To + + + + Auto Refresh + + + + Origin + + + + Last Linked + + + + Last Modified + + RenderDialog @@ -1110,31 +1212,31 @@ Faixa TIME - HORA + HORA TRANS - TRANS + TRANS CART - CARTÃO + CARTÃO GROUP - GRUPO + GRUPO LENGTH - DURAÇÃO + DURAÇÃO TITLE - TÍTULO + TÍTULO ARTIST - ARTISTA + ARTISTA Do Over @@ -1272,13 +1374,9 @@ Assim sendo, somente transições existentes serão editáveis. This cart cannot contain any additional cuts! - - ALBUM - - LABEL - SELO + SELO Log Locked @@ -1292,5 +1390,37 @@ Assim sendo, somente transições existentes serão editáveis. Talk + + Trans + + + + Cart + Cartão + + + Group + + + + Length + + + + Title + Título + + + Artist + Artista + + + Album + + + + Label + Selo + diff --git a/rdlogedit/render_dialog.cpp b/rdlogedit/render_dialog.cpp index d1341f59..4e4a384b 100644 --- a/rdlogedit/render_dialog.cpp +++ b/rdlogedit/render_dialog.cpp @@ -24,10 +24,14 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -65,7 +69,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, // Dialogs // render_progress_dialog= - new QProgressDialog(tr("Rendering Log..."),tr("Cancel"),0,this,"",true); + new Q3ProgressDialog(tr("Rendering Log..."),tr("Cancel"),0,this,"",true); render_progress_dialog->setCaption("RDLogEdit - "+tr("Render Progress")); // @@ -128,7 +132,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config, render_starttime_label=new QLabel(tr("Virtual Start Time")+":",this); render_starttime_label->setFont(button_font); render_starttime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - render_starttime_edit=new QTimeEdit(this); + render_starttime_edit=new Q3TimeEdit(this); render_starttime_edit->setDisabled(true); // @@ -225,7 +229,7 @@ void RenderDialog::selectData() { if(render_to_box->currentItem()) { QString filename= - QFileDialog::getSaveFileName(render_save_path,RD_AUDIO_FILE_FILTER, + Q3FileDialog::getSaveFileName(render_save_path,RD_AUDIO_FILE_FILTER, this,"","RDLogEdit - "+tr("Render Log")); if(!filename.isEmpty()) { render_filename_edit->setText(filename); diff --git a/rdlogedit/render_dialog.h b/rdlogedit/render_dialog.h index da0d361a..9ca97809 100644 --- a/rdlogedit/render_dialog.h +++ b/rdlogedit/render_dialog.h @@ -23,11 +23,14 @@ #include #include -#include +#include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -78,14 +81,14 @@ class RenderDialog : public QDialog int render_first_line; int render_last_line; RDSettings *render_settings; - QProgressDialog *render_progress_dialog; + Q3ProgressDialog *render_progress_dialog; QLabel *render_to_label; QComboBox *render_to_box; QLabel *render_filename_label; QLineEdit *render_filename_edit; QLabel *render_starttime_label; QComboBox *render_starttime_box; - QTimeEdit *render_starttime_edit; + Q3TimeEdit *render_starttime_edit; QLabel *render_audiosettings_label; QLineEdit *render_audiosettings_edit; QPushButton *render_audiosettings_button; diff --git a/rdlogedit/voice_tracker.cpp b/rdlogedit/voice_tracker.cpp index 23bba88d..4437c227 100644 --- a/rdlogedit/voice_tracker.cpp +++ b/rdlogedit/voice_tracker.cpp @@ -27,6 +27,15 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -261,7 +270,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, // // Right-Click Menu // - track_menu=new QPopupMenu(this,"track_menu"); + track_menu=new Q3PopupMenu(this,"track_menu"); connect(track_menu,SIGNAL(aboutToShow()),this,SLOT(updateMenuData())); connect(track_menu,SIGNAL(aboutToHide()),this,SLOT(hideMenuData())); track_menu-> @@ -358,7 +367,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, track_stop_button=new RDTransportButton(RDTransportButton::Stop,this); track_stop_button->setGeometry(110,265,80,50); track_stop_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); - track_stop_button->setOnColor(red); + track_stop_button->setOnColor(Qt::red); track_stop_button->on(); connect(track_stop_button,SIGNAL(clicked()),this,SLOT(stopData())); @@ -378,7 +387,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, edit_length_label=new QLabel(this); edit_length_label->setText("-:--:--.-"); edit_length_label->setGeometry(565,255,110,25); - edit_length_label->setAlignment(AlignCenter); + edit_length_label->setAlignment(Qt::AlignCenter); edit_length_label->setFont(timer_font); // @@ -392,7 +401,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, edit_tracks_remaining_label=new QLabel(this); edit_tracks_remaining_label->setText("0"); edit_tracks_remaining_label->setGeometry(565,313,40,18); - edit_tracks_remaining_label->setAlignment(AlignCenter); + edit_tracks_remaining_label->setAlignment(Qt::AlignCenter); edit_tracks_remaining_label->setFont(label_font); label=new QLabel(tr("Tracks"),this); label->setGeometry(565,300,40,14); @@ -403,14 +412,14 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, edit_time_remaining_label=new QLabel(this); edit_time_remaining_label->setText("0:00:00.0"); edit_time_remaining_label->setGeometry(615,313,60,18); - edit_time_remaining_label->setAlignment(AlignCenter); + edit_time_remaining_label->setAlignment(Qt::AlignCenter); edit_time_remaining_label->setFont(label_font); edit_time_remaining_palette[0]=edit_time_remaining_label->palette(); edit_time_remaining_palette[1]=edit_time_remaining_label->palette(); edit_time_remaining_palette[1]. - setColor(QPalette::Active,QColorGroup::Foreground,red); + setColor(QPalette::Active,QColorGroup::Foreground,Qt::red); edit_time_remaining_palette[1]. - setColor(QPalette::Inactive,QColorGroup::Foreground,red); + setColor(QPalette::Inactive,QColorGroup::Foreground,Qt::red); label=new QLabel(tr("Time"),this); label->setGeometry(615,300,60,14); label->setFont(small_font); @@ -425,30 +434,30 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, setGeometry(10,335,sizeHint().width()-120,sizeHint().height()-405); track_log_list->setAllColumnsShowFocus(true); track_log_list->setItemMargin(5); - connect(track_log_list,SIGNAL(clicked(QListViewItem *,const QPoint &,int)), - this,SLOT(logClickedData(QListViewItem *,const QPoint &,int))); + connect(track_log_list,SIGNAL(clicked(Q3ListViewItem *,const QPoint &,int)), + this,SLOT(logClickedData(Q3ListViewItem *,const QPoint &,int))); connect(track_log_list,SIGNAL(transitionChanged(int,RDLogLine::TransType)), this,SLOT(transitionChangedData(int,RDLogLine::TransType))); track_log_list->addColumn(tr(" ")); - track_log_list->setColumnAlignment(0,AlignCenter); - track_log_list->addColumn(tr("TIME")); - track_log_list->setColumnAlignment(1,AlignCenter); - track_log_list->addColumn(tr("TRANS")); - track_log_list->setColumnAlignment(2,AlignCenter); - track_log_list->addColumn(tr("CART")); - track_log_list->setColumnAlignment(3,AlignCenter); - track_log_list->addColumn(tr("GROUP")); - track_log_list->setColumnAlignment(4,AlignCenter); - track_log_list->addColumn(tr("LENGTH")); - track_log_list->setColumnAlignment(5,AlignRight); - track_log_list->addColumn(tr("TITLE")); - track_log_list->setColumnAlignment(6,AlignLeft); - track_log_list->addColumn(tr("ARTIST")); - track_log_list->setColumnAlignment(7,AlignLeft); - track_log_list->addColumn(tr("ALBUM")); - track_log_list->setColumnAlignment(8,AlignLeft); - track_log_list->addColumn(tr("LABEL")); - track_log_list->setColumnAlignment(9,AlignLeft); + track_log_list->setColumnAlignment(0,Qt::AlignCenter); + track_log_list->addColumn(tr("Time")); + track_log_list->setColumnAlignment(1,Qt::AlignCenter); + track_log_list->addColumn(tr("Trans")); + track_log_list->setColumnAlignment(2,Qt::AlignCenter); + track_log_list->addColumn(tr("Cart")); + track_log_list->setColumnAlignment(3,Qt::AlignCenter); + track_log_list->addColumn(tr("Group")); + track_log_list->setColumnAlignment(4,Qt::AlignCenter); + track_log_list->addColumn(tr("Length")); + track_log_list->setColumnAlignment(5,Qt::AlignRight); + track_log_list->addColumn(tr("Title")); + track_log_list->setColumnAlignment(6,Qt::AlignLeft); + track_log_list->addColumn(tr("Artist")); + track_log_list->setColumnAlignment(7,Qt::AlignLeft); + track_log_list->addColumn(tr("Album")); + track_log_list->setColumnAlignment(8,Qt::AlignLeft); + track_log_list->addColumn(tr("Label")); + track_log_list->setColumnAlignment(9,Qt::AlignLeft); for(int i=0;icolumns();i++) { track_log_list->setColumnSortType(i,RDListView::LineSort); } @@ -1726,8 +1735,8 @@ void VoiceTracker::positionData(int id,int msecs) track_redraw_count=0; } QPainter *p=new QPainter(this); - p->setPen(black); - p->setBrush(black); + p->setPen(Qt::black); + p->setBrush(Qt::black); ClearCursor(p); int x=-1; if(msecs>=0) { @@ -1736,8 +1745,7 @@ void VoiceTracker::positionData(int id,int msecs) x=(int)(((double)(msecs-edit_wave_origin[id]))* ((double)(edit_wave_map[id]->size().width()))/ ((double)TRACKER_START_WIDTH))+10; - p->moveTo(x,10); - p->lineTo(x,248); + p->drawLine(x,10,x,248); if(x>edit_scroll_threshold) { edit_scrolling=true; } @@ -1785,7 +1793,7 @@ void VoiceTracker::segueStartData(int id) } -void VoiceTracker::logClickedData(QListViewItem *item,const QPoint &pt, +void VoiceTracker::logClickedData(Q3ListViewItem *item,const QPoint &pt, int col) { CheckChanges(); @@ -2013,9 +2021,9 @@ void VoiceTracker::paintEvent(QPaintEvent *e) if(track_line<0) { p=new QPainter(); for(int i=0;i<3;i++) { - p->begin(edit_wave_map[i],""); + p->begin(edit_wave_map[i]); p->setPen(TRACKER_TEXT_COLOR); - p->setBackgroundColor(gray); + p->setBackgroundColor(Qt::gray); p->eraseRect(0,0,edit_wave_map[i]->size().width(), edit_wave_map[i]->size().height()); p->end(); @@ -2024,59 +2032,64 @@ void VoiceTracker::paintEvent(QPaintEvent *e) } p=new QPainter(this); - p->setPen(black); + p->setPen(Qt::black); p->fillRect(TRACKER_X_ORIGIN,TRACKER_Y_ORIGIN,TRACKER_X_WIDTH-1-2,238, - white); + Qt::white); p->fillRect(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1, TRACKER_X_WIDTH+2,TRACKER_Y_HEIGHT+6,colorGroup().mid()); - p->moveTo(TRACKER_X_ORIGIN-2,TRACKER_Y_ORIGIN-2); - p->lineTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1,TRACKER_Y_ORIGIN-2); - p->moveTo(TRACKER_X_ORIGIN-1,TRACKER_Y_ORIGIN-1); - p->lineTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN,TRACKER_Y_ORIGIN-1); + p->drawLine(TRACKER_X_ORIGIN-2,TRACKER_Y_ORIGIN-2, + TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1,TRACKER_Y_ORIGIN-2); + p->drawLine(TRACKER_X_ORIGIN-1,TRACKER_Y_ORIGIN-1, + TRACKER_X_WIDTH+TRACKER_X_ORIGIN,TRACKER_Y_ORIGIN-1); - p->moveTo(TRACKER_X_ORIGIN-2,TRACKER_Y_ORIGIN-2); - p->lineTo(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); - p->moveTo(TRACKER_X_ORIGIN-1,TRACKER_Y_ORIGIN-1); - p->lineTo(TRACKER_X_ORIGIN-1,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-2); + p->drawLine(TRACKER_X_ORIGIN-2,TRACKER_Y_ORIGIN-2, + TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); + p->drawLine(TRACKER_X_ORIGIN-1,TRACKER_Y_ORIGIN-1, + TRACKER_X_ORIGIN-1,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-2); - p->moveTo(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-2); - p->lineTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1, - TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-2); - p->moveTo(TRACKER_X_ORIGIN+TRACKER_X_ORIGIN-1, - TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); - p->lineTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN, - TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); + p->drawLine(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-2, + TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1, + TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-2); + p->drawLine(TRACKER_X_ORIGIN+TRACKER_X_ORIGIN-1, + TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1, + TRACKER_X_WIDTH+TRACKER_X_ORIGIN, + TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); - p->moveTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN,TRACKER_Y_ORIGIN-2); - p->lineTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN, - TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); - p->moveTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1,TRACKER_Y_ORIGIN-1); - p->lineTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1, - TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-2); + p->drawLine(TRACKER_X_WIDTH+TRACKER_X_ORIGIN,TRACKER_Y_ORIGIN-2, + TRACKER_X_WIDTH+TRACKER_X_ORIGIN, + TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); + p->drawLine(TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1,TRACKER_Y_ORIGIN-1, + TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1, + TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-2); - p->moveTo(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT+TRACKER_Y_ORIGIN-2); - p->lineTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1, - TRACKER_Y_HEIGHT+TRACKER_Y_ORIGIN-2); - p->moveTo(TRACKER_X_ORIGIN-1,TRACKER_Y_HEIGHT+TRACKER_Y_ORIGIN-1); - p->lineTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1, - TRACKER_Y_HEIGHT+TRACKER_Y_ORIGIN-1); + p->drawLine(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT+TRACKER_Y_ORIGIN-2, + TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1, + TRACKER_Y_HEIGHT+TRACKER_Y_ORIGIN-2); + p->drawLine(TRACKER_X_ORIGIN-1,TRACKER_Y_HEIGHT+TRACKER_Y_ORIGIN-1, + TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1, + TRACKER_Y_HEIGHT+TRACKER_Y_ORIGIN-1); - p->moveTo(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*2+TRACKER_Y_ORIGIN-2); - p->lineTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN, - TRACKER_Y_HEIGHT*2+TRACKER_Y_ORIGIN-2); - p->moveTo(TRACKER_X_ORIGIN-1,TRACKER_Y_HEIGHT*2+TRACKER_Y_ORIGIN-1); - p->lineTo(TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1, - TRACKER_Y_HEIGHT*2+TRACKER_Y_ORIGIN-1); + p->drawLine(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*2+TRACKER_Y_ORIGIN-2, + TRACKER_X_WIDTH+TRACKER_X_ORIGIN, + TRACKER_Y_HEIGHT*2+TRACKER_Y_ORIGIN-2); + p->drawLine(TRACKER_X_ORIGIN-1,TRACKER_Y_HEIGHT*2+TRACKER_Y_ORIGIN-1, + TRACKER_X_WIDTH+TRACKER_X_ORIGIN-1, + TRACKER_Y_HEIGHT*2+TRACKER_Y_ORIGIN-1); - p->moveTo(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); - p->lineTo(TRACKER_X_WIDTH-1+TRACKER_X_ORIGIN+1, - TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); - p->lineTo(TRACKER_X_WIDTH-1+TRACKER_X_ORIGIN+1, - TRACKER_Y_HEIGHT*4+TRACKER_Y_ORIGIN-5+10); - p->lineTo(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*4+TRACKER_Y_ORIGIN-5+10); - p->lineTo(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); + p->drawLine(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1, + TRACKER_X_WIDTH-1+TRACKER_X_ORIGIN+1, + TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); + p->drawLine(TRACKER_X_WIDTH-1+TRACKER_X_ORIGIN+1, + TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1, + TRACKER_X_WIDTH-1+TRACKER_X_ORIGIN+1, + TRACKER_Y_HEIGHT*4+TRACKER_Y_ORIGIN-5+10); + p->drawLine(TRACKER_X_WIDTH-1+TRACKER_X_ORIGIN+1, + TRACKER_Y_HEIGHT*4+TRACKER_Y_ORIGIN-5+10,TRACKER_X_ORIGIN-2, + TRACKER_Y_HEIGHT*4+TRACKER_Y_ORIGIN-5+10); + p->drawLine(TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*4+TRACKER_Y_ORIGIN-5+10, + TRACKER_X_ORIGIN-2,TRACKER_Y_HEIGHT*3+TRACKER_Y_ORIGIN-1); WriteTrackMap(0); WriteTrackMap(1); @@ -2092,11 +2105,11 @@ void VoiceTracker::mousePressEvent(QMouseEvent *e) return; } switch(e->button()) { - case QMouseEvent::LeftButton: + case Qt::LeftButton: edit_current_track=GetClick(e,edit_previous_point); break; - case QMouseEvent::RightButton: + case Qt::RightButton: edit_rightclick_track=GetClick(e,edit_previous_point); edit_rightclick_pos=edit_previous_point->x(); if(edit_rightclick_track>=0) { @@ -2116,7 +2129,7 @@ void VoiceTracker::mousePressEvent(QMouseEvent *e) void VoiceTracker::mouseReleaseEvent(QMouseEvent *e) { switch(e->button()) { - case QMouseEvent::LeftButton: + case Qt::LeftButton: if(edit_current_track>=0) { track_meter->setLeftPeakBar(-10000); track_meter->setRightPeakBar(-10000); @@ -2124,11 +2137,11 @@ void VoiceTracker::mouseReleaseEvent(QMouseEvent *e) edit_current_track=-1; break; - case QMouseEvent::RightButton: + case Qt::RightButton: edit_rightclick_track=-1; break; - case QMouseEvent::MidButton: + case Qt::MidButton: if(e->y()startPoint())/TRACKER_MSECS_PER_PIXEL)+250); } @@ -3062,7 +3075,7 @@ void VoiceTracker::DrawTrackMap(int trackno) case 0: if(edit_wave_name[0].isEmpty()) { p=new QPainter(edit_wave_map[0]); - p->setBackgroundColor(gray); + p->setBackgroundColor(Qt::gray); p->eraseRect(0,0,edit_wave_map[0]->size().width(), edit_wave_map[0]->size().height()); p->end(); @@ -3079,7 +3092,7 @@ void VoiceTracker::DrawTrackMap(int trackno) wpg[0]->drawWaveByMsecs(0,edit_wave_map[0]->width(), edit_wave_origin[0], edit_wave_origin[0]+edit_wave_width,800, - RDWavePainter::Mono,black, + RDWavePainter::Mono,Qt::black, edit_logline[0]-> startPoint(RDLogLine::CartPointer), edit_logline[0]-> @@ -3159,7 +3172,7 @@ void VoiceTracker::DrawTrackMap(int trackno) p->drawText(5,14,edit_logline[1]->markerComment()); } else { - p->setBackgroundColor(gray); + p->setBackgroundColor(Qt::gray); p->eraseRect(0,0,edit_wave_map[1]->size().width(), edit_wave_map[1]->size().height()); } @@ -3177,7 +3190,7 @@ void VoiceTracker::DrawTrackMap(int trackno) back_color=backgroundColor(); } else { - back_color=lightGray; + back_color=Qt::lightGray; } switch(edit_deck_state) { case VoiceTracker::DeckTrack2: @@ -3216,7 +3229,7 @@ void VoiceTracker::DrawTrackMap(int trackno) wpg[1]->drawWaveByMsecs(0,edit_wave_map[1]->width(), edit_wave_origin[1], edit_wave_origin[1]+edit_wave_width,800, - RDWavePainter::Mono,black, + RDWavePainter::Mono,Qt::black, edit_logline[1]-> startPoint(RDLogLine::CartPointer), edit_logline[1]-> @@ -3304,7 +3317,7 @@ void VoiceTracker::DrawTrackMap(int trackno) case 2: if(edit_wave_name[2].isEmpty()) { p=new QPainter(edit_wave_map[2]); - p->setBackgroundColor(gray); + p->setBackgroundColor(Qt::gray); p->eraseRect(0,0,edit_wave_map[2]->size().width(), edit_wave_map[2]->size().height()); p->end(); @@ -3315,7 +3328,7 @@ void VoiceTracker::DrawTrackMap(int trackno) back_color=backgroundColor(); } else { - back_color=lightGray; + back_color=Qt::lightGray; } wpg[2]->begin(edit_wave_map[2]); wpg[2]->setFont(QFont("Helvetica",12,QFont::Bold)); @@ -3326,7 +3339,7 @@ void VoiceTracker::DrawTrackMap(int trackno) wpg[2]->drawWaveByMsecs(0,edit_wave_map[2]->width(), edit_wave_origin[2], edit_wave_origin[2]+edit_wave_width,800, - RDWavePainter::Mono,black, + RDWavePainter::Mono,Qt::black, edit_logline[2]->startPoint(RDLogLine::CartPointer), edit_logline[2]->endPoint(RDLogLine::CartPointer)); @@ -3440,13 +3453,12 @@ void VoiceTracker::DrawCursor(RDWavePainter *wp,int height,int xpos, { wp->setPen(color); wp->setBrush(color); - wp->moveTo(xpos,0); - wp->lineTo(xpos,height); + wp->drawLine(xpos,0,xpos,height); int arrow_x=8; if(left_arrow) { arrow_x=-8; } - QPointArray *pa=new QPointArray(3); + Q3PointArray *pa=new Q3PointArray(3); pa->setPoint(0,xpos,arrow_offset); pa->setPoint(1,xpos+arrow_x,arrow_offset-5); pa->setPoint(2,xpos+arrow_x,arrow_offset+5); @@ -3462,7 +3474,9 @@ void VoiceTracker::DrawCursor(RDWavePainter *wp,int height,int xpos, void VoiceTracker::DrawRubberBand(RDWavePainter *wp,int trackno) { int xpos=0; + int xstart=0; int ypos=0; + int ystart=0; wp->setPen(TRACKER_RUBBERBAND_COLOR); wp->setBrush(TRACKER_RUBBERBAND_COLOR); @@ -3535,9 +3549,9 @@ void VoiceTracker::DrawRubberBand(RDWavePainter *wp,int trackno) (int)((double)draw_fadeup_gain* (1-(double)draw_duckup_gain/TRACKER_MIN_GAIN)) /TRACKER_MB_PER_PIXEL; - } - wp->moveTo(xpos,ypos); + xstart=xpos; + ystart=ypos; switch(trackno) { case 1: DrawTarget(wp,VoiceTracker::TrackFadeupGain,trackno,xpos,ypos); @@ -3564,7 +3578,7 @@ void VoiceTracker::DrawRubberBand(RDWavePainter *wp,int trackno) draw_duckup_gain/TRACKER_MB_PER_PIXEL; break; } - wp->lineTo(xpos,ypos); + wp->drawLine(xstart,ystart,xpos,ypos); switch(trackno) { case 1: DrawTarget(wp,VoiceTracker::TrackFadeupPoint,trackno,xpos,ypos); @@ -3580,16 +3594,18 @@ void VoiceTracker::DrawRubberBand(RDWavePainter *wp,int trackno) // xpos=(edit_logline[trackno]->fadeupPoint()- edit_wave_origin[trackno])/TRACKER_MSECS_PER_PIXEL; - wp->moveTo(xpos,ypos); - if(draw_fadedown_point>= - edit_logline[trackno]->fadeupPoint()) + xstart=xpos; + ystart=ypos; + if(draw_fadedown_point>=edit_logline[trackno]->fadeupPoint()) xpos=(draw_fadedown_point- edit_wave_origin[trackno])/TRACKER_MSECS_PER_PIXEL; else xpos=(draw_end_point- edit_wave_origin[trackno])/TRACKER_MSECS_PER_PIXEL; - wp->lineTo(xpos,ypos); + wp->drawLine(xstart,ystart,xpos,ypos); + xstart=xpos; + ystart=ypos; // // Fade Down @@ -3618,7 +3634,7 @@ void VoiceTracker::DrawRubberBand(RDWavePainter *wp,int trackno) (1-(double)draw_duckdown_gain/TRACKER_MIN_GAIN)) /TRACKER_MB_PER_PIXEL; } - wp->lineTo(xpos,ypos); + wp->drawLine(xstart,ystart,xpos,ypos); switch(trackno) { case 0: DrawTarget(wp,VoiceTracker::FadedownGain,trackno,xpos,ypos); diff --git a/rdlogedit/voice_tracker.h b/rdlogedit/voice_tracker.h index 6566c8db..1bd1902e 100644 --- a/rdlogedit/voice_tracker.h +++ b/rdlogedit/voice_tracker.h @@ -22,7 +22,7 @@ #define VOICE_TRACKER_H #include -#include +#include #include #include #include @@ -32,7 +32,12 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -53,13 +58,13 @@ // // Widget Settings // -#define TRACKER_TEXT_COLOR red -#define TRACKER_RUBBERBAND_COLOR "#008000" -#define TRACKER_RECORD_COLOR green -#define TRACKER_RECORD_BUTTON_COLOR red -#define TRACKER_START_BUTTON_COLOR green -#define TRACKER_ABORT_BUTTON_COLOR red -#define TRACKER_DONE_BUTTON_COLOR blue +#define TRACKER_TEXT_COLOR Qt::red +#define TRACKER_RUBBERBAND_COLOR QColor("#008000") +#define TRACKER_RECORD_COLOR Qt::green +#define TRACKER_RECORD_BUTTON_COLOR Qt::red +#define TRACKER_START_BUTTON_COLOR Qt::green +#define TRACKER_ABORT_BUTTON_COLOR Qt::red +#define TRACKER_DONE_BUTTON_COLOR Qt::blue #define TRACKER_START_WIDTH 19633 #define TRACKER_MSECS_PER_PIXEL 29 //#define TRACKER_MB_PER_PIXEL 141 @@ -115,7 +120,7 @@ class VoiceTracker : public QDialog void stateChangedData(int id,RDPlayDeck::State state); void positionData(int id,int msecs); void segueStartData(int id); - void logClickedData(QListViewItem *item,const QPoint &pt,int col); + void logClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void transitionChangedData(int line,RDLogLine::TransType trans); void meterData(); void recordLoadedData(int card,int stream); @@ -278,7 +283,7 @@ class VoiceTracker : public QDialog QPalette track_record_palette; QPalette track_done_palette; QPalette track_abort_palette; - QPopupMenu *track_menu; + Q3PopupMenu *track_menu; int menu_clicked_point; QString *edit_import_path; RDSettings *edit_settings; diff --git a/rdlogin/Makefile.am b/rdlogin/Makefile.am index dbdc3414..b16c11b6 100644 --- a/rdlogin/Makefile.am +++ b/rdlogin/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/rdlogin -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +18,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,8 +35,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogin_*.qm all: - @QT_BIN@/lupdate rdlogin.pro - @QT_BIN@/lrelease rdlogin.pro + lupdate-qt4 rdlogin.pro + lrelease-qt4 rdlogin.pro bin_PROGRAMS = rdlogin @@ -46,7 +44,7 @@ dist_rdlogin_SOURCES = rdlogin.cpp rdlogin.h nodist_rdlogin_SOURCES = moc_rdlogin.cpp -rdlogin_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdlogin_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdlogin.pro\ rdlogin_cs.ts\ diff --git a/rdlogin/rdlogin.cpp b/rdlogin/rdlogin.cpp index cb0f81e7..0a0b6675 100644 --- a/rdlogin/rdlogin.cpp +++ b/rdlogin/rdlogin.cpp @@ -29,6 +29,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -123,7 +126,7 @@ MainWidget::MainWidget(QWidget *parent) // login_label=new QLabel(this); login_label->setFont(label_font); - login_label->setAlignment(AlignCenter); + login_label->setAlignment(Qt::AlignCenter); login_label->setText(tr("Current User: unknown")); // @@ -149,7 +152,7 @@ MainWidget::MainWidget(QWidget *parent) } login_username_label=new QLabel(login_username_box,tr("&Username:"),this); login_username_label->setFont(small_label_font); - login_username_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + login_username_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); if(rda->system()->showUserList()) { login_username_edit->hide(); } @@ -165,7 +168,7 @@ MainWidget::MainWidget(QWidget *parent) login_password_edit->setEchoMode(QLineEdit::Password); login_password_label=new QLabel(login_password_edit,tr("&Password:"),this); login_password_label->setFont(small_label_font); - login_password_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + login_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); connect(login_password_edit,SIGNAL(returnPressed()),this,SLOT(loginData())); // @@ -311,7 +314,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(), + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(), "."); a.installTranslator(&qt); diff --git a/rdlogin/rdlogin.h b/rdlogin/rdlogin.h index 9c132cc5..5c7ae78e 100644 --- a/rdlogin/rdlogin.h +++ b/rdlogin/rdlogin.h @@ -29,6 +29,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #define RDLOGIN_USAGE "\n" diff --git a/rdlogin/rdlogin_cs.ts b/rdlogin/rdlogin_cs.ts index f8fd2569..6a3724f0 100644 --- a/rdlogin/rdlogin_cs.ts +++ b/rdlogin/rdlogin_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_de.ts b/rdlogin/rdlogin_de.ts index 222675e0..952f883f 100644 --- a/rdlogin/rdlogin_de.ts +++ b/rdlogin/rdlogin_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_es.ts b/rdlogin/rdlogin_es.ts index cb7910b9..f109852b 100644 --- a/rdlogin/rdlogin_es.ts +++ b/rdlogin/rdlogin_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_fr.ts b/rdlogin/rdlogin_fr.ts index ef85a9a6..a67f1de0 100644 --- a/rdlogin/rdlogin_fr.ts +++ b/rdlogin/rdlogin_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_nb.ts b/rdlogin/rdlogin_nb.ts index 06652e03..ed52d5ee 100644 --- a/rdlogin/rdlogin_nb.ts +++ b/rdlogin/rdlogin_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_nn.ts b/rdlogin/rdlogin_nn.ts index 06652e03..ed52d5ee 100644 --- a/rdlogin/rdlogin_nn.ts +++ b/rdlogin/rdlogin_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_pt_BR.ts b/rdlogin/rdlogin_pt_BR.ts index a080b9c5..6181feb2 100644 --- a/rdlogin/rdlogin_pt_BR.ts +++ b/rdlogin/rdlogin_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogmanager/Makefile.am b/rdlogmanager/Makefile.am index 1dc2a504..d4368866 100644 --- a/rdlogmanager/Makefile.am +++ b/rdlogmanager/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/rdlogmanager -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +18,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,8 +35,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogmanager_*.qm all: - @QT_BIN@/lupdate rdlogmanager.pro - @QT_BIN@/lrelease rdlogmanager.pro + lupdate-qt4 rdlogmanager.pro + lrelease-qt4 rdlogmanager.pro bin_PROGRAMS = rdlogmanager @@ -95,7 +93,7 @@ nodist_rdlogmanager_SOURCES = moc_add_clock.cpp\ moc_svc_rec.cpp\ moc_svc_rec_dialog.cpp -rdlogmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdlogmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdlogmanager.pro\ rdlogmanager_cs.ts\ diff --git a/rdlogmanager/add_clock.cpp b/rdlogmanager/add_clock.cpp index 0a03d31f..acb1a948 100644 --- a/rdlogmanager/add_clock.cpp +++ b/rdlogmanager/add_clock.cpp @@ -21,15 +21,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include +//Added by qt3to4: +#include #include #include @@ -102,7 +104,7 @@ AddClock::AddClock(QString *logname,QWidget *parent) new QLabel(clock_name_edit,tr("&New Clock Name:"),this); clock_name_label->setGeometry(10,11,130,19); clock_name_label->setFont(font); - clock_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + clock_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/rdlogmanager/add_clock.h b/rdlogmanager/add_clock.h index dc9c037a..acebf0d0 100644 --- a/rdlogmanager/add_clock.h +++ b/rdlogmanager/add_clock.h @@ -22,12 +22,14 @@ #define ADD_CLOCK_H #include -#include -#include +#include +#include #include #include #include #include +//Added by qt3to4: +#include #include diff --git a/rdlogmanager/add_event.cpp b/rdlogmanager/add_event.cpp index 6a788ef9..d3fb1e69 100644 --- a/rdlogmanager/add_event.cpp +++ b/rdlogmanager/add_event.cpp @@ -21,15 +21,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include +//Added by qt3to4: +#include #include #include @@ -104,7 +106,7 @@ AddEvent::AddEvent(QString *logname,QWidget *parent) new QLabel(event_name_edit,tr("&New Event Name:"),this); event_name_label->setGeometry(10,11,130,19); event_name_label->setFont(font); - event_name_label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + event_name_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic); // // Ok Button diff --git a/rdlogmanager/add_event.h b/rdlogmanager/add_event.h index db687860..258e6cf4 100644 --- a/rdlogmanager/add_event.h +++ b/rdlogmanager/add_event.h @@ -22,12 +22,14 @@ #define ADD_EVENT_H #include -#include -#include +#include +#include #include #include #include #include +//Added by qt3to4: +#include #include diff --git a/rdlogmanager/clock_listview.cpp b/rdlogmanager/clock_listview.cpp index ee545328..2d407353 100644 --- a/rdlogmanager/clock_listview.cpp +++ b/rdlogmanager/clock_listview.cpp @@ -19,8 +19,11 @@ // // -#include -#include +#include +#include +//Added by qt3to4: +#include +#include #include @@ -35,7 +38,7 @@ ClockListView::ClockListView(QWidget *parent) // // Right Button Menu // - clock_menu=new QPopupMenu(this); + clock_menu=new Q3PopupMenu(this); connect(clock_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); clock_menu-> insertItem(tr("Edit Event"),this,SLOT(editEventData()),0,0); @@ -57,10 +60,10 @@ void ClockListView::editEventData() void ClockListView::contentsMousePressEvent(QMouseEvent *e) { - QListView::contentsMousePressEvent(e); + Q3ListView::contentsMousePressEvent(e); clock_menu_item=(RDListViewItem *)selectedItem(); switch(e->button()) { - case QMouseEvent::RightButton: + case Qt::RightButton: clock_menu->setGeometry(clock_parent->geometry().x()+ geometry().x()+e->pos().x()+2, clock_parent->geometry().y()+ diff --git a/rdlogmanager/clock_listview.h b/rdlogmanager/clock_listview.h index f78f9f7d..ffd3aeec 100644 --- a/rdlogmanager/clock_listview.h +++ b/rdlogmanager/clock_listview.h @@ -22,9 +22,11 @@ #ifndef CLOCK_LISTVIEW_H #define CLOCK_LISTVIEW_H -#include +#include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -47,7 +49,7 @@ class ClockListView : public RDListView void contentsMousePressEvent(QMouseEvent *e); private: - QPopupMenu *clock_menu; + Q3PopupMenu *clock_menu; RDListViewItem *clock_menu_item; QWidget *clock_parent; }; diff --git a/rdlogmanager/edit_clock.cpp b/rdlogmanager/edit_clock.cpp index bcefb05f..55763776 100644 --- a/rdlogmanager/edit_clock.cpp +++ b/rdlogmanager/edit_clock.cpp @@ -24,12 +24,17 @@ #include #include -#include +#include #include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -89,7 +94,7 @@ EditClock::EditClock(QString clockname,bool new_clock, QLabel *label=new QLabel(edit_shortname_edit,tr("Code:"),this); label->setGeometry(295,10,50,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Clock List @@ -102,14 +107,14 @@ EditClock::EditClock(QString clockname,bool new_clock, edit_clocks_list->addColumn(tr("End")); edit_clocks_list->addColumn(tr("Event")); edit_clocks_list->addColumn(tr("Length")); - edit_clocks_list->setColumnAlignment(3,AlignRight); + edit_clocks_list->setColumnAlignment(3,Qt::AlignRight); edit_clocks_list->addColumn(tr("Count")); - edit_clocks_list->setColumnAlignment(4,AlignCenter); + edit_clocks_list->setColumnAlignment(4,Qt::AlignCenter); connect(edit_clocks_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), - this,SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); - connect(edit_clocks_list,SIGNAL(selectionChanged(QListViewItem *)), - this,SLOT(selectionChangedData(QListViewItem *))); + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), + this,SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); + connect(edit_clocks_list,SIGNAL(selectionChanged(Q3ListViewItem *)), + this,SLOT(selectionChangedData(Q3ListViewItem *))); connect(edit_clocks_list,SIGNAL(editLine(int)), this,SLOT(editEventData(int))); @@ -152,13 +157,13 @@ EditClock::EditClock(QString clockname,bool new_clock, // // Remarks // - edit_remarks_edit=new QTextEdit(this); + edit_remarks_edit=new Q3TextEdit(this); edit_remarks_edit->setGeometry(10,sizeHint().height()-140,CENTER_LINE-20,130); - edit_remarks_edit->setTextFormat(QTextEdit::PlainText); + edit_remarks_edit->setTextFormat(Qt::PlainText); label=new QLabel(edit_remarks_edit,tr("Remarks"),this); label->setGeometry(15,sizeHint().height()-155,CENTER_LINE-20,15); label->setFont(bold_font); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Scheduler-Rules button @@ -265,7 +270,7 @@ QSizePolicy EditClock::sizePolicy() const } -void EditClock::selectionChangedData(QListViewItem *l) +void EditClock::selectionChangedData(Q3ListViewItem *l) { if(l==NULL) { UpdateClock(); @@ -506,7 +511,7 @@ void EditClock::saveAsData() } -void EditClock::doubleClickedData(QListViewItem *item,const QPoint &,int) +void EditClock::doubleClickedData(Q3ListViewItem *item,const QPoint &,int) { editData(); } @@ -555,17 +560,17 @@ void EditClock::cancelData() if(edit_modified) { switch(QMessageBox::question(this,tr("Clock Modified"), tr("The clock has been modified.\nDo you want to save?"),QMessageBox::Yes,QMessageBox::No,QMessageBox::Cancel)) { - case QMessageBox::Yes: - Save(); - done(0); - break; + case QMessageBox::Yes: + Save(); + done(0); + break; - case QMessageBox::No: - done(-1); - break; + case QMessageBox::No: + done(-1); + break; - case QMessageBox::NoButton: - return; + case QMessageBox::NoButton: + return; } } else { @@ -577,9 +582,8 @@ void EditClock::cancelData() void EditClock::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); - p->moveTo(CENTER_LINE,10); - p->lineTo(CENTER_LINE,sizeHint().height()-10); + p->setPen(QColor(Qt::black)); + p->drawLine(CENTER_LINE,10,CENTER_LINE,sizeHint().height()-10); p->end(); } @@ -670,8 +674,8 @@ void EditClock::UpdateClock(int line) map->fill(); QPainter *p=new QPainter(); p->begin(map); - p->setPen(QColor(black)); - p->setBrush(QColor(black)); + p->setPen(Qt::black); + p->setBrush(Qt::black); p->setFont(*edit_title_font); // diff --git a/rdlogmanager/edit_clock.h b/rdlogmanager/edit_clock.h index 0ddd0d9a..0d4e1324 100644 --- a/rdlogmanager/edit_clock.h +++ b/rdlogmanager/edit_clock.h @@ -29,7 +29,10 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include @@ -53,7 +56,7 @@ class EditClock : public QDialog QSizePolicy sizePolicy() const; private slots: - void selectionChangedData(QListViewItem *); + void selectionChangedData(Q3ListViewItem *); void addData(); void cloneData(); void editData(); @@ -64,7 +67,7 @@ class EditClock : public QDialog // void saveData(); void saveAsData(); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void colorData(); void editEventData(int line); void okData(); @@ -95,7 +98,7 @@ class EditClock : public QDialog bool edit_new_clock; std::vector *edit_new_clocks; SchedRulesList* sched_rules_list; - QTextEdit *edit_remarks_edit; + Q3TextEdit *edit_remarks_edit; }; diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp index 6b266ac6..e19ea678 100644 --- a/rdlogmanager/edit_event.cpp +++ b/rdlogmanager/edit_event.cpp @@ -24,6 +24,11 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -90,7 +95,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, QLabel *label=new QLabel(event_lib_filter_edit,tr("Filter:"),this); label->setFont(bold_font); label->setGeometry(10,10,40,14); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Group Filter @@ -102,12 +107,12 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(event_group_box,tr("Group:"),this); label->setFont(bold_font); label->setGeometry(10,30,40,18); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); // // Type Filter // - event_lib_type_group=new QButtonGroup(this); + event_lib_type_group=new Q3ButtonGroup(this); event_lib_type_group->setExclusive(true); event_lib_type_group->hide(); connect(event_lib_type_group,SIGNAL(clicked(int)),this,SLOT(filterClickedData(int))); @@ -118,7 +123,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(rbutton,tr("All"),this); label->setFont(bold_font); label->setGeometry(75,55,30,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rbutton->setChecked(true); rbutton=new QRadioButton(this); @@ -127,7 +132,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(rbutton,tr("Audio Only"),this); label->setFont(bold_font); label->setGeometry(145,55,80,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rbutton=new QRadioButton(this); rbutton->setGeometry(235,55,15,15); @@ -135,7 +140,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(rbutton,tr("Macros Only"),this); label->setFont(bold_font); label->setGeometry(255,55,80,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Cart List @@ -145,17 +150,17 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_lib_list->setAllColumnsShowFocus(true); event_lib_list->setItemMargin(5); event_lib_list->addColumn(""); - event_lib_list->addColumn(tr("CART")); - event_lib_list->addColumn(tr("GROUP")); - event_lib_list->addColumn(tr("LENGTH")); - event_lib_list->setColumnAlignment(3,AlignRight); - event_lib_list->addColumn(tr("TITLE")); - event_lib_list->addColumn(tr("ARTIST")); - event_lib_list->addColumn(tr("START")); - event_lib_list->addColumn(tr("END")); - event_lib_list->addColumn(tr("TYPE")); - connect(event_lib_list,SIGNAL(clicked(QListViewItem *)), - this,SLOT(cartClickedData(QListViewItem *))); + event_lib_list->addColumn(tr("Cart")); + event_lib_list->addColumn(tr("Group")); + event_lib_list->addColumn(tr("Length")); + event_lib_list->setColumnAlignment(3,Qt::AlignRight); + event_lib_list->addColumn(tr("Title")); + event_lib_list->addColumn(tr("Artist")); + event_lib_list->addColumn(tr("Start")); + event_lib_list->addColumn(tr("End")); + event_lib_list->addColumn(tr("Type")); + connect(event_lib_list,SIGNAL(clicked(Q3ListViewItem *)), + this,SLOT(cartClickedData(Q3ListViewItem *))); // // Empty Cart Source @@ -185,7 +190,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_player->playButton()-> setGeometry(CENTER_LINE-180,sizeHint().height()-210,80,50); event_player->stopButton()->setGeometry(CENTER_LINE-90,sizeHint().height()-210,80,50); - event_player->stopButton()->setOnColor(red); + event_player->stopButton()->setOnColor(Qt::red); } delete q; #endif // WIN32 @@ -193,14 +198,14 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // Remarks // - event_remarks_edit=new QTextEdit(this); + event_remarks_edit=new Q3TextEdit(this); event_remarks_edit-> setGeometry(10,sizeHint().height()-150,CENTER_LINE-20,140); - event_remarks_edit->setTextFormat(QTextEdit::PlainText); + event_remarks_edit->setTextFormat(Qt::PlainText); label=new QLabel(event_remarks_edit,tr("REMARKS"),this); label->setFont(bold_font); label->setGeometry(15,sizeHint().height()-165,100,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Load Group List @@ -230,17 +235,17 @@ EditEvent::EditEvent(QString eventname,bool new_event, new QLabel(event_position_box,tr("Cue to this event"),this); event_position_label->setFont(bold_font); event_position_label->setGeometry(CENTER_LINE+35,27,150,22); - event_position_label->setAlignment(AlignVCenter|AlignLeft); - event_position_edit=new QTimeEdit(this); + event_position_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); + event_position_edit=new Q3TimeEdit(this); event_position_edit->setGeometry(CENTER_LINE+144,26,60,22); - event_position_edit->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); + event_position_edit->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); event_position_unit=new QLabel(event_position_box, tr("before scheduled start. (First cart will have a STOP transition.)"), this); event_position_unit->setFont(bold_font); event_position_unit->setGeometry(CENTER_LINE+212,27, sizeHint().width()-CENTER_LINE-232,22); - event_position_unit->setAlignment(AlignVCenter|AlignLeft); + event_position_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Timed Start Section @@ -258,7 +263,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, new QLabel(event_timetype_box,tr("Use hard start time"),this); event_timetype_label->setGeometry(CENTER_LINE+35,84,120,16); event_timetype_label->setFont(bold_font); - event_timetype_label->setAlignment(AlignLeft|AlignVCenter); + event_timetype_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Post Point @@ -268,13 +273,13 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_post_label=new QLabel(event_post_box,tr("Make Post Point"),this); event_post_label->setGeometry(CENTER_LINE+55,107,95,16); event_post_label->setFont(bold_font); - event_post_label->setAlignment(AlignLeft|AlignVCenter); + event_post_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Grace Time // event_grace_group= - new QButtonGroup(1,Qt::Vertical, + new Q3ButtonGroup(1,Qt::Vertical, tr("Action If Previous Event Still Playing"),this); event_grace_group->hide(); @@ -284,7 +289,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, new QLabel(tr("Action If Previous Event Still Playing"),this); event_grace_label->setGeometry(CENTER_LINE+180,75,225,16); event_grace_label->setFont(bold_font); - event_grace_label->setAlignment(AlignCenter); + event_grace_label->setAlignment(Qt::AlignCenter); event_immediate_button=new QRadioButton(tr("Start immediately"),this); event_immediate_button->setGeometry(CENTER_LINE+170,100,160,15); event_immediate_button->setFont(font); @@ -298,9 +303,9 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_wait_button->setFont(font); event_grace_group->insert(event_wait_button); - event_grace_edit=new QTimeEdit(this); + event_grace_edit=new Q3TimeEdit(this); event_grace_edit->setGeometry(CENTER_LINE+500,95,60,20); - event_grace_edit->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); + event_grace_edit->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); connect(event_timetype_box,SIGNAL(toggled(bool)), this,SLOT(timeToggledData(bool))); connect(event_grace_group,SIGNAL(clicked(int)), @@ -322,7 +327,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, tr("Transition if previous event ends before start time:"),this); event_time_label->setGeometry(CENTER_LINE+15,131,370,26); event_time_label->setFont(bold_font); - event_time_label->setAlignment(AlignRight|AlignVCenter); + event_time_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Enforcing Length Section @@ -336,7 +341,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(event_autofill_box,tr("Use AutoFill"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+120,184,150,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); event_autofill_slop_box=new QCheckBox(this); event_autofill_slop_box->setGeometry(CENTER_LINE+210,182,15,15); @@ -347,23 +352,23 @@ EditEvent::EditEvent(QString eventname,bool new_event, this); event_autofill_slop_label1->setFont(font); event_autofill_slop_label1->setGeometry(CENTER_LINE+230,184,140,15); - event_autofill_slop_label1->setAlignment(AlignLeft|AlignVCenter); + event_autofill_slop_label1->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); - event_autofill_slop_edit=new QTimeEdit(this); + event_autofill_slop_edit=new Q3TimeEdit(this); event_autofill_slop_edit->setGeometry(CENTER_LINE+440,179,60,22); - event_autofill_slop_edit->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); + event_autofill_slop_edit->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); event_autofill_slop_label= new QLabel(event_autofill_slop_edit,tr("by at least"),this); event_autofill_slop_label->setGeometry(CENTER_LINE+370,184,65,15); event_autofill_slop_label->setFont(font); - event_autofill_slop_label->setAlignment(AlignRight|AlignVCenter); + event_autofill_slop_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); event_timescale_box=new QCheckBox(this); event_timescale_box->setGeometry(CENTER_LINE+250,182,15,15); label=new QLabel(event_timescale_box,tr("Use Timescaling"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+270,182,150,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); event_timescale_box->hide(); label->hide(); @@ -383,7 +388,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(event_preimport_length_edit,tr("Len:"),this); label->setFont(bold_font); label->setGeometry(sizeHint().width()-330,210,185,16); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); event_preimport_list=new ImportListView(this); @@ -396,15 +401,15 @@ EditEvent::EditEvent(QString eventname,bool new_event, connect(event_preimport_list,SIGNAL(sizeChanged(int)), this,SLOT(preimportChangedData(int))); event_preimport_list->addColumn(""); - event_preimport_list->addColumn(tr("CART")); - event_preimport_list->addColumn(tr("GROUP")); - event_preimport_list->addColumn(tr("LENGTH")); - event_preimport_list->setColumnAlignment(3,AlignRight); - event_preimport_list->addColumn(tr("TITLE")); - event_preimport_list->addColumn(tr("TRANSITION")); - event_preimport_list->addColumn(tr("COUNT")); - connect(event_preimport_list,SIGNAL(clicked(QListViewItem *)), - this,SLOT(cartClickedData(QListViewItem *))); + event_preimport_list->addColumn(tr("Cart")); + event_preimport_list->addColumn(tr("Group")); + event_preimport_list->addColumn(tr("Length")); + event_preimport_list->setColumnAlignment(3,Qt::AlignRight); + event_preimport_list->addColumn(tr("Title")); + event_preimport_list->addColumn(tr("Transition")); + event_preimport_list->addColumn(tr("Count")); + connect(event_preimport_list,SIGNAL(clicked(Q3ListViewItem *)), + this,SLOT(cartClickedData(Q3ListViewItem *))); connect(event_preimport_list,SIGNAL(lengthChanged(int)), this,SLOT(preimportLengthChangedData(int))); event_preimport_up_button=new RDTransportButton(RDTransportButton::Up,this); @@ -424,7 +429,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label->setFont(bold_font); label->setGeometry(CENTER_LINE+15,362,200,16); - event_source_group=new QButtonGroup(this); + event_source_group=new Q3ButtonGroup(this); event_source_group->hide(); connect(event_source_group,SIGNAL(clicked(int)), this,SLOT(importClickedData(int))); @@ -434,7 +439,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(rbutton,tr("None"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+120,362,150,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rbutton=new QRadioButton(this); event_source_group->insert(rbutton); @@ -442,7 +447,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(rbutton,tr("From Traffic"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+220,362,150,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rbutton=new QRadioButton(this); rbutton->setGeometry(CENTER_LINE+300,362,15,15); @@ -450,7 +455,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(rbutton,tr("From Music"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+320,362,150,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); rbutton=new QRadioButton(this); rbutton->setGeometry(CENTER_LINE+400,362,15,15); @@ -458,7 +463,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(rbutton,tr("Select from:"),this); label->setFont(bold_font); label->setGeometry(CENTER_LINE+420,362,150,15); - label->setAlignment(AlignVCenter|AlignLeft); + label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // Scheduler Group @@ -523,15 +528,15 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_startslop_label=new QLabel(tr("Import carts scheduled"),this); event_startslop_label->setFont(bold_font); event_startslop_label->setGeometry(CENTER_LINE+30,383,140,22); - event_startslop_label->setAlignment(AlignVCenter|AlignLeft); - event_startslop_edit=new QTimeEdit(this); + event_startslop_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); + event_startslop_edit=new Q3TimeEdit(this); event_startslop_edit->setGeometry(CENTER_LINE+171,383,60,22); - event_startslop_edit->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); + event_startslop_edit->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); event_startslop_unit=new QLabel(tr("prior to the start of this event."),this); event_startslop_unit->setFont(bold_font); event_startslop_unit->setGeometry(CENTER_LINE+235,383, sizeHint().width()-CENTER_LINE-460,22); - event_startslop_unit->setAlignment(AlignVCenter|AlignLeft); + event_startslop_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // End Slop Time @@ -539,15 +544,15 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_endslop_label=new QLabel(tr("Import carts scheduled"),this); event_endslop_label->setFont(bold_font); event_endslop_label->setGeometry(CENTER_LINE+30,404,140,22); - event_endslop_label->setAlignment(AlignVCenter|AlignLeft); - event_endslop_edit=new QTimeEdit(this); + event_endslop_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); + event_endslop_edit=new Q3TimeEdit(this); event_endslop_edit->setGeometry(CENTER_LINE+171,404,60,22); - event_endslop_edit->setDisplay(QTimeEdit::Minutes|QTimeEdit::Seconds); + event_endslop_edit->setDisplay(Q3TimeEdit::Minutes|Q3TimeEdit::Seconds); event_endslop_unit=new QLabel(tr("after the end of this event."),this); event_endslop_unit->setFont(bold_font); event_endslop_unit->setGeometry(CENTER_LINE+235,404, sizeHint().width()-CENTER_LINE-460,22); - event_endslop_unit->setAlignment(AlignVCenter|AlignLeft); + event_endslop_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // First Cart Transition Type @@ -556,7 +561,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, new QLabel(tr("First cart has a"),this); event_firsttrans_label->setFont(bold_font); event_firsttrans_label->setGeometry(CENTER_LINE+30,428,140,22); - event_firsttrans_label->setAlignment(AlignVCenter|AlignLeft); + event_firsttrans_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); event_firsttrans_box=new QComboBox(this); event_firsttrans_box->setGeometry(CENTER_LINE+123,428,90,22); event_firsttrans_box->insertItem(tr("Play")); @@ -566,7 +571,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_firsttrans_unit->setFont(bold_font); event_firsttrans_unit->setGeometry(CENTER_LINE+215,428, sizeHint().width()-CENTER_LINE-450,22); - event_firsttrans_unit->setAlignment(AlignVCenter|AlignLeft); + event_firsttrans_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Default Transition Type @@ -574,7 +579,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_defaulttrans_label=new QLabel(tr("Imported carts have a"),this); event_defaulttrans_label->setFont(bold_font); event_defaulttrans_label->setGeometry(CENTER_LINE+30,451,180,22); - event_defaulttrans_label->setAlignment(AlignVCenter|AlignLeft); + event_defaulttrans_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); event_defaulttrans_box=new QComboBox(this); event_defaulttrans_box->setGeometry(CENTER_LINE+163,451,90,22); event_defaulttrans_box->insertItem(tr("Play")); @@ -584,7 +589,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_defaulttrans_unit->setFont(bold_font); event_defaulttrans_unit->setGeometry(CENTER_LINE+255,451, sizeHint().width()-CENTER_LINE-420,22); - event_defaulttrans_unit->setAlignment(AlignVCenter|AlignLeft); + event_defaulttrans_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Nested Event @@ -592,14 +597,14 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_nestevent_label=new QLabel(tr("Import inline traffic with the"),this); event_nestevent_label->setFont(bold_font); event_nestevent_label->setGeometry(CENTER_LINE+30,474,190,22); - event_nestevent_label->setAlignment(AlignVCenter|AlignLeft); + event_nestevent_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); event_nestevent_box=new QComboBox(this); event_nestevent_box->setGeometry(CENTER_LINE+183,474,365,22); event_nestevent_box->insertItem(tr("[none]")); event_nestevent_unit=new QLabel(tr("event."),this); event_nestevent_unit->setFont(bold_font); event_nestevent_unit->setGeometry(CENTER_LINE+553,474,40,22); - event_nestevent_unit->setAlignment(AlignVCenter|AlignLeft); + event_nestevent_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); // // Post-Import Carts Section @@ -617,7 +622,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, label=new QLabel(event_postimport_length_edit,tr("Len:"),this); label->setFont(bold_font); label->setGeometry(sizeHint().width()-330,505,185,16); - label->setAlignment(AlignVCenter|AlignRight); + label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); event_postimport_list=new ImportListView(this); event_postimport_list->setGeometry(CENTER_LINE+15,522, @@ -628,15 +633,15 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_postimport_list->setAllowStop(false); event_postimport_list->load(event_name,RDEventImportList::PostImport); event_postimport_list->addColumn(""); - event_postimport_list->addColumn(tr("CART")); - event_postimport_list->addColumn(tr("GROUP")); - event_postimport_list->addColumn(tr("LENGTH")); - event_postimport_list->setColumnAlignment(3,AlignRight); - event_postimport_list->addColumn(tr("TITLE")); - event_postimport_list->addColumn(tr("TRANSITION")); - event_postimport_list->addColumn(tr("COUNT")); - connect(event_postimport_list,SIGNAL(clicked(QListViewItem *)), - this,SLOT(cartClickedData(QListViewItem *))); + event_postimport_list->addColumn(tr("Cart")); + event_postimport_list->addColumn(tr("Group")); + event_postimport_list->addColumn(tr("Length")); + event_postimport_list->setColumnAlignment(3,Qt::AlignRight); + event_postimport_list->addColumn(tr("Title")); + event_postimport_list->addColumn(tr("Transition")); + event_postimport_list->addColumn(tr("Count")); + connect(event_postimport_list,SIGNAL(clicked(Q3ListViewItem *)), + this,SLOT(cartClickedData(Q3ListViewItem *))); connect(event_postimport_list,SIGNAL(lengthChanged(int)), this,SLOT(postimportLengthChangedData(int))); event_postimport_up_button= @@ -770,8 +775,8 @@ EditEvent::EditEvent(QString eventname,bool new_event, event_endslop_edit->setTime(QTime().addMSecs(event_event->endSlop())); event_firsttrans_box->setCurrentItem(event_event->firstTransType()); event_defaulttrans_box->setCurrentItem(event_event->defaultTransType()); - if (event_event->SchedGroup()!=NULL) { - event_sched_group_box->setCurrentText(event_event->SchedGroup()); + if(!event_event->schedGroup().isEmpty()) { + event_sched_group_box->setCurrentText(event_event->schedGroup()); } event_title_sep_spinbox->setValue(event_event->titleSep()); event_have_code_box->setCurrentText(event_event->HaveCode()); @@ -846,7 +851,7 @@ void EditEvent::filterClickedData(int id) } -void EditEvent::cartClickedData(QListViewItem *item) +void EditEvent::cartClickedData(Q3ListViewItem *item) { #ifndef WIN32 if (!event_player) return; @@ -1079,7 +1084,7 @@ void EditEvent::preimportLengthChangedData(int msecs) void EditEvent::preimportUpData() { int line; - QListViewItem *item=event_preimport_list->selectedItem(); + Q3ListViewItem *item=event_preimport_list->selectedItem(); if(item==NULL) { return; } @@ -1097,7 +1102,7 @@ void EditEvent::preimportUpData() void EditEvent::preimportDownData() { int line; - QListViewItem *item=event_preimport_list->selectedItem(); + Q3ListViewItem *item=event_preimport_list->selectedItem(); if(item==NULL) { return; } @@ -1116,7 +1121,7 @@ void EditEvent::preimportDownData() void EditEvent::postimportUpData() { int line; - QListViewItem *item=event_postimport_list->selectedItem(); + Q3ListViewItem *item=event_postimport_list->selectedItem(); if(item==NULL) { return; } @@ -1134,7 +1139,7 @@ void EditEvent::postimportUpData() void EditEvent::postimportDownData() { int line; - QListViewItem *item=event_postimport_list->selectedItem(); + Q3ListViewItem *item=event_postimport_list->selectedItem(); if(item==NULL) { return; } @@ -1266,12 +1271,10 @@ void EditEvent::closeEvent(QCloseEvent *e) void EditEvent::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); - p->moveTo(CENTER_LINE,10); - p->lineTo(CENTER_LINE,sizeHint().height()-10); + p->setPen(Qt::black); + p->drawLine(CENTER_LINE,10,CENTER_LINE,sizeHint().height()-10); p->drawRect(CENTER_LINE+160,82,sizeHint().width()-CENTER_LINE-200,45); - p->moveTo(CENTER_LINE+408,383); - p->lineTo(CENTER_LINE+408,450); + p->drawLine(CENTER_LINE+408,383,CENTER_LINE+408,450); p->end(); } @@ -1311,10 +1314,10 @@ void EditEvent::RefreshLibrary() RDCartSearchText(event_lib_filter_edit->text(),group,"",false)+" && "+ type_filter; RDSqlQuery *q=new RDSqlQuery(sql); - QListViewItem *item; + Q3ListViewItem *item; event_lib_list->clear(); while(q->next()) { - item=new QListViewItem(event_lib_list); + item=new Q3ListViewItem(event_lib_list); switch((RDCart::Type)q->value(0).toInt()) { case RDCart::Audio: item->setPixmap(0,*event_playout_map); diff --git a/rdlogmanager/edit_event.h b/rdlogmanager/edit_event.h index 76f96ae2..cd3a0e9d 100644 --- a/rdlogmanager/edit_event.h +++ b/rdlogmanager/edit_event.h @@ -30,11 +30,15 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include +//Added by qt3to4: +#include +#include +#include #include #include @@ -65,7 +69,7 @@ class EditEvent : public QDialog void filterChangedData(const QString &str); void filterActivatedData(const QString &str); void filterClickedData(int id); - void cartClickedData(QListViewItem *item); + void cartClickedData(Q3ListViewItem *item); void prepositionToggledData(bool state); void timeToggledData(bool); void graceClickedData(int); @@ -100,7 +104,7 @@ class EditEvent : public QDialog QString event_name; RDEvent *event_event; QLineEdit *event_lib_filter_edit; - QButtonGroup *event_lib_type_group; + Q3ButtonGroup *event_lib_type_group; QComboBox *event_group_box; QComboBox *event_sched_group_box; QSpinBox* event_title_sep_spinbox; @@ -116,7 +120,7 @@ class EditEvent : public QDialog QLabel *event_position_label; QLabel *event_position_unit; QCheckBox *event_position_box; - QTimeEdit *event_position_edit; + Q3TimeEdit *event_position_edit; QLabel *event_timetype_header; QCheckBox *event_timetype_box; QLabel *event_timetype_label; @@ -124,27 +128,27 @@ class EditEvent : public QDialog QLabel *event_post_label; QLabel *event_time_label; QLabel *event_grace_label; - QButtonGroup *event_grace_group; + Q3ButtonGroup *event_grace_group; QRadioButton *event_immediate_button; QRadioButton *event_next_button; QRadioButton *event_wait_button; - QTimeEdit *event_grace_edit; + Q3TimeEdit *event_grace_edit; QComboBox *event_transtype_box; QCheckBox *event_autofill_box; QCheckBox *event_autofill_slop_box; QLabel *event_autofill_slop_label1; QLabel *event_autofill_slop_label; - QTimeEdit *event_autofill_slop_edit; + Q3TimeEdit *event_autofill_slop_edit; QCheckBox *event_timescale_box; ImportListView *event_preimport_list; QLineEdit *event_preimport_length_edit; RDTransportButton *event_preimport_up_button; RDTransportButton *event_preimport_down_button; - QButtonGroup *event_source_group; - QTimeEdit *event_startslop_edit; + Q3ButtonGroup *event_source_group; + Q3TimeEdit *event_startslop_edit; QLabel *event_startslop_label; QLabel *event_startslop_unit; - QTimeEdit *event_endslop_edit; + Q3TimeEdit *event_endslop_edit; QLabel *event_endslop_label; QLabel *event_endslop_unit; QComboBox *event_firsttrans_box; @@ -165,7 +169,7 @@ class EditEvent : public QDialog bool event_new_event; std::vector *event_new_events; RDSimplePlayer *event_player; - QTextEdit *event_remarks_edit; + Q3TextEdit *event_remarks_edit; RDEmptyCart *event_empty_cart; }; diff --git a/rdlogmanager/edit_eventline.cpp b/rdlogmanager/edit_eventline.cpp index 32b071ae..fe40deb7 100644 --- a/rdlogmanager/edit_eventline.cpp +++ b/rdlogmanager/edit_eventline.cpp @@ -20,10 +20,13 @@ #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -100,7 +103,7 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, QLabel *label=new QLabel(edit_eventname_edit,tr("Event:"),this); label->setGeometry(10,12,50,18); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Event Select Button @@ -122,7 +125,7 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); label->setGeometry(65,42,80,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // End Time @@ -134,7 +137,7 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, label=new QLabel(edit_endtime_edit,tr("End Time:"),this); label->setGeometry(250,42,70,20); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // OK Button diff --git a/rdlogmanager/edit_eventline.h b/rdlogmanager/edit_eventline.h index 53a0b460..375b3213 100644 --- a/rdlogmanager/edit_eventline.h +++ b/rdlogmanager/edit_eventline.h @@ -24,7 +24,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include diff --git a/rdlogmanager/edit_grid.cpp b/rdlogmanager/edit_grid.cpp index b0de4240..07b31694 100644 --- a/rdlogmanager/edit_grid.cpp +++ b/rdlogmanager/edit_grid.cpp @@ -24,11 +24,16 @@ #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -75,7 +80,7 @@ EditGrid::EditGrid(QString servicename,QWidget *parent) label=new QLabel(QDate::longDayName(i+1),this); label->setGeometry(20,14+75*i,90,16); label->setFont(bold_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); for(int j=0;j<24;j++) { edit_hour_button[i][j]=new RDPushButton(this); edit_hour_button[i][j]->setGeometry(10+42*j,30+75*i,42,40); @@ -92,7 +97,7 @@ EditGrid::EditGrid(QString servicename,QWidget *parent) label=new QLabel(QDate::longDayName(i+1),this); label->setGeometry(20,44+75*i,90,16); label->setFont(bold_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); for(int j=0;j<24;j++) { edit_hour_button[i][j]=new RDPushButton(this); edit_hour_button[i][j]->setGeometry(10+42*j,60+75*i,42,40); @@ -109,7 +114,7 @@ EditGrid::EditGrid(QString servicename,QWidget *parent) // // Right Button Menu // - edit_right_menu=new QPopupMenu(this); + edit_right_menu=new Q3PopupMenu(this); connect(edit_right_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); edit_right_menu-> insertItem(tr("Edit Clock"),this,SLOT(editClockData()),0,0); @@ -279,7 +284,7 @@ void EditGrid::closeData() void EditGrid::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->setPen(QColor(black)); + p->setPen(Qt::black); for(int i=0;i<5;i++) { p->drawRect(5,21+75*i,sizeHint().width()-10,55); } diff --git a/rdlogmanager/edit_grid.h b/rdlogmanager/edit_grid.h index 8884d85c..92f3a015 100644 --- a/rdlogmanager/edit_grid.h +++ b/rdlogmanager/edit_grid.h @@ -24,7 +24,10 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include +#include #include @@ -59,7 +62,7 @@ class EditGrid : public QDialog QString edit_servicename; QString current_clockname; RDPushButton *edit_hour_button[7][24]; - QPopupMenu *edit_right_menu; + Q3PopupMenu *edit_right_menu; int edit_rightclick_id; }; diff --git a/rdlogmanager/edit_note.cpp b/rdlogmanager/edit_note.cpp index f48f5eee..713ac83a 100644 --- a/rdlogmanager/edit_note.cpp +++ b/rdlogmanager/edit_note.cpp @@ -20,10 +20,12 @@ #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include #include #include @@ -55,7 +57,7 @@ EditNote::EditNote(QString *text,QWidget *parent) // // The Text Editor // - edit_text_edit=new QTextEdit(this); + edit_text_edit=new Q3TextEdit(this); edit_text_edit->setGeometry(10,10, sizeHint().width()-20,sizeHint().height()-80); edit_text_edit->setText(*edit_text); diff --git a/rdlogmanager/edit_note.h b/rdlogmanager/edit_note.h index a89c4fe3..153070b2 100644 --- a/rdlogmanager/edit_note.h +++ b/rdlogmanager/edit_note.h @@ -23,7 +23,9 @@ #include #include -#include +#include +//Added by qt3to4: +#include class EditNote : public QDialog @@ -43,7 +45,7 @@ class EditNote : public QDialog private: QString *edit_text; - QTextEdit *edit_text_edit; + Q3TextEdit *edit_text_edit; }; diff --git a/rdlogmanager/edit_perms.cpp b/rdlogmanager/edit_perms.cpp index 1f55b91b..f6b80d59 100644 --- a/rdlogmanager/edit_perms.cpp +++ b/rdlogmanager/edit_perms.cpp @@ -21,14 +21,16 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include diff --git a/rdlogmanager/edit_perms.h b/rdlogmanager/edit_perms.h index 339b393e..11e27850 100644 --- a/rdlogmanager/edit_perms.h +++ b/rdlogmanager/edit_perms.h @@ -23,6 +23,8 @@ #include #include +//Added by qt3to4: +#include #include diff --git a/rdlogmanager/edit_schedcoderules.cpp b/rdlogmanager/edit_schedcoderules.cpp index d48092ad..6358088f 100644 --- a/rdlogmanager/edit_schedcoderules.cpp +++ b/rdlogmanager/edit_schedcoderules.cpp @@ -22,19 +22,22 @@ #include #include -#include +#include #include #include #include #include #include +//Added by qt3to4: +#include +#include #include #include #include -editSchedCodeRules::editSchedCodeRules(QListViewItem *item, +editSchedCodeRules::editSchedCodeRules(Q3ListViewItem *item, SchedRulesList *sched_rules_list, QWidget* parent) : QDialog(parent,"",true) @@ -73,37 +76,37 @@ editSchedCodeRules::editSchedCodeRules(QListViewItem *item, label_code_name->setGeometry( QRect( 40, 10, 150, 20 ) ); label_code_name->setText( tr( "Code:" ) ); label_code_name->setFont( font ); - label_code_name->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label_code_name->setAlignment( int( Qt::AlignVCenter | Qt::AlignRight ) ); label_max_row = new QLabel(this); label_max_row->setGeometry( QRect( 30, 80, 160, 20 ) ); label_max_row->setText( tr( "Max. in a row:" ) ); label_max_row->setFont( font ); - label_max_row->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label_max_row->setAlignment( int( Qt::AlignVCenter | Qt::AlignRight ) ); label_min_wait = new QLabel(this); label_min_wait->setGeometry( QRect( 30, 110, 160, 20 ) ); label_min_wait->setText( tr( "Min. wait:" ) ); label_min_wait->setFont( font ); - label_min_wait->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label_min_wait->setAlignment( int( Qt::AlignVCenter | Qt::AlignRight ) ); label_not_after = new QLabel(this); label_not_after->setGeometry( QRect( 30, 140, 160, 20 ) ); label_not_after->setText( tr( "Do not schedule after:" ) ); label_not_after->setFont( font ); - label_not_after->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label_not_after->setAlignment( int( Qt::AlignVCenter | Qt::AlignRight ) ); label_or_after = new QLabel(this); label_or_after->setGeometry( QRect( 30, 180, 160, 20 ) ); label_or_after->setText( tr( "Or after:" ) ); label_or_after->setFont( font ); - label_or_after->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label_or_after->setAlignment( int( Qt::AlignVCenter | Qt::AlignRight ) ); label_or_after_II = new QLabel(this); label_or_after_II->setGeometry( QRect( 30, 220, 160, 20 ) ); label_or_after_II->setText( tr( "Or after:" ) ); label_or_after_II->setFont( font ); - label_or_after_II->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + label_or_after_II->setAlignment( int( Qt::AlignVCenter | Qt::AlignRight ) ); spinBox_max_row = new QSpinBox(this); spinBox_max_row->setGeometry( QRect( 200, 80, 70, 20 ) ); @@ -119,7 +122,7 @@ editSchedCodeRules::editSchedCodeRules(QListViewItem *item, label_code = new QLabel(this); label_code->setGeometry( QRect( 200, 10, 90, 20 ) ); - label_code->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignLeft ) ); + label_code->setAlignment( int( Qt::AlignVCenter | Qt::AlignLeft ) ); label_code->setText( item->text(0) ); comboBox_not_after = new QComboBox( FALSE, this); @@ -149,7 +152,7 @@ editSchedCodeRules::editSchedCodeRules(QListViewItem *item, label_description = new QLabel(this); label_description->setGeometry( QRect( 200, 40, 300, 40 ) ); - label_description->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) ); + label_description->setAlignment( int( Qt::AlignTop | Qt::AlignLeft ) ); label_description->setText( item->text(6) ); } diff --git a/rdlogmanager/edit_schedcoderules.h b/rdlogmanager/edit_schedcoderules.h index ee85d4a6..bddfd95b 100644 --- a/rdlogmanager/edit_schedcoderules.h +++ b/rdlogmanager/edit_schedcoderules.h @@ -27,6 +27,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -37,7 +39,7 @@ class editSchedCodeRules : public QDialog { Q_OBJECT public: - editSchedCodeRules(QListViewItem *item, SchedRulesList *sched_rules_list, + editSchedCodeRules(Q3ListViewItem *item, SchedRulesList *sched_rules_list, QWidget *parent=0); ~editSchedCodeRules(); QSize sizeHint() const; @@ -63,7 +65,7 @@ class editSchedCodeRules : public QDialog QComboBox* comboBox_or_after; QComboBox* comboBox_or_after_II; QLabel* label_description; - QListViewItem *item_edit; + Q3ListViewItem *item_edit; protected: void closeEvent(QCloseEvent *e); diff --git a/rdlogmanager/edit_schedrules.cpp b/rdlogmanager/edit_schedrules.cpp index 9d6a7eaa..416e9698 100644 --- a/rdlogmanager/edit_schedrules.cpp +++ b/rdlogmanager/edit_schedrules.cpp @@ -20,12 +20,15 @@ #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -129,9 +132,9 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,SchedRulesList list_box_label->setFont(font); list_box_label->setGeometry(10,40,200,20); connect(list_schedCodes_view, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); edit_modified=false; Load(); @@ -255,7 +258,7 @@ void EditSchedRules::importData() } -void EditSchedRules::doubleClickedData(QListViewItem *item,const QPoint &pt,int col) +void EditSchedRules::doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col) { editData(); } diff --git a/rdlogmanager/edit_schedrules.h b/rdlogmanager/edit_schedrules.h index a5f0261c..bf85f135 100644 --- a/rdlogmanager/edit_schedrules.h +++ b/rdlogmanager/edit_schedrules.h @@ -25,8 +25,10 @@ #include #include #include -#include +#include #include +//Added by qt3to4: +#include #include @@ -48,7 +50,7 @@ class EditSchedRules : public QDialog private slots: void editData(); void importData(); - void doubleClickedData(QListViewItem *item,const QPoint &pt,int col); + void doubleClickedData(Q3ListViewItem *item,const QPoint &pt,int col); void okData(); void cancelData(); diff --git a/rdlogmanager/edit_track.cpp b/rdlogmanager/edit_track.cpp index bd4706ba..261a4c9e 100644 --- a/rdlogmanager/edit_track.cpp +++ b/rdlogmanager/edit_track.cpp @@ -20,10 +20,12 @@ #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include #include #include @@ -55,7 +57,7 @@ EditTrack::EditTrack(QString *text,QWidget *parent) // // The Text Editor // - edit_text_edit=new QTextEdit(this); + edit_text_edit=new Q3TextEdit(this); edit_text_edit->setGeometry(10,10, sizeHint().width()-20,sizeHint().height()-80); edit_text_edit->setText(*edit_text); diff --git a/rdlogmanager/edit_track.h b/rdlogmanager/edit_track.h index eb1e03d5..b2ac89a0 100644 --- a/rdlogmanager/edit_track.h +++ b/rdlogmanager/edit_track.h @@ -23,7 +23,9 @@ #include #include -#include +#include +//Added by qt3to4: +#include class EditTrack : public QDialog { @@ -42,7 +44,7 @@ class EditTrack : public QDialog private: QString *edit_text; - QTextEdit *edit_text_edit; + Q3TextEdit *edit_text_edit; }; diff --git a/rdlogmanager/generate_log.cpp b/rdlogmanager/generate_log.cpp index fa5c9985..93dc4b5d 100644 --- a/rdlogmanager/generate_log.cpp +++ b/rdlogmanager/generate_log.cpp @@ -22,10 +22,14 @@ #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -91,7 +95,7 @@ GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service, // // Progress Dialog // - gen_progress_dialog=new QProgressDialog(tr("Generating Log..."),tr("Cancel"), + gen_progress_dialog=new Q3ProgressDialog(tr("Generating Log..."),tr("Cancel"), 24,this,"gen_progress_dialog",true); gen_progress_dialog->setCaption("Progress"); gen_progress_dialog->setCancelButton(NULL); @@ -104,7 +108,7 @@ GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service, this,SLOT(serviceActivatedData(int))); gen_service_label=new QLabel(gen_service_box,tr("Service:"),this); gen_service_label->setFont(bold_font); - gen_service_label->setAlignment(AlignRight|AlignVCenter); + gen_service_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QString sql="select NAME from SERVICES"; RDSqlQuery *q=new RDSqlQuery(sql); @@ -123,10 +127,10 @@ GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service, // // Date // - gen_date_edit=new QDateEdit(this); + gen_date_edit=new Q3DateEdit(this); gen_date_label=new QLabel(gen_date_edit,tr("Date:"),this); gen_date_label->setFont(bold_font); - gen_date_label->setAlignment(AlignRight|AlignVCenter); + gen_date_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); if (cmdswitch==0) gen_date_edit->setDate(QDate::currentDate().addDays(1)); else @@ -174,15 +178,15 @@ GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service, // gen_import_label=new QLabel(tr("Import Data"),this); gen_import_label->setFont(bold_font); - gen_import_label->setAlignment(AlignCenter); + gen_import_label->setAlignment(Qt::AlignCenter); gen_available_label=new QLabel(tr("Available"),this); gen_available_label->setFont(small_font); - gen_available_label->setAlignment(AlignCenter); + gen_available_label->setAlignment(Qt::AlignCenter); gen_merged_label=new QLabel(tr("Merged"),this); gen_merged_label->setFont(small_font); - gen_merged_label->setAlignment(AlignCenter); + gen_merged_label->setAlignment(Qt::AlignCenter); // // Music Indicators @@ -190,12 +194,12 @@ GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service, gen_mus_avail_label=new QLabel(this); gen_mus_avail_label->setPixmap(*gen_whiteball_map); gen_mus_avail_label->setFont(small_font); - gen_mus_avail_label->setAlignment(AlignCenter); + gen_mus_avail_label->setAlignment(Qt::AlignCenter); gen_mus_merged_label=new QLabel(this); gen_mus_merged_label->setPixmap(*gen_whiteball_map); gen_mus_merged_label->setFont(small_font); - gen_mus_merged_label->setAlignment(AlignCenter); + gen_mus_merged_label->setAlignment(Qt::AlignCenter); // // Traffic Indicators @@ -203,12 +207,12 @@ GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service, gen_tfc_avail_label=new QLabel(this); gen_tfc_avail_label->setPixmap(*gen_whiteball_map); gen_tfc_avail_label->setFont(small_font); - gen_tfc_avail_label->setAlignment(AlignCenter); + gen_tfc_avail_label->setAlignment(Qt::AlignCenter); gen_tfc_merged_label=new QLabel(this); gen_tfc_merged_label->setPixmap(*gen_whiteball_map); gen_tfc_merged_label->setFont(small_font); - gen_tfc_merged_label->setAlignment(AlignCenter); + gen_tfc_merged_label->setAlignment(Qt::AlignCenter); // diff --git a/rdlogmanager/generate_log.h b/rdlogmanager/generate_log.h index 5b45f68c..a50937d4 100644 --- a/rdlogmanager/generate_log.h +++ b/rdlogmanager/generate_log.h @@ -22,12 +22,14 @@ #define GENERATE_LOG_H #include -#include +#include #include #include #include -#include +#include #include +//Added by qt3to4: +#include #include @@ -60,12 +62,12 @@ class GenerateLog : public QDialog QLabel *gen_service_label; QComboBox *gen_service_box; QLabel *gen_date_label; - QDateEdit *gen_date_edit; + Q3DateEdit *gen_date_edit; QPushButton *gen_select_button; QLabel *gen_import_label; QLabel *gen_available_label; QLabel *gen_merged_label; - QProgressDialog *gen_progress_dialog; + Q3ProgressDialog *gen_progress_dialog; QPushButton *gen_create_button; QPushButton *gen_music_button; QPushButton *gen_traffic_button; diff --git a/rdlogmanager/import_listview.cpp b/rdlogmanager/import_listview.cpp index 6b32b2af..77020f8e 100644 --- a/rdlogmanager/import_listview.cpp +++ b/rdlogmanager/import_listview.cpp @@ -18,8 +18,15 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include +#include +#include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include #include #include @@ -39,7 +46,7 @@ #include "../icons/notemarker.xpm" ImportListView::ImportListView(QWidget *parent) - : QListView(parent) + : Q3ListView(parent) { import_parent=parent; @@ -59,7 +66,7 @@ ImportListView::ImportListView(QWidget *parent) // // Right Button Menu // - import_menu=new QPopupMenu(this); + import_menu=new Q3PopupMenu(this); connect(import_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); import_menu-> insertItem(tr("Insert Log Note"),this,SLOT(insertNoteMenuData()),0,0); @@ -138,8 +145,8 @@ void ImportListView::save() void ImportListView::refreshList(int line) { - QListViewItem *item; - QListViewItem *select_item=NULL; + Q3ListViewItem *item; + Q3ListViewItem *select_item=NULL; QString sql; RDEventImportItem *i_item; int total_len=0; @@ -147,7 +154,7 @@ void ImportListView::refreshList(int line) clear(); for(int i=import_list->size()-1;i>=0;i--) { - item=new QListViewItem(this); + item=new Q3ListViewItem(this); if((i_item=import_list->item(i))!=NULL) { if((i_item->eventType()==RDLogLine::Cart)|| (i_item->eventType()==RDLogLine::Macro)) { @@ -427,7 +434,7 @@ void ImportListView::deleteMenuData() void ImportListView::contentsMousePressEvent(QMouseEvent *e) { - QListView::contentsMousePressEvent(e); + Q3ListView::contentsMousePressEvent(e); import_menu_item=selectedItem(); if(import_menu_item==NULL) { import_menu_i_item=NULL; @@ -439,7 +446,7 @@ void ImportListView::contentsMousePressEvent(QMouseEvent *e) } } switch(e->button()) { - case QMouseEvent::RightButton: + case Qt::RightButton: import_menu->setGeometry(import_parent->geometry().x()+ geometry().x()+e->pos().x()+2, import_parent->geometry().y()+ @@ -459,7 +466,7 @@ void ImportListView::contentsMousePressEvent(QMouseEvent *e) void ImportListView::contentsMouseDoubleClickEvent(QMouseEvent *e) { - QListView::contentsMouseDoubleClickEvent(e); + Q3ListView::contentsMouseDoubleClickEvent(e); import_menu_item=selectedItem(); if(import_menu_item==NULL) { return; @@ -473,7 +480,7 @@ void ImportListView::contentsMouseDoubleClickEvent(QMouseEvent *e) void ImportListView::focusOutEvent(QFocusEvent *e) { - QListViewItem *item=selectedItem(); + Q3ListViewItem *item=selectedItem(); if(item==NULL) { return; } @@ -489,7 +496,7 @@ void ImportListView::dragEnterEvent(QDragEnterEvent *e) void ImportListView::dropEvent(QDropEvent *e) { - QListViewItem *item; + Q3ListViewItem *item; unsigned cartnum; int line=0; QPoint pos(e->pos().x(),e->pos().y()-header()->sectionRect(0).height()); diff --git a/rdlogmanager/import_listview.h b/rdlogmanager/import_listview.h index 7d300c5c..a0da12a1 100644 --- a/rdlogmanager/import_listview.h +++ b/rdlogmanager/import_listview.h @@ -21,14 +21,19 @@ #ifndef IMPORT_LISTVIEW_H #define IMPORT_LISTVIEW_H -#include +#include #include -#include +#include +//Added by qt3to4: +#include +#include +#include +#include #include //#include -class ImportListView : public QListView +class ImportListView : public Q3ListView { Q_OBJECT @@ -72,10 +77,10 @@ class ImportListView : public QListView QPixmap *import_macro_map; QPixmap *import_notemarker_map; QPixmap *import_mic16_map; - QPopupMenu *import_menu; + Q3PopupMenu *import_menu; int import_menu_line; RDEventImportItem *import_menu_i_item; - QListViewItem *import_menu_item; + Q3ListViewItem *import_menu_item; RDLogLine::TransType import_force_trans; bool import_allow_stop; bool import_allow_first_trans; diff --git a/rdlogmanager/lib_listview.cpp b/rdlogmanager/lib_listview.cpp index 17568dde..1f3db53e 100644 --- a/rdlogmanager/lib_listview.cpp +++ b/rdlogmanager/lib_listview.cpp @@ -22,16 +22,19 @@ #include #include +//Added by qt3to4: +#include +#include LibListView::LibListView(QWidget *parent) - : QListView(parent) + : Q3ListView(parent) { } void LibListView::focusOutEvent(QFocusEvent *e) { - QListViewItem *item=selectedItem(); + Q3ListViewItem *item=selectedItem(); if(item==NULL) { return; } @@ -41,8 +44,8 @@ void LibListView::focusOutEvent(QFocusEvent *e) void LibListView::contentsMousePressEvent(QMouseEvent *e) { - QListView::contentsMousePressEvent(e); - QListViewItem *item=selectedItem(); + Q3ListView::contentsMousePressEvent(e); + Q3ListViewItem *item=selectedItem(); if(item==NULL) { return; } diff --git a/rdlogmanager/lib_listview.h b/rdlogmanager/lib_listview.h index 8afa941e..856a2c78 100644 --- a/rdlogmanager/lib_listview.h +++ b/rdlogmanager/lib_listview.h @@ -23,10 +23,13 @@ #ifndef LIB_LISTVIEW_H #define LIB_LISTVIEW_H -#include +#include #include +//Added by qt3to4: +#include +#include -class LibListView : public QListView +class LibListView : public Q3ListView { Q_OBJECT diff --git a/rdlogmanager/list_clocks.cpp b/rdlogmanager/list_clocks.cpp index 34823dd7..5542b12e 100644 --- a/rdlogmanager/list_clocks.cpp +++ b/rdlogmanager/list_clocks.cpp @@ -20,11 +20,15 @@ #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -65,23 +69,23 @@ ListClocks::ListClocks(QString *clockname,QWidget *parent) edit_filter_box=new QComboBox(this); edit_filter_label=new QLabel(edit_filter_box,tr("Filter:"),this); edit_filter_label->setFont(bold_font); - edit_filter_label->setAlignment(AlignRight|AlignVCenter); + edit_filter_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_filter_box,SIGNAL(activated(int)), this,SLOT(filterActivatedData(int))); // // Clocks List // - edit_clocks_list=new QListView(this); + edit_clocks_list=new Q3ListView(this); edit_clocks_list->setAllColumnsShowFocus(true); edit_clocks_list->setItemMargin(5); edit_clocks_list->addColumn(tr("Name")); edit_clocks_list->addColumn(tr("Code")); edit_clocks_list->addColumn(tr("Color")); - edit_clocks_list->setColumnAlignment(2,AlignCenter); + edit_clocks_list->setColumnAlignment(2,Qt::AlignCenter); connect(edit_clocks_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), - this,SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), + this,SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); // // Add Button @@ -186,7 +190,7 @@ ListClocks::ListClocks(QString *clockname,QWidget *parent) RefreshList(); if(edit_clockname!=NULL) { - QListViewItem *item=edit_clocks_list->firstChild(); + Q3ListViewItem *item=edit_clocks_list->firstChild(); while(item!=NULL) { if(item->text(0)==*edit_clockname) { edit_clocks_list->setSelected(item,true); @@ -269,7 +273,7 @@ void ListClocks::addData() q=new RDSqlQuery(sql); delete q; } - QListViewItem *item=new QListViewItem(edit_clocks_list); + Q3ListViewItem *item=new Q3ListViewItem(edit_clocks_list); item->setText(0,clockname); RefreshItem(item,&new_clocks); edit_clocks_list->setSelected(item,true); @@ -281,7 +285,7 @@ void ListClocks::addData() void ListClocks::editData() { std::vector new_clocks; - QListViewItem *item=edit_clocks_list->selectedItem(); + Q3ListViewItem *item=edit_clocks_list->selectedItem(); if(item==NULL) { return; } @@ -299,7 +303,7 @@ void ListClocks::deleteData() { int n; QString svc_list; - QListViewItem *item=edit_clocks_list->selectedItem(); + Q3ListViewItem *item=edit_clocks_list->selectedItem(); if(item==NULL) { return; } @@ -331,7 +335,7 @@ void ListClocks::renameData() QString sql; RDSqlQuery *q; RDSqlQuery *q1; - QListViewItem *item=edit_clocks_list->selectedItem(); + Q3ListViewItem *item=edit_clocks_list->selectedItem(); if(item==NULL) { return; } @@ -404,7 +408,7 @@ void ListClocks::filterActivatedData(int id) } -void ListClocks::doubleClickedData(QListViewItem *item,const QPoint &,int) +void ListClocks::doubleClickedData(Q3ListViewItem *item,const QPoint &,int) { if(edit_clockname==NULL) { editData(); @@ -424,7 +428,7 @@ void ListClocks::closeData() void ListClocks::clearData() { - QListViewItem *item=edit_clocks_list->selectedItem(); + Q3ListViewItem *item=edit_clocks_list->selectedItem(); if(item!=NULL) { edit_clocks_list->setSelected(item,false); } @@ -433,7 +437,7 @@ void ListClocks::clearData() void ListClocks::okData() { - QListViewItem *item=edit_clocks_list->selectedItem(); + Q3ListViewItem *item=edit_clocks_list->selectedItem(); *clock_filter=edit_filter_box->currentText(); if(item==NULL) { *edit_clockname=""; @@ -497,25 +501,25 @@ void ListClocks::RefreshList() "COLOR "+ // 02 "from CLOCKS "+filter; RDSqlQuery *q=new RDSqlQuery(sql); - QListViewItem *item=NULL; + Q3ListViewItem *item=NULL; while(q->next()) { - item=new QListViewItem(edit_clocks_list); + item=new Q3ListViewItem(edit_clocks_list); WriteItem(item,q); } delete q; } -void ListClocks::RefreshItem(QListViewItem *item, +void ListClocks::RefreshItem(Q3ListViewItem *item, std::vector *new_clocks) { - QListViewItem *new_item; + Q3ListViewItem *new_item; UpdateItem(item,item->text(0)); if(new_clocks!=NULL) { for(unsigned i=0;isize();i++) { if((new_item=edit_clocks_list->findItem(new_clocks->at(i),0))==NULL) { - new_item=new QListViewItem(edit_clocks_list); + new_item=new Q3ListViewItem(edit_clocks_list); } UpdateItem(new_item,new_clocks->at(i)); } @@ -523,7 +527,7 @@ void ListClocks::RefreshItem(QListViewItem *item, } -void ListClocks::UpdateItem(QListViewItem *item,QString name) +void ListClocks::UpdateItem(Q3ListViewItem *item,QString name) { QString sql=QString("select ")+ "NAME,"+ // 00 @@ -540,7 +544,7 @@ void ListClocks::UpdateItem(QListViewItem *item,QString name) } -void ListClocks::WriteItem(QListViewItem *item,RDSqlQuery *q) +void ListClocks::WriteItem(Q3ListViewItem *item,RDSqlQuery *q) { QPixmap *pix; QPainter *p=new QPainter(); @@ -574,7 +578,7 @@ int ListClocks::ActiveClocks(QString clockname,QString *svc_list) } } delete q; - for(unsigned i=0;i #include #include -#include +#include #include +//Added by qt3to4: +#include +#include #include #include @@ -47,7 +50,7 @@ class ListClocks : public QDialog void editData(); void deleteData(); void renameData(); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void filterActivatedData(int id); void closeData(); void clearData(); @@ -60,14 +63,14 @@ class ListClocks : public QDialog private: void RefreshList(); - void RefreshItem(QListViewItem *item,std::vector *new_clocks=NULL); - void UpdateItem(QListViewItem *item,QString name); - void WriteItem(QListViewItem *item,RDSqlQuery *q); + void RefreshItem(Q3ListViewItem *item,std::vector *new_clocks=NULL); + void UpdateItem(Q3ListViewItem *item,QString name); + void WriteItem(Q3ListViewItem *item,RDSqlQuery *q); int ActiveClocks(QString clockname,QString *svc_list); void DeleteClock(QString clockname); QString GetClockFilter(QString svc_name); QString GetNoneFilter(); - QListView *edit_clocks_list; + Q3ListView *edit_clocks_list; QString *edit_clockname; QLabel *edit_filter_label; QComboBox *edit_filter_box; diff --git a/rdlogmanager/list_events.cpp b/rdlogmanager/list_events.cpp index 4036d746..9f729467 100644 --- a/rdlogmanager/list_events.cpp +++ b/rdlogmanager/list_events.cpp @@ -22,9 +22,14 @@ #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -66,23 +71,23 @@ ListEvents::ListEvents(QString *eventname,QWidget *parent) edit_filter_label=new QLabel(edit_filter_box,tr("Filter:"),this); edit_filter_label->setGeometry(10,10,50,20); edit_filter_label->setFont(bold_font); - edit_filter_label->setAlignment(AlignRight|AlignVCenter); + edit_filter_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(edit_filter_box,SIGNAL(activated(int)), this,SLOT(filterActivatedData(int))); // // Events List // - edit_events_list=new QListView(this); + edit_events_list=new Q3ListView(this); edit_events_list->setAllColumnsShowFocus(true); edit_events_list->setItemMargin(5); edit_events_list->addColumn(tr("Name")); edit_events_list->addColumn(tr("Properties")); edit_events_list->addColumn(tr("Color")); - edit_events_list->setColumnAlignment(2,AlignCenter); + edit_events_list->setColumnAlignment(2,Qt::AlignCenter); connect(edit_events_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), - this,SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), + this,SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); // // Add Button @@ -251,7 +256,7 @@ void ListEvents::addData() } } delete event_dialog; - QListViewItem *item=new QListViewItem(edit_events_list); + Q3ListViewItem *item=new Q3ListViewItem(edit_events_list); item->setText(0,logname); RefreshItem(item,&new_events); edit_events_list->setSelected(item,true); @@ -263,7 +268,7 @@ void ListEvents::editData() { std::vector new_events; - QListViewItem *item=edit_events_list->selectedItem(); + Q3ListViewItem *item=edit_events_list->selectedItem(); if(item==NULL) { return; } @@ -282,7 +287,7 @@ void ListEvents::deleteData() int n; QString clock_list; - QListViewItem *item=edit_events_list->selectedItem(); + Q3ListViewItem *item=edit_events_list->selectedItem(); if(item==NULL) { return; } @@ -316,7 +321,7 @@ void ListEvents::renameData() RDSqlQuery *q; RDSqlQuery *q1; QString clock_name_esc; - QListViewItem *item=edit_events_list->selectedItem(); + Q3ListViewItem *item=edit_events_list->selectedItem(); if(item==NULL) { return; } @@ -383,7 +388,7 @@ void ListEvents::filterActivatedData(int id) } -void ListEvents::doubleClickedData(QListViewItem *item,const QPoint &,int) +void ListEvents::doubleClickedData(Q3ListViewItem *item,const QPoint &,int) { if(edit_eventname==NULL) { editData(); @@ -402,7 +407,7 @@ void ListEvents::closeData() void ListEvents::okData() { - QListViewItem *item=edit_events_list->selectedItem(); + Q3ListViewItem *item=edit_events_list->selectedItem(); *event_filter=edit_filter_box->currentText(); if(item==NULL) { done(-1); @@ -456,25 +461,25 @@ void ListEvents::RefreshList() QString sql=QString().sprintf("select NAME,PROPERTIES,COLOR from EVENTS %s", (const char *)filter); RDSqlQuery *q=new RDSqlQuery(sql); - QListViewItem *item=NULL; + Q3ListViewItem *item=NULL; while(q->next()) { - item=new QListViewItem(edit_events_list); + item=new Q3ListViewItem(edit_events_list); WriteItem(item,q); } delete q; } -void ListEvents::RefreshItem(QListViewItem *item, +void ListEvents::RefreshItem(Q3ListViewItem *item, std::vector *new_events) { - QListViewItem *new_item; + Q3ListViewItem *new_item; UpdateItem(item,item->text(0)); if(new_events!=NULL) { for(unsigned i=0;isize();i++) { if((new_item=edit_events_list->findItem(new_events->at(i),0))==NULL) { - new_item=new QListViewItem(edit_events_list); + new_item=new Q3ListViewItem(edit_events_list); } UpdateItem(new_item,new_events->at(i)); } @@ -482,7 +487,7 @@ void ListEvents::RefreshItem(QListViewItem *item, } -void ListEvents::UpdateItem(QListViewItem *item,QString name) +void ListEvents::UpdateItem(Q3ListViewItem *item,QString name) { QString sql=QString().sprintf("select NAME,PROPERTIES,COLOR from EVENTS\ where NAME=\"%s\"",(const char *)name); @@ -495,7 +500,7 @@ void ListEvents::UpdateItem(QListViewItem *item,QString name) } -void ListEvents::WriteItem(QListViewItem *item,RDSqlQuery *q) +void ListEvents::WriteItem(Q3ListViewItem *item,RDSqlQuery *q) { QPixmap *pix; QPainter *p=new QPainter(); diff --git a/rdlogmanager/list_events.h b/rdlogmanager/list_events.h index 99c57aad..e56e30c7 100644 --- a/rdlogmanager/list_events.h +++ b/rdlogmanager/list_events.h @@ -27,8 +27,11 @@ #include #include #include -#include +#include #include +//Added by qt3to4: +#include +#include #include #include @@ -47,7 +50,7 @@ class ListEvents : public QDialog void editData(); void deleteData(); void renameData(); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void filterActivatedData(int id); void closeData(); void okData(); @@ -59,14 +62,14 @@ class ListEvents : public QDialog private: void RefreshList(); - void RefreshItem(QListViewItem *item,std::vector *new_events=NULL); - void UpdateItem(QListViewItem *item,QString name); - void WriteItem(QListViewItem *item,RDSqlQuery *q); + void RefreshItem(Q3ListViewItem *item,std::vector *new_events=NULL); + void UpdateItem(Q3ListViewItem *item,QString name); + void WriteItem(Q3ListViewItem *item,RDSqlQuery *q); int ActiveEvents(QString event_name,QString *clock_list); void DeleteEvent(QString event_name); QString GetEventFilter(QString svc_name); QString GetNoneFilter(); - QListView *edit_events_list; + Q3ListView *edit_events_list; QString *edit_eventname; QLabel *edit_filter_label; QComboBox *edit_filter_box; diff --git a/rdlogmanager/list_grids.cpp b/rdlogmanager/list_grids.cpp index 172fe783..d7a04f23 100644 --- a/rdlogmanager/list_grids.cpp +++ b/rdlogmanager/list_grids.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -56,7 +56,7 @@ ListGrids::ListGrids(QWidget *parent) // // Grids List // - edit_grids_list=new QListView(this); + edit_grids_list=new Q3ListView(this); edit_grids_list->setGeometry(10,10, sizeHint().width()-20,sizeHint().height()-80); edit_grids_list->setAllColumnsShowFocus(true); @@ -64,8 +64,8 @@ ListGrids::ListGrids(QWidget *parent) edit_grids_list->addColumn(tr("Name")); edit_grids_list->addColumn(tr("Description")); connect(edit_grids_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), - this,SLOT(doubleClickedData(QListViewItem *,const QPoint &,int))); + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), + this,SLOT(doubleClickedData(Q3ListViewItem *,const QPoint &,int))); // // Edit Button @@ -104,7 +104,7 @@ QSizePolicy ListGrids::sizePolicy() const void ListGrids::editData() { - QListViewItem *item=edit_grids_list->selectedItem(); + Q3ListViewItem *item=edit_grids_list->selectedItem(); if(item==NULL) { return; } @@ -114,7 +114,7 @@ void ListGrids::editData() } -void ListGrids::doubleClickedData(QListViewItem *item,const QPoint &,int) +void ListGrids::doubleClickedData(Q3ListViewItem *item,const QPoint &,int) { editData(); } @@ -128,14 +128,14 @@ void ListGrids::closeData() void ListGrids::RefreshList() { - QListViewItem *prev_item=edit_grids_list->selectedItem(); + Q3ListViewItem *prev_item=edit_grids_list->selectedItem(); QString sql="select NAME,DESCRIPTION from SERVICES"; edit_grids_list->clear(); RDSqlQuery *q=new RDSqlQuery(sql); - QListViewItem *item=NULL; + Q3ListViewItem *item=NULL; while(q->next()) { - item=new QListViewItem(edit_grids_list); + item=new Q3ListViewItem(edit_grids_list); item->setText(0,q->value(0).toString()); item->setText(1,q->value(1).toString()); } diff --git a/rdlogmanager/list_grids.h b/rdlogmanager/list_grids.h index 8123ed9b..daeede54 100644 --- a/rdlogmanager/list_grids.h +++ b/rdlogmanager/list_grids.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -40,12 +40,12 @@ class ListGrids : public QDialog private slots: void editData(); - void doubleClickedData(QListViewItem *,const QPoint &,int); + void doubleClickedData(Q3ListViewItem *,const QPoint &,int); void closeData(); private: void RefreshList(); - QListView *edit_grids_list; + Q3ListView *edit_grids_list; }; diff --git a/rdlogmanager/list_svcs.cpp b/rdlogmanager/list_svcs.cpp index f1b32f77..c353d7d5 100644 --- a/rdlogmanager/list_svcs.cpp +++ b/rdlogmanager/list_svcs.cpp @@ -20,6 +20,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -52,7 +54,7 @@ ListSvcs::ListSvcs(QWidget *parent) // // Log List // - list_log_list=new QListView(this); + list_log_list=new Q3ListView(this); list_log_list->setAllColumnsShowFocus(true); list_log_list->setItemMargin(5); list_log_list->addColumn(tr("SERVICE")); @@ -60,9 +62,9 @@ ListSvcs::ListSvcs(QWidget *parent) list_log_list->addColumn(tr("OLDEST REPORT")); list_log_list->setColumnAlignment(1,Qt::AlignCenter); connect(list_log_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(listDoubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(listDoubleClickedData(Q3ListViewItem *,const QPoint &,int))); // // Generate Report Button @@ -107,7 +109,7 @@ QSizePolicy ListSvcs::sizePolicy() const void ListSvcs::generateData() { - QListViewItem *item=list_log_list->selectedItem(); + Q3ListViewItem *item=list_log_list->selectedItem(); if(item==NULL) { return; } @@ -119,7 +121,7 @@ void ListSvcs::generateData() void ListSvcs::purgeData() { - QListViewItem *item=list_log_list->selectedItem(); + Q3ListViewItem *item=list_log_list->selectedItem(); if(item==NULL) { return; } @@ -130,7 +132,7 @@ void ListSvcs::purgeData() } -void ListSvcs::listDoubleClickedData(QListViewItem *item,const QPoint &pt, +void ListSvcs::listDoubleClickedData(Q3ListViewItem *item,const QPoint &pt, int c) { generateData(); @@ -155,13 +157,13 @@ void ListSvcs::resizeEvent(QResizeEvent *e) void ListSvcs::RefreshList() { RDSqlQuery *q1; - QListViewItem *item; + Q3ListViewItem *item; list_log_list->clear(); QString sql="select NAME from SERVICES order by NAME"; RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { - item=new QListViewItem(list_log_list); + item=new Q3ListViewItem(list_log_list); item->setText(0,q->value(0).toString()); sql=QString("select EVENT_DATETIME from ELR_LINES where ")+ "SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\" "+ @@ -179,7 +181,7 @@ void ListSvcs::RefreshList() } -void ListSvcs::RefreshLine(QListViewItem *item) +void ListSvcs::RefreshLine(Q3ListViewItem *item) { QString sql; RDSqlQuery *q; diff --git a/rdlogmanager/list_svcs.h b/rdlogmanager/list_svcs.h index 45753586..e9681f14 100644 --- a/rdlogmanager/list_svcs.h +++ b/rdlogmanager/list_svcs.h @@ -23,8 +23,10 @@ #include #include -#include +#include #include +//Added by qt3to4: +#include class ListSvcs : public QDialog { @@ -37,7 +39,7 @@ class ListSvcs : public QDialog private slots: void generateData(); void purgeData(); - void listDoubleClickedData(QListViewItem *item,const QPoint &pt,int c); + void listDoubleClickedData(Q3ListViewItem *item,const QPoint &pt,int c); void closeData(); protected: @@ -45,8 +47,8 @@ class ListSvcs : public QDialog private: void RefreshList(); - void RefreshLine(QListViewItem *item); - QListView *list_log_list; + void RefreshLine(Q3ListViewItem *item); + Q3ListView *list_log_list; QPushButton *list_generate_button; QPushButton *list_purge_button; QPushButton *list_close_button; diff --git a/rdlogmanager/pick_report_dates.cpp b/rdlogmanager/pick_report_dates.cpp index 1b54bbd1..d5a7931f 100644 --- a/rdlogmanager/pick_report_dates.cpp +++ b/rdlogmanager/pick_report_dates.cpp @@ -67,7 +67,7 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent) QLabel *label=new QLabel(edit_report_box,tr("&Report:"),this); label->setGeometry(10,11,60,19); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); sql=QString("select REPORT_NAME from REPORT_SERVICES where ")+ "SERVICE_NAME=\""+RDEscapeString(svcname)+"\" "+ "order by REPORT_NAME"; @@ -80,13 +80,13 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent) // // Start Date // - edit_startdate_edit=new QDateEdit(this); + edit_startdate_edit=new Q3DateEdit(this); edit_startdate_edit->setGeometry(150,35,100,22); edit_startdate_edit->setDate(yesterday_date); label=new QLabel(edit_startdate_edit,tr("&Start Date:"),this); label->setGeometry(75,36,70,19); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); QPushButton *button=new QPushButton(this); button->setGeometry(260,33,50,27); button->setFont(font); @@ -96,13 +96,13 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent) // // End Date // - edit_enddate_edit=new QDateEdit(this); + edit_enddate_edit=new Q3DateEdit(this); edit_enddate_edit->setGeometry(150,65,100,22); edit_enddate_edit->setDate(yesterday_date); label=new QLabel(edit_enddate_edit,tr("&End Date:"),this); label->setGeometry(75,66,70,19); label->setFont(bold_font); - label->setAlignment(AlignRight|AlignVCenter|ShowPrefix); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); button=new QPushButton(this); button->setGeometry(260,63,50,27); button->setFont(font); diff --git a/rdlogmanager/pick_report_dates.h b/rdlogmanager/pick_report_dates.h index 377c24c9..064f0fe5 100644 --- a/rdlogmanager/pick_report_dates.h +++ b/rdlogmanager/pick_report_dates.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include class PickReportDates : public QDialog { @@ -43,8 +43,8 @@ class PickReportDates : public QDialog private: QComboBox *edit_report_box; - QDateEdit *edit_startdate_edit; - QDateEdit *edit_enddate_edit; + Q3DateEdit *edit_startdate_edit; + Q3DateEdit *edit_enddate_edit; QString edit_svcname; }; diff --git a/rdlogmanager/rdlogmanager.cpp b/rdlogmanager/rdlogmanager.cpp index 44a3ca3a..8649a8af 100644 --- a/rdlogmanager/rdlogmanager.cpp +++ b/rdlogmanager/rdlogmanager.cpp @@ -29,15 +29,17 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -164,11 +166,11 @@ MainWidget::MainWidget(QWidget *parent) QLabel *label=new QLabel(tr("RDLogManager"),this); label->setGeometry(0,5,sizeHint().width(),32); label->setFont(label_font); - label->setAlignment(AlignHCenter); + label->setAlignment(Qt::AlignHCenter); label=new QLabel(tr("Select an operation:"),this); label->setGeometry(0,25,sizeHint().width(),16); label->setFont(day_font); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); // // Edit Events Button @@ -326,7 +328,7 @@ int gui_main(int argc,char *argv[]) qt_path=tr_path; #else tr_path=QString(PREFIX)+QString("/share/rivendell/"); - qt_path=QString(QTDIR)+QString("/translation/"); + qt_path=QString("/usr/share/qt4/translation/"); #endif // WIN32 QTranslator qt(0); qt.load(qt_path+QString("qt_")+QTextCodec::locale(),"."); diff --git a/rdlogmanager/rdlogmanager.h b/rdlogmanager/rdlogmanager.h index a5e83ca1..cbac0de8 100644 --- a/rdlogmanager/rdlogmanager.h +++ b/rdlogmanager/rdlogmanager.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/rdlogmanager/rdlogmanager_cs.ts b/rdlogmanager/rdlogmanager_cs.ts index 0eb4fb48..c98e7f5c 100644 --- a/rdlogmanager/rdlogmanager_cs.ts +++ b/rdlogmanager/rdlogmanager_cs.ts @@ -1,4 +1,6 @@ - + + + AddClock @@ -231,35 +233,35 @@ Chcete je uložit? CART - VOZÍK + VOZÍK GROUP - SKUPINA + SKUPINA LENGTH - DÉLKA + DÉLKA TITLE - NÁZEV + NÁZEV ARTIST - UMĚLEC + UMĚLEC START - ZAČÁTEK + ZAČÁTEK END - KONEC + KONEC TYPE - TYP + TYP ALL @@ -343,11 +345,11 @@ Chcete je uložit? TRANSITION - PŘECHOD + PŘECHOD COUNT - POČÍTADLO + POČÍTADLO None @@ -541,6 +543,46 @@ Chcete ji přepsat? Timed(Wait) + + Cart + + + + Group + + + + Length + Délka + + + Title + + + + Artist + + + + Start + Začátek + + + End + Konec + + + Type + + + + Transition + + + + Count + Počet + EditEventLine diff --git a/rdlogmanager/rdlogmanager_de.ts b/rdlogmanager/rdlogmanager_de.ts index 861f7aa9..6721f821 100644 --- a/rdlogmanager/rdlogmanager_de.ts +++ b/rdlogmanager/rdlogmanager_de.ts @@ -1,4 +1,6 @@ - + + + AddClock @@ -231,35 +233,35 @@ Wollen Sie sie speichern? CART - CART + CART GROUP - GRUPPE + GRUPPE LENGTH - LÄNGE + LÄNGE TITLE - TITEL + TITEL ARTIST - KÜNSTLER + KÜNSTLER START - START + START END - ENDE + ENDE TYPE - TYP + TYP ALL @@ -343,11 +345,11 @@ Wollen Sie sie speichern? TRANSITION - ÜBERGANG + ÜBERGANG COUNT - ZÄHLER + ZÄHLER None @@ -541,6 +543,46 @@ Wollen Sie es überschreiben? Timed(Wait) + + Cart + + + + Group + + + + Length + Länge + + + Title + + + + Artist + + + + Start + Start + + + End + Ende + + + Type + + + + Transition + + + + Count + Zähler + EditEventLine diff --git a/rdlogmanager/rdlogmanager_es.ts b/rdlogmanager/rdlogmanager_es.ts index 92f0295b..d40a747b 100644 --- a/rdlogmanager/rdlogmanager_es.ts +++ b/rdlogmanager/rdlogmanager_es.ts @@ -1,4 +1,6 @@ - + + + AddClock @@ -233,35 +235,35 @@ horario CART - CARTUCHO + CARTUCHO GROUP - GRUPO + GRUPO LENGTH - DURACIÓN + DURACIÓN TITLE - TÍTULO + TÍTULO ARTIST - ARTISTA + ARTISTA START - INICIO + INICIO END - FIN + FIN TYPE - TIPO + TIPO ALL @@ -337,11 +339,11 @@ horario TRANSITION - TRANSICIÓN + TRANSICIÓN COUNT - CUENTA + CUENTA None @@ -543,6 +545,46 @@ Do you want to overwrite it? Timed(Wait) + + Cart + + + + Group + + + + Length + Duración + + + Title + + + + Artist + + + + Start + Inicio + + + End + Fin + + + Type + + + + Transition + + + + Count + Cuenta + EditEventLine diff --git a/rdlogmanager/rdlogmanager_fr.ts b/rdlogmanager/rdlogmanager_fr.ts index cae92f98..84d55641 100644 --- a/rdlogmanager/rdlogmanager_fr.ts +++ b/rdlogmanager/rdlogmanager_fr.ts @@ -1,4 +1,6 @@ - + + + AddClock @@ -217,38 +219,6 @@ Do you want to save? Macros Only - - CART - - - - GROUP - - - - LENGTH - - - - TITLE - - - - ARTIST - - - - START - - - - END - - - - TYPE - - ALL @@ -329,14 +299,6 @@ Do you want to save? Use Timescaling - - TRANSITION - - - - COUNT - - None @@ -523,6 +485,46 @@ Do you want to overwrite it? Timed(Wait) + + Cart + + + + Group + + + + Length + + + + Title + + + + Artist + + + + Start + + + + End + + + + Type + + + + Transition + + + + Count + + EditEventLine diff --git a/rdlogmanager/rdlogmanager_nb.ts b/rdlogmanager/rdlogmanager_nb.ts index 3374dd35..d47e8b77 100644 --- a/rdlogmanager/rdlogmanager_nb.ts +++ b/rdlogmanager/rdlogmanager_nb.ts @@ -1,4 +1,6 @@ - + + + AddClock @@ -232,35 +234,35 @@ Vil du lagra? CART - KORG + KORG GROUP - GRUPPE + GRUPPE LENGTH - LENGD + LENGD TITLE - TITTEL + TITTEL ARTIST - ARTIST + ARTIST START - START + START END - SLUTT + SLUTT TYPE - TYPE + TYPE ALL @@ -348,11 +350,11 @@ Vil du lagra? TRANSITION - OVERGANG + OVERGANG COUNT - TELLING + TELLING None @@ -550,6 +552,46 @@ Vil du byta henne ut? Timed(Wait) + + Cart + + + + Group + + + + Length + Lengd + + + Title + + + + Artist + + + + Start + Start + + + End + Slutt + + + Type + + + + Transition + + + + Count + Tellign + EditEventLine diff --git a/rdlogmanager/rdlogmanager_nn.ts b/rdlogmanager/rdlogmanager_nn.ts index 3374dd35..d47e8b77 100644 --- a/rdlogmanager/rdlogmanager_nn.ts +++ b/rdlogmanager/rdlogmanager_nn.ts @@ -1,4 +1,6 @@ - + + + AddClock @@ -232,35 +234,35 @@ Vil du lagra? CART - KORG + KORG GROUP - GRUPPE + GRUPPE LENGTH - LENGD + LENGD TITLE - TITTEL + TITTEL ARTIST - ARTIST + ARTIST START - START + START END - SLUTT + SLUTT TYPE - TYPE + TYPE ALL @@ -348,11 +350,11 @@ Vil du lagra? TRANSITION - OVERGANG + OVERGANG COUNT - TELLING + TELLING None @@ -550,6 +552,46 @@ Vil du byta henne ut? Timed(Wait) + + Cart + + + + Group + + + + Length + Lengd + + + Title + + + + Artist + + + + Start + Start + + + End + Slutt + + + Type + + + + Transition + + + + Count + Tellign + EditEventLine diff --git a/rdlogmanager/rdlogmanager_pt_BR.ts b/rdlogmanager/rdlogmanager_pt_BR.ts index de23820c..5e285799 100644 --- a/rdlogmanager/rdlogmanager_pt_BR.ts +++ b/rdlogmanager/rdlogmanager_pt_BR.ts @@ -1,4 +1,6 @@ - + + + AddClock @@ -233,35 +235,35 @@ Você quer salvar? CART - CARTÃO + CARTÃO GROUP - GRUPO + GRUPO LENGTH - DURAÇÃO + DURAÇÃO TITLE - TÍTULO + TÍTULO ARTIST - ARTISTA + ARTISTA START - INÍCIO + INÍCIO END - TÉRMINO + TÉRMINO TYPE - TIPO + TIPO REMARKS @@ -353,11 +355,11 @@ Você quer salvar? TRANSITION - TRANSIÇÃO + TRANSIÇÃO COUNT - CONTADOR + CONTADOR None @@ -543,6 +545,46 @@ Você quer sobreescrêve-lo? Timed(Wait) + + Cart + + + + Group + + + + Length + Duração + + + Title + + + + Artist + + + + Start + Início + + + End + Fim + + + Type + + + + Transition + + + + Count + Contador + EditEventLine diff --git a/rdlogmanager/rename_item.cpp b/rdlogmanager/rename_item.cpp index 22507e09..e7b66f29 100644 --- a/rdlogmanager/rename_item.cpp +++ b/rdlogmanager/rename_item.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/rdlogmanager/svc_rec.cpp b/rdlogmanager/svc_rec.cpp index 6b2fac62..b259195e 100644 --- a/rdlogmanager/svc_rec.cpp +++ b/rdlogmanager/svc_rec.cpp @@ -22,6 +22,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -98,44 +100,44 @@ SvcRec::SvcRec(const QString &svcname,QWidget *parent) QLabel *label=new QLabel(tr("Mo"),this); label->setGeometry(SVC_REC_X_ORIGIN,30,30,30); label->setFont(pick_day_font[1]); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label=new QLabel(tr("Tu"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label=new QLabel(tr("We"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*2, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label=new QLabel(tr("Th"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*3, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label=new QLabel(tr("Fr"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*4, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label=new QLabel(tr("Sa"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*5, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label->setPalette(weekend_palette); label=new QLabel(tr("Su"),this); label->setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*6, SVC_REC_Y_ORIGIN,30,30); label->setFont(pick_day_font[1]); - label->setAlignment(AlignCenter); + label->setAlignment(Qt::AlignCenter); label->setPalette(weekend_palette); @@ -145,7 +147,7 @@ SvcRec::SvcRec(const QString &svcname,QWidget *parent) pick_date_label[i][j]-> setGeometry(SVC_REC_X_ORIGIN+SVC_REC_X_INTERVAL*j, SVC_REC_Y_ORIGIN+20+SVC_REC_Y_INTERVAL*i,30,30); - pick_date_label[i][j]->setAlignment(AlignCenter); + pick_date_label[i][j]->setAlignment(Qt::AlignCenter); } } PrintDays(); diff --git a/rdlogmanager/svc_rec.h b/rdlogmanager/svc_rec.h index 877b60aa..2a3c9a4c 100644 --- a/rdlogmanager/svc_rec.h +++ b/rdlogmanager/svc_rec.h @@ -31,6 +31,8 @@ #include #include #include +//Added by qt3to4: +#include // // Display Settings diff --git a/rdmonitor/Makefile.am b/rdmonitor/Makefile.am index 50a5408d..6d56d071 100644 --- a/rdmonitor/Makefile.am +++ b/rdmonitor/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/rdmonitor -## -## (C) Copyright 2012,2016 Fred Gleason +## (C) Copyright 2012,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +18,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,19 +35,18 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdmonitor_*.qm all: - @QT_BIN@/lupdate rdmonitor.pro - @QT_BIN@/lrelease rdmonitor.pro + lupdate-qt4 rdmonitor.pro + lrelease-qt4 rdmonitor.pro bin_PROGRAMS = rdmonitor dist_rdmonitor_SOURCES = positiondialog.cpp positiondialog.h\ - rdmonitor.cpp rdmonitor.h\ - status_tip.cpp status_tip.h + rdmonitor.cpp rdmonitor.h nodist_rdmonitor_SOURCES = moc_positiondialog.cpp\ moc_rdmonitor.cpp -rdmonitor_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdmonitor_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdmonitor.pro\ rdmonitor_cs.ts\ diff --git a/rdmonitor/positiondialog.cpp b/rdmonitor/positiondialog.cpp index befed819..56ae04a8 100644 --- a/rdmonitor/positiondialog.cpp +++ b/rdmonitor/positiondialog.cpp @@ -19,6 +19,10 @@ // #include "positiondialog.h" +//Added by qt3to4: +#include +#include +#include PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *config, QWidget *parent) diff --git a/rdmonitor/positiondialog.h b/rdmonitor/positiondialog.h index 49cbefb4..65530863 100644 --- a/rdmonitor/positiondialog.h +++ b/rdmonitor/positiondialog.h @@ -27,6 +27,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include diff --git a/rdmonitor/rdmonitor.cpp b/rdmonitor/rdmonitor.cpp index 0f8c6927..b19a66e0 100644 --- a/rdmonitor/rdmonitor.cpp +++ b/rdmonitor/rdmonitor.cpp @@ -31,10 +31,15 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -66,7 +71,7 @@ void SigHandler(int signo) } MainWidget::MainWidget(QWidget *parent) - :QWidget(parent,"",Qt::WStyle_Customize|Qt::WStyle_NoBorder|Qt::WStyle_StaysOnTop|WX11BypassWM) + :QWidget(parent,"",Qt::WStyle_Customize|Qt::WStyle_NoBorder|Qt::WStyle_StaysOnTop|Qt::WX11BypassWM) { QString str; mon_dialog_x=0; @@ -135,7 +140,7 @@ MainWidget::MainWidget(QWidget *parent) connect(mon_validate_timer,SIGNAL(timeout()),this,SLOT(validate())); mon_validate_timer->start(5000); - mon_tooltip=new StatusTip(this); + // mon_tooltip=new StatusTip(this); mon_name_label->setText(mon_rdconfig->label()); SetPosition(); @@ -177,8 +182,8 @@ void MainWidget::validate() // // Record Results // - mon_tooltip-> - setStatus(QRect(0,0,size().width(),size().height()),db_ok,schema,snd_ok); + // mon_tooltip-> + // setStatus(QRect(0,0,size().width(),size().height()),db_ok,schema,snd_ok); SetSummaryState(db_ok&&(schema==RD_VERSION_DATABASE)&&snd_ok); SetPosition(); } @@ -192,7 +197,7 @@ void MainWidget::quitMainWidget() void MainWidget::mousePressEvent(QMouseEvent *e) { - if(e->button()!=QMouseEvent::RightButton) { + if(e->button()!=Qt::RightButton) { e->ignore(); return; } @@ -209,7 +214,7 @@ void MainWidget::mousePressEvent(QMouseEvent *e) void MainWidget::mouseDoubleClickEvent(QMouseEvent *e) { - if(e->button()!=QMouseEvent::LeftButton) { + if(e->button()!=Qt::LeftButton) { e->ignore(); return; } @@ -380,7 +385,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(), + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(), "."); a.installTranslator(&qt); diff --git a/rdmonitor/rdmonitor.h b/rdmonitor/rdmonitor.h index d85628b6..64823b0d 100644 --- a/rdmonitor/rdmonitor.h +++ b/rdmonitor/rdmonitor.h @@ -31,12 +31,16 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include #include "positiondialog.h" -#include "status_tip.h" +//#include "status_tip.h" #define RDSELECT_WIDTH 400 #define RDSELECT_HEIGHT 300 @@ -71,7 +75,7 @@ class MainWidget : public QWidget int mon_dialog_y; int mon_rdselect_x; int mon_rdselect_y; - StatusTip *mon_tooltip; + // StatusTip *mon_tooltip; QDesktopWidget *mon_desktop_widget; RDMonitorConfig *mon_config; RDConfig *mon_rdconfig; diff --git a/rdmonitor/rdmonitor_cs.ts b/rdmonitor/rdmonitor_cs.ts index 094e296f..481d9429 100644 --- a/rdmonitor/rdmonitor_cs.ts +++ b/rdmonitor/rdmonitor_cs.ts @@ -1,4 +1,6 @@ - + + + QObject diff --git a/rdmonitor/rdmonitor_de.ts b/rdmonitor/rdmonitor_de.ts index 5ef7004e..3347096e 100644 --- a/rdmonitor/rdmonitor_de.ts +++ b/rdmonitor/rdmonitor_de.ts @@ -1,4 +1,6 @@ - + + + QObject diff --git a/rdmonitor/rdmonitor_es.ts b/rdmonitor/rdmonitor_es.ts index 5ef7004e..3347096e 100644 --- a/rdmonitor/rdmonitor_es.ts +++ b/rdmonitor/rdmonitor_es.ts @@ -1,4 +1,6 @@ - + + + QObject diff --git a/rdmonitor/rdmonitor_fr.ts b/rdmonitor/rdmonitor_fr.ts index 5ef7004e..3347096e 100644 --- a/rdmonitor/rdmonitor_fr.ts +++ b/rdmonitor/rdmonitor_fr.ts @@ -1,4 +1,6 @@ - + + + QObject diff --git a/rdmonitor/rdmonitor_nb.ts b/rdmonitor/rdmonitor_nb.ts index 5ef7004e..3347096e 100644 --- a/rdmonitor/rdmonitor_nb.ts +++ b/rdmonitor/rdmonitor_nb.ts @@ -1,4 +1,6 @@ - + + + QObject diff --git a/rdmonitor/rdmonitor_nn.ts b/rdmonitor/rdmonitor_nn.ts index 5ef7004e..3347096e 100644 --- a/rdmonitor/rdmonitor_nn.ts +++ b/rdmonitor/rdmonitor_nn.ts @@ -1,4 +1,6 @@ - + + + QObject diff --git a/rdmonitor/rdmonitor_pt_BR.ts b/rdmonitor/rdmonitor_pt_BR.ts index 5ef7004e..3347096e 100644 --- a/rdmonitor/rdmonitor_pt_BR.ts +++ b/rdmonitor/rdmonitor_pt_BR.ts @@ -1,4 +1,6 @@ - + + + QObject diff --git a/rdpanel/Makefile.am b/rdpanel/Makefile.am index 1dcc383b..477a94e2 100644 --- a/rdpanel/Makefile.am +++ b/rdpanel/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/rdpanel -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +18,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -37,8 +35,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdpanel_*.qm all: - @QT_BIN@/lupdate rdpanel.pro - @QT_BIN@/lrelease rdpanel.pro + lupdate-qt4 rdpanel.pro + lrelease-qt4 rdpanel.pro bin_PROGRAMS = rdpanel @@ -47,7 +45,7 @@ dist_rdpanel_SOURCES = globals.h\ nodist_rdpanel_SOURCES = moc_rdpanel.cpp -rdpanel_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdpanel_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdpanel.pro\ rdpanel_cs.ts\ diff --git a/rdpanel/rdpanel.cpp b/rdpanel/rdpanel.cpp index bcd31b0d..bbd14d3f 100644 --- a/rdpanel/rdpanel.cpp +++ b/rdpanel/rdpanel.cpp @@ -30,6 +30,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -202,7 +205,7 @@ MainWidget::MainWidget(QWidget *parent) panel_panel->setPauseEnabled(rda->panelConf()->panelPauseEnabled()); panel_panel->setCard(0,rda->panelConf()->card(RDAirPlayConf::SoundPanel1Channel)); panel_panel->setPort(0,rda->panelConf()->port(RDAirPlayConf::SoundPanel1Channel)); - panel_panel->setFocusPolicy(QWidget::NoFocus); + panel_panel->setFocusPolicy(Qt::NoFocus); if((card=rda->panelConf()->card(RDAirPlayConf::SoundPanel2Channel))<0) { panel_panel->setCard(1,panel_panel->card(RDAirPlayConf::MainLog1Channel)); panel_panel->setPort(1,panel_panel->port(RDAirPlayConf::MainLog1Channel)); @@ -303,7 +306,7 @@ MainWidget::MainWidget(QWidget *parent) panel_stereo_meter->sizeHint().width(), panel_stereo_meter->sizeHint().height()); panel_stereo_meter->setMode(RDSegMeter::Peak); - panel_stereo_meter->setFocusPolicy(QWidget::NoFocus); + panel_stereo_meter->setFocusPolicy(Qt::NoFocus); if(rda->config()->useStreamMeters()) { panel_stereo_meter->hide(); } @@ -419,7 +422,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(),"."); + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(),"."); a.installTranslator(&qt); QTranslator rd(0); diff --git a/rdpanel/rdpanel.h b/rdpanel/rdpanel.h index ed75569b..81abf5e4 100644 --- a/rdpanel/rdpanel.h +++ b/rdpanel/rdpanel.h @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/rdpanel/rdpanel_cs.ts b/rdpanel/rdpanel_cs.ts index 1f664c4c..ed85733f 100644 --- a/rdpanel/rdpanel_cs.ts +++ b/rdpanel/rdpanel_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdpanel/rdpanel_de.ts b/rdpanel/rdpanel_de.ts index 08751cda..9c7bb277 100644 --- a/rdpanel/rdpanel_de.ts +++ b/rdpanel/rdpanel_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdpanel/rdpanel_es.ts b/rdpanel/rdpanel_es.ts index 0d3b3207..e22f993d 100644 --- a/rdpanel/rdpanel_es.ts +++ b/rdpanel/rdpanel_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdpanel/rdpanel_fr.ts b/rdpanel/rdpanel_fr.ts index 08751cda..9c7bb277 100644 --- a/rdpanel/rdpanel_fr.ts +++ b/rdpanel/rdpanel_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdpanel/rdpanel_pt_BR.ts b/rdpanel/rdpanel_pt_BR.ts index 08751cda..9c7bb277 100644 --- a/rdpanel/rdpanel_pt_BR.ts +++ b/rdpanel/rdpanel_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdrepld/Makefile.am b/rdrepld/Makefile.am index 377b81c5..a5798808 100644 --- a/rdrepld/Makefile.am +++ b/rdrepld/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## rdrepld/ Makefile.am for Rivendell -## -## (C) Copyright 2010,2016 Fred Gleason +## (C) Copyright 2010,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +18,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # QT's Meta Object Compiler (moc) @@ -34,7 +32,7 @@ dist_rdrepld_SOURCES = rdrepld.cpp rdrepld.h \ replfactory.cpp replfactory.h\ citadelxds.cpp citadelxds.h nodist_rdrepld_SOURCES = moc_rdrepld.cpp -rdrepld_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdrepld_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~ moc_* DISTCLEANFILES = moc_* diff --git a/rdrepld/citadelxds.cpp b/rdrepld/citadelxds.cpp index 61195882..c1386e3c 100644 --- a/rdrepld/citadelxds.cpp +++ b/rdrepld/citadelxds.cpp @@ -146,9 +146,9 @@ bool CitadelXds::LoadIsciXreference(const QString &filename) // Load Records // while(fgets(line,1024,f)!=NULL) { - fields=fields.split(",",line,"\""); + fields=fields.split(',',line,"\""); if(fields.size()==9) { - for(unsigned i=0;ivalue(1).toString()); + Q3Url url(path+q->value(1).toString()); conv=new RDDelete(rda->config()); conv->setTargetUrl(url); if((conv_err=conv->runDelete(config()->urlUsername(), diff --git a/rdrepld/rdrepld.cpp b/rdrepld/rdrepld.cpp index 3fbbd712..1248f14d 100644 --- a/rdrepld/rdrepld.cpp +++ b/rdrepld/rdrepld.cpp @@ -102,9 +102,9 @@ MainObject::MainObject(QObject *parent) // repl_temp_dir=RDTempDirectory::basePath(); - connect(RDDbStatus(), - SIGNAL(logText(RDConfig::LogPriority,const QString &)), - this,SLOT(log(RDConfig::LogPriority,const QString &))); + // connect(RDDbStatus(), + // SIGNAL(logText(RDConfig::LogPriority,const QString &)), + // this,SLOT(log(RDConfig::LogPriority,const QString &))); // // Detach diff --git a/rdselect/Makefile.am b/rdselect/Makefile.am index 44ebc668..dee4049d 100644 --- a/rdselect/Makefile.am +++ b/rdselect/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/rdselect -## -## (C) Copyright 2012,2016 Fred Gleason +## (C) Copyright 2012,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +18,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -38,8 +36,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdselect_*.qm all: - @QT_BIN@/lupdate rdselect.pro - @QT_BIN@/lrelease rdselect.pro + lupdate-qt4 rdselect.pro + lrelease-qt4 rdselect.pro bin_PROGRAMS = rdselect @@ -47,7 +45,7 @@ dist_rdselect_SOURCES = rdselect.cpp rdselect.h nodist_rdselect_SOURCES = moc_rdselect.cpp -rdselect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdselect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdselect.pro\ rdselect_cs.ts\ diff --git a/rdselect/rdselect.cpp b/rdselect/rdselect.cpp index b3cff03f..62340c44 100644 --- a/rdselect/rdselect.cpp +++ b/rdselect/rdselect.cpp @@ -33,6 +33,10 @@ #include #include #include +#include +//Added by qt3to4: +#include +#include #include #include @@ -139,7 +143,7 @@ MainWidget::MainWidget(QWidget *parent) config_dir.setFilter(QDir::Files|QDir::Readable); config_dir.setNameFilter("*.conf"); select_filenames=config_dir.entryList(); - for(unsigned i=0;isetFont(label_font); - select_current_label->setAlignment(AlignCenter); + select_current_label->setAlignment(Qt::AlignCenter); // // Selector Box // - select_box=new QListBox(this); + select_box=new Q3ListBox(this); select_box->setFont(default_font); - connect(select_box,SIGNAL(doubleClicked(QListBoxItem *)), - this,SLOT(doubleClickedData(QListBoxItem *))); + connect(select_box,SIGNAL(doubleClicked(Q3ListBoxItem *)), + this,SLOT(doubleClickedData(Q3ListBoxItem *))); for(unsigned i=0;iinsertItem(select_configs[i]->label()); } @@ -216,7 +220,7 @@ QSizePolicy MainWidget::sizePolicy() const } -void MainWidget::doubleClickedData(QListBoxItem *item) +void MainWidget::doubleClickedData(Q3ListBoxItem *item) { okData(); } @@ -237,7 +241,7 @@ void MainWidget::okData() SetSystem(-1); QMessageBox::warning(this,tr("RDSelect"), tr("Unable to shutdown current configuration")+ - "\n["+strerror(errno)+"]."); + "\n["+QString(strerror(errno))+"]."); return; } if(!Startup(select_box->currentItem())) { @@ -353,7 +357,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(), + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(), "."); a.installTranslator(&qt); diff --git a/rdselect/rdselect.h b/rdselect/rdselect.h index 99e76d1d..6076f426 100644 --- a/rdselect/rdselect.h +++ b/rdselect/rdselect.h @@ -26,11 +26,13 @@ #include #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include #include #include @@ -44,7 +46,7 @@ class MainWidget : public QWidget QSizePolicy sizePolicy() const; private slots: - void doubleClickedData(QListBoxItem *item); + void doubleClickedData(Q3ListBoxItem *item); void okData(); void cancelData(); @@ -62,7 +64,7 @@ class MainWidget : public QWidget int select_current_id; QLabel *select_current_label; QLabel *select_label; - QListBox *select_box; + Q3ListBox *select_box; QPixmap *login_rivendell_map; QPushButton *ok_button; QPushButton *cancel_button; diff --git a/rdselect/rdselect_cs.ts b/rdselect/rdselect_cs.ts index 634d4b37..54892ed6 100644 --- a/rdselect/rdselect_cs.ts +++ b/rdselect/rdselect_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_de.ts b/rdselect/rdselect_de.ts index 89d1be35..781d5fa3 100644 --- a/rdselect/rdselect_de.ts +++ b/rdselect/rdselect_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_es.ts b/rdselect/rdselect_es.ts index 89d1be35..781d5fa3 100644 --- a/rdselect/rdselect_es.ts +++ b/rdselect/rdselect_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_fr.ts b/rdselect/rdselect_fr.ts index 89d1be35..781d5fa3 100644 --- a/rdselect/rdselect_fr.ts +++ b/rdselect/rdselect_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_nb.ts b/rdselect/rdselect_nb.ts index 89d1be35..781d5fa3 100644 --- a/rdselect/rdselect_nb.ts +++ b/rdselect/rdselect_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_nn.ts b/rdselect/rdselect_nn.ts index 89d1be35..781d5fa3 100644 --- a/rdselect/rdselect_nn.ts +++ b/rdselect/rdselect_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_pt_BR.ts b/rdselect/rdselect_pt_BR.ts index 89d1be35..781d5fa3 100644 --- a/rdselect/rdselect_pt_BR.ts +++ b/rdselect/rdselect_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdvairplayd/Makefile.am b/rdvairplayd/Makefile.am index c69f9ac3..795922ae 100644 --- a/rdvairplayd/Makefile.am +++ b/rdvairplayd/Makefile.am @@ -1,7 +1,5 @@ ## Makefile.am ## -## Makefile for rdvairplayd(8) -## ## (C) Copyright 2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -34,7 +32,7 @@ dist_rdvairplayd_SOURCES = local_macros.cpp\ nodist_rdvairplayd_SOURCES = moc_rdvairplayd.cpp -rdvairplayd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdvairplayd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/rdvairplayd/rdvairplayd.cpp b/rdvairplayd/rdvairplayd.cpp index 2cc1d8d9..eb67c43a 100644 --- a/rdvairplayd/rdvairplayd.cpp +++ b/rdvairplayd/rdvairplayd.cpp @@ -119,7 +119,7 @@ MainObject::MainObject(QObject *parent) // // UDP Transmission Socket // - air_nownext_socket=new QSocketDevice(QSocketDevice::Datagram); + air_nownext_socket=new Q3SocketDevice(Q3SocketDevice::Datagram); // // Log Machines diff --git a/rdvairplayd/rdvairplayd.h b/rdvairplayd/rdvairplayd.h index 373e472f..892e994f 100644 --- a/rdvairplayd/rdvairplayd.h +++ b/rdvairplayd/rdvairplayd.h @@ -22,7 +22,7 @@ #define RDVAIRPLAYD_H #include -#include +#include #include #include @@ -56,7 +56,7 @@ class MainObject : public QObject bool air_start_starts[RD_RDVAIRPLAY_LOG_QUAN]; std::vector air_plugin_hosts; RDEventPlayer *air_event_player; - QSocketDevice *air_nownext_socket; + Q3SocketDevice *air_nownext_socket; QDateTime air_startup_datetime; RDAirPlayConf::ExitCode air_previous_exit_code; QTimer *air_exit_timer; diff --git a/ripcd/Makefile.am b/ripcd/Makefile.am index 0353209d..fb1d5823 100644 --- a/ripcd/Makefile.am +++ b/ripcd/Makefile.am @@ -1,4 +1,4 @@ -## automake.am +## Makefile.am ## ## Rivendell Interprocess Communication Daemon Makefile.am ## @@ -20,8 +20,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -126,7 +126,7 @@ nodist_ripcd_SOURCES = moc_am16.cpp\ moc_wheatnet_lio.cpp\ moc_wheatnet_slio.cpp -ripcd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +ripcd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = ripcd.pro diff --git a/ripcd/acu1p.cpp b/ripcd/acu1p.cpp index d60f3de0..67791cb1 100644 --- a/ripcd/acu1p.cpp +++ b/ripcd/acu1p.cpp @@ -49,9 +49,9 @@ Acu1p::Acu1p(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } - bt_notify=new QSocketNotifier(bt_device->socket(),QSocketNotifier::Read,this); + bt_notify=new QSocketNotifier(bt_device->fileDescriptor(),QSocketNotifier::Read,this); connect(bt_notify,SIGNAL(activated(int)),this,SLOT(readyReadData(int))); delete tty; diff --git a/ripcd/bt10x1.cpp b/ripcd/bt10x1.cpp index f54003e2..127db14a 100644 --- a/ripcd/bt10x1.cpp +++ b/ripcd/bt10x1.cpp @@ -44,7 +44,7 @@ Bt10x1::Bt10x1(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; } diff --git a/ripcd/bt16x1.cpp b/ripcd/bt16x1.cpp index 426d710e..17e5333f 100644 --- a/ripcd/bt16x1.cpp +++ b/ripcd/bt16x1.cpp @@ -44,7 +44,7 @@ Bt16x1::Bt16x1(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; } diff --git a/ripcd/bt16x2.cpp b/ripcd/bt16x2.cpp index 5a7f2c64..be9c5b85 100644 --- a/ripcd/bt16x2.cpp +++ b/ripcd/bt16x2.cpp @@ -58,7 +58,7 @@ Bt16x2::Bt16x2(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/bt8x2.cpp b/ripcd/bt8x2.cpp index 9fc2afa2..dda4ec4e 100644 --- a/ripcd/bt8x2.cpp +++ b/ripcd/bt8x2.cpp @@ -44,7 +44,7 @@ Bt8x2::Bt8x2(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; } diff --git a/ripcd/btacs82.cpp b/ripcd/btacs82.cpp index 88b79163..916390da 100644 --- a/ripcd/btacs82.cpp +++ b/ripcd/btacs82.cpp @@ -58,7 +58,7 @@ BtAcs82::BtAcs82(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/btadms4422.cpp b/ripcd/btadms4422.cpp index cad397eb..108a5b78 100644 --- a/ripcd/btadms4422.cpp +++ b/ripcd/btadms4422.cpp @@ -58,7 +58,7 @@ BtAdms4422::BtAdms4422(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - if(bt_device->open(IO_Raw|IO_ReadWrite)) { + if(bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite)) { // Set Mix Mode bt_device-> writeBlock(QString().sprintf("*%uUM0\r\n",BTADMS4422_UNIT_ID),7); diff --git a/ripcd/btgpi16.cpp b/ripcd/btgpi16.cpp index 5cd6a5f1..ed0bc661 100644 --- a/ripcd/btgpi16.cpp +++ b/ripcd/btgpi16.cpp @@ -55,7 +55,7 @@ BtGpi16::BtGpi16(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - if(!bt_device->open(IO_Raw|IO_ReadWrite)) { + if(!bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite)) { LogLine(RDConfig::LogWarning,"unable to open serial device \""+tty->port()+"\"."); } } diff --git a/ripcd/btsentinel4web.cpp b/ripcd/btsentinel4web.cpp index 4ac001c5..8a88b569 100644 --- a/ripcd/btsentinel4web.cpp +++ b/ripcd/btsentinel4web.cpp @@ -35,7 +35,7 @@ BtSentinel4Web::BtSentinel4Web(RDMatrix *matrix,QObject *parent) // // Socket // - bt_socket=new QSocket(this); + bt_socket=new Q3Socket(this); connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(bt_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); @@ -166,7 +166,7 @@ void BtSentinel4Web::watchdogData() void BtSentinel4Web::watchdogResetData() { delete bt_socket; - bt_socket=new QSocket(this); + bt_socket=new Q3Socket(this); connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(bt_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); diff --git a/ripcd/btsentinel4web.h b/ripcd/btsentinel4web.h index 8ebd3a82..2b30030c 100644 --- a/ripcd/btsentinel4web.h +++ b/ripcd/btsentinel4web.h @@ -25,7 +25,7 @@ #include -#include +#include #include #include @@ -62,7 +62,7 @@ class BtSentinel4Web : public Switcher void watchdogResetData(); private: - QSocket *bt_socket; + Q3Socket *bt_socket; QHostAddress bt_address; uint16_t bt_port; QTimer *bt_watchdog_timer; diff --git a/ripcd/btsrc16.cpp b/ripcd/btsrc16.cpp index 2116eb31..f4d2e052 100644 --- a/ripcd/btsrc16.cpp +++ b/ripcd/btsrc16.cpp @@ -56,7 +56,7 @@ BtSrc16::BtSrc16(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/btsrc8iii.cpp b/ripcd/btsrc8iii.cpp index 6a84d286..fb4ddfd2 100644 --- a/ripcd/btsrc8iii.cpp +++ b/ripcd/btsrc8iii.cpp @@ -56,7 +56,7 @@ BtSrc8Iii::BtSrc8Iii(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/btss124.cpp b/ripcd/btss124.cpp index 6356fa44..c8b4195a 100644 --- a/ripcd/btss124.cpp +++ b/ripcd/btss124.cpp @@ -47,7 +47,7 @@ BtSs124::BtSs124(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; } diff --git a/ripcd/btss164.cpp b/ripcd/btss164.cpp index 54474bd2..0a19af01 100644 --- a/ripcd/btss164.cpp +++ b/ripcd/btss164.cpp @@ -58,7 +58,7 @@ BtSs164::BtSs164(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/btss41mlr.cpp b/ripcd/btss41mlr.cpp index 4deff7bf..652ac9f5 100644 --- a/ripcd/btss41mlr.cpp +++ b/ripcd/btss41mlr.cpp @@ -59,7 +59,7 @@ BtSs41Mlr::BtSs41Mlr(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/btss42.cpp b/ripcd/btss42.cpp index 3e67b2bd..cd5dced3 100644 --- a/ripcd/btss42.cpp +++ b/ripcd/btss42.cpp @@ -58,7 +58,7 @@ BtSs42::BtSs42(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/btss44.cpp b/ripcd/btss44.cpp index d9b897e0..979de6ce 100644 --- a/ripcd/btss44.cpp +++ b/ripcd/btss44.cpp @@ -58,7 +58,7 @@ BtSs44::BtSs44(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/btss82.cpp b/ripcd/btss82.cpp index 658d21e1..c6c7e71b 100644 --- a/ripcd/btss82.cpp +++ b/ripcd/btss82.cpp @@ -58,7 +58,7 @@ BtSs82::BtSs82(RDMatrix *matrix,QObject *parent) bt_device->setSpeed(tty->baudRate()); bt_device->setWordLength(tty->dataBits()); bt_device->setParity(tty->parity()); - bt_device->open(IO_Raw|IO_ReadWrite); + bt_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/btu41mlrweb.cpp b/ripcd/btu41mlrweb.cpp index 2f6a5f19..52e51822 100644 --- a/ripcd/btu41mlrweb.cpp +++ b/ripcd/btu41mlrweb.cpp @@ -34,7 +34,7 @@ BtU41MlrWeb::BtU41MlrWeb(RDMatrix *matrix,QObject *parent) bt_gpi_states[i]=false; } - bt_socket=new QSocket(this); + bt_socket=new Q3Socket(this); connect(bt_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(bt_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); connect(bt_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); diff --git a/ripcd/btu41mlrweb.h b/ripcd/btu41mlrweb.h index 8e464eb2..5572903d 100644 --- a/ripcd/btu41mlrweb.h +++ b/ripcd/btu41mlrweb.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -63,7 +63,7 @@ class BtU41MlrWeb : public Switcher private: void ProcessCommand(const QString &cmd); void SendCommand(const QString &cmd); - QSocket *bt_socket; + Q3Socket *bt_socket; QTimer *bt_watchdog_timer; bool bt_watchdog_active; QHostAddress bt_ip_address; diff --git a/ripcd/harlond.cpp b/ripcd/harlond.cpp index e0551552..71ef6a9e 100644 --- a/ripcd/harlond.cpp +++ b/ripcd/harlond.cpp @@ -56,7 +56,7 @@ Harlond::Harlond(RDMatrix *matrix,QObject *parent) // // Initialize TCP/IP Connection // - bt_socket=new QSocket(this); + bt_socket=new Q3Socket(this); connect(bt_socket,SIGNAL(connected()),this,SLOT(socketConnectedData())); connect(bt_socket,SIGNAL(disconnected()),this,SLOT(socketDisconnectedData())); connect(bt_socket,SIGNAL(readyRead()),this,SLOT(socketReadyReadData())); @@ -233,7 +233,7 @@ void Harlond::socketErrorData(int err) { bt_watchdog_timer->start(HARLOND_RECONNECT_INTERVAL,true); switch(err) { - case QSocket::ErrConnectionRefused: + case Q3Socket::ErrConnectionRefused: LogLine(RDConfig::LogWarning,tr("connection to harlond device at ")+ bt_ip_address.toString()+QString().sprintf(":%d ",bt_tcp_port)+ tr("refused, attempting reconnect")); @@ -251,7 +251,7 @@ void Harlond::socketErrorData(int err) void Harlond::watchdogTimeoutData() { - if(bt_socket->state()!=QSocket::Connected) { + if(bt_socket->state()!=Q3Socket::Connected) { bt_socket->connectToHost(bt_ip_address.toString(),bt_tcp_port); } } diff --git a/ripcd/harlond.h b/ripcd/harlond.h index f4612ad4..8883924b 100644 --- a/ripcd/harlond.h +++ b/ripcd/harlond.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include @@ -68,7 +68,7 @@ class Harlond : public Switcher bool AddCrosspoint(int input,int output); bool RemoveCrosspoint(int input,int output); QString GetBussCode(int output); - QSocket *bt_socket; + Q3Socket *bt_socket; QString bt_recv_buffer; QTimer *bt_watchdog_timer; QHostAddress bt_ip_address; diff --git a/ripcd/livewire_lwrpaudio.h b/ripcd/livewire_lwrpaudio.h index 6559fe94..5167d568 100644 --- a/ripcd/livewire_lwrpaudio.h +++ b/ripcd/livewire_lwrpaudio.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/ripcd/livewire_lwrpgpio.h b/ripcd/livewire_lwrpgpio.h index 6fc58686..83a0dd77 100644 --- a/ripcd/livewire_lwrpgpio.h +++ b/ripcd/livewire_lwrpgpio.h @@ -26,7 +26,7 @@ #include -#include +#include #include #include #include diff --git a/ripcd/livewire_mcastgpio.h b/ripcd/livewire_mcastgpio.h index fe4e2f09..6b70e87c 100644 --- a/ripcd/livewire_mcastgpio.h +++ b/ripcd/livewire_mcastgpio.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/ripcd/local_macros.cpp b/ripcd/local_macros.cpp index f0549ead..29e660c6 100644 --- a/ripcd/local_macros.cpp +++ b/ripcd/local_macros.cpp @@ -201,7 +201,7 @@ void MainObject::LoadLocalMacros() ripcd_tty_dev[tty_port]->setWordLength(q->value(3).toInt()); ripcd_tty_dev[tty_port]-> setParity((RDTTYDevice::Parity)q->value(4).toInt()); - if(ripcd_tty_dev[tty_port]->open(IO_ReadWrite)) { + if(ripcd_tty_dev[tty_port]->open(QIODevice::ReadWrite)) { ripcd_tty_term[tty_port]=(RDTty::Termination)q->value(5).toInt(); ripcd_tty_inuse[tty_port]=true; ripcd_tty_trap[tty_port]=new RDCodeTrap(this); @@ -695,7 +695,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in) break; } break; - + /* case RDMacro::SO: tty_port=rml->arg(0).toInt(); if((tty_port<0)||(tty_port>MAX_TTYS)) { @@ -736,7 +736,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in) sendRml(rml); return; break; - + */ case RDMacro::CL: case RDMacro::FS: case RDMacro::GO: @@ -809,7 +809,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in) ripcd_tty_dev[tty_port]->setWordLength(q->value(3).toInt()); ripcd_tty_dev[tty_port]-> setParity((RDTTYDevice::Parity)q->value(4).toInt()); - if(ripcd_tty_dev[tty_port]->open(IO_ReadWrite)) { + if(ripcd_tty_dev[tty_port]->open(QIODevice::ReadWrite)) { ripcd_tty_term[tty_port]=(RDTty::Termination)q->value(5).toInt(); ripcd_tty_inuse[tty_port]=true; ripcd_tty_trap[tty_port]=new RDCodeTrap(this); @@ -879,7 +879,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in) sendRml(rml); } break; - + /* case RDMacro::UO: if(rml->argQuantity()<3) { if(rml->echoRequested()) { @@ -917,7 +917,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in) sendRml(rml); } break; - + */ default: // LogLine(RDConfig::LogDebug,QString().sprintf("unhandled rml: \'%s\' from %s", // (const char *)logstr,(const char *)rml->address())); diff --git a/ripcd/modbus.cpp b/ripcd/modbus.cpp index ca3a4153..edbf5f06 100644 --- a/ripcd/modbus.cpp +++ b/ripcd/modbus.cpp @@ -41,7 +41,7 @@ Modbus::Modbus(RDMatrix *matrix,QObject *parent) modbus_ip_address=matrix->ipAddress(RDMatrix::Primary); modbus_ip_port=matrix->ipPort(RDMatrix::Primary); - modbus_socket=new QSocket(this); + modbus_socket=new Q3Socket(this); connect(modbus_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(modbus_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); connect(modbus_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); diff --git a/ripcd/modbus.h b/ripcd/modbus.h index eb7aa460..2a28d611 100644 --- a/ripcd/modbus.h +++ b/ripcd/modbus.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include @@ -65,7 +65,7 @@ class Modbus : public Switcher int modbus_istate; int modbus_input_bytes; std::vector modbus_input_states; - QSocket *modbus_socket; + Q3Socket *modbus_socket; QTimer *modbus_poll_timer; QTimer *modbus_watchdog_timer; bool modbus_watchdog_active; diff --git a/ripcd/quartz1.cpp b/ripcd/quartz1.cpp index 0f522f8b..9fae56bd 100644 --- a/ripcd/quartz1.cpp +++ b/ripcd/quartz1.cpp @@ -80,12 +80,12 @@ Quartz1::Quartz1(RDMatrix *matrix,QObject *parent) sas_device[i]->setSpeed(tty->baudRate()); sas_device[i]->setWordLength(tty->dataBits()); sas_device[i]->setParity(tty->parity()); - sas_device[i]->open(IO_Raw|IO_ReadWrite); + sas_device[i]->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; case RDMatrix::TcpPort: - sas_socket[i]=new QSocket(this,"sas_socket"); + sas_socket[i]=new Q3Socket(this,"sas_socket"); connected_mapper->setMapping(sas_socket[i],i); connect(sas_socket[i],SIGNAL(connected()), connected_mapper,SLOT(map())); @@ -211,8 +211,8 @@ void Quartz1::connectionClosedData(int conn) void Quartz1::errorData(int conn,int err) { - switch((QSocket::Error)err) { - case QSocket::ErrConnectionRefused: + switch((Q3Socket::Error)err) { + case Q3Socket::ErrConnectionRefused: LogLine(RDConfig::LogNotice,QString().sprintf( "Connection to Quartz1 device at %s:%d refused, attempting reconnect", (const char *)sas_ipaddress[conn].toString(), @@ -220,14 +220,14 @@ void Quartz1::errorData(int conn,int err) sas_reconnect_timer[conn]->start(QUARTZ1_RECONNECT_INTERVAL,true); break; - case QSocket::ErrHostNotFound: + case Q3Socket::ErrHostNotFound: LogLine(RDConfig::LogWarning,QString().sprintf( "Error on connection to Quartz1 device at %s:%d: Host Not Found", (const char *)sas_ipaddress[conn].toString(), sas_ipport[conn])); break; - case QSocket::ErrSocketRead: + case Q3Socket::ErrSocketRead: LogLine(RDConfig::LogWarning,QString().sprintf( "Error on connection to Quartz1 device at %s:%d: Socket Read Error", (const char *)sas_ipaddress[conn].toString(), diff --git a/ripcd/quartz1.h b/ripcd/quartz1.h index 1608d732..3c238939 100644 --- a/ripcd/quartz1.h +++ b/ripcd/quartz1.h @@ -21,7 +21,7 @@ #ifndef QUARTZ1_H #define QUARTZ1_H -#include +#include #include #include @@ -58,7 +58,7 @@ class Quartz1 : public Switcher private: void SendCommand(const char *str); RDTTYDevice *sas_device[2]; - QSocket *sas_socket[2]; + Q3Socket *sas_socket[2]; char sas_buffer[2][QUARTZ1_MAX_LENGTH]; unsigned sas_ptr[2]; QHostAddress sas_ipaddress[2]; diff --git a/ripcd/ripcd.cpp b/ripcd/ripcd.cpp index 08b1d899..5d811e71 100644 --- a/ripcd/ripcd.cpp +++ b/ripcd/ripcd.cpp @@ -156,17 +156,17 @@ MainObject::MainObject(QObject *parent) // // The RML Sockets // - ripcd_rml_send=new QSocketDevice(QSocketDevice::Datagram); + ripcd_rml_send=new Q3SocketDevice(Q3SocketDevice::Datagram); - ripcd_rml_echo=new QSocketDevice(QSocketDevice::Datagram); + ripcd_rml_echo=new Q3SocketDevice(Q3SocketDevice::Datagram); ripcd_rml_echo->bind(QHostAddress(),RD_RML_ECHO_PORT); ripcd_rml_echo->setBlocking(false); - ripcd_rml_noecho=new QSocketDevice(QSocketDevice::Datagram); + ripcd_rml_noecho=new Q3SocketDevice(Q3SocketDevice::Datagram); ripcd_rml_noecho->bind(QHostAddress(),RD_RML_NOECHO_PORT); ripcd_rml_noecho->setBlocking(false); - ripcd_rml_reply=new QSocketDevice(QSocketDevice::Datagram); + ripcd_rml_reply=new Q3SocketDevice(Q3SocketDevice::Datagram); ripcd_rml_reply->bind(QHostAddress(),RD_RML_REPLY_PORT); ripcd_rml_reply->setBlocking(false); @@ -357,16 +357,16 @@ void MainObject::readyReadData(int conn_id) while((n=conn->socket()->readBlock(data,1500))>0) { data[n]=0; QString line=QString::fromUtf8(data); - for(unsigned i=0;iaccum=""; } else { - if((c!="\r")&&(c!="\n")) { + if((c.toAscii()!='\r')&&(c.toAscii()!='\n')) { conn->accum+=c; } } @@ -451,7 +451,7 @@ void MainObject::garbageData() { for(unsigned i=0;isocket()->state()==QSocket::Idle) { + if(ripcd_conns[i]->socket()->state()==Q3Socket::Idle) { delete ripcd_conns[i]; ripcd_conns[i]=NULL; } @@ -521,7 +521,7 @@ bool MainObject::DispatchCommand(RipcdConnection *conn) return true; } str=cmds[3]; - for(unsigned i=4;isocket()->state()==QSocket::Connected) { + if(ripcd_conns[ch]->socket()->state()==Q3Socket::Connected) { ripcd_conns[ch]->socket()->writeBlock(cmd.utf8(),cmd.utf8().length()); } } @@ -649,7 +649,7 @@ void MainObject::BroadcastCommand(const QString &cmd,int except_ch) } -void MainObject::ReadRmlSocket(QSocketDevice *dev,RDMacro::Role role, +void MainObject::ReadRmlSocket(Q3SocketDevice *dev,RDMacro::Role role, bool echo) { char buffer[1501]; @@ -674,7 +674,7 @@ void MainObject::ReadRmlSocket(QSocketDevice *dev,RDMacro::Role role, } else { LogLine(RDConfig::LogDebug, - QString("rejected rml: \"")+buffer+ + QString("rejected rml: \"")+QString(buffer)+ "\": on-air flag not active"); break; } diff --git a/ripcd/ripcd.h b/ripcd/ripcd.h index 4ce93de1..95ca7be1 100644 --- a/ripcd/ripcd.h +++ b/ripcd/ripcd.h @@ -27,9 +27,9 @@ #include #include -#include +#include #include -#include +#include #include #include @@ -89,7 +89,7 @@ class MainObject : public QObject bool DispatchCommand(RipcdConnection *conn); void EchoCommand(int,const QString &cmd); void BroadcastCommand(const QString &cmd,int except_ch=-1); - void ReadRmlSocket(QSocketDevice *dev,RDMacro::Role role,bool echo); + void ReadRmlSocket(Q3SocketDevice *dev,RDMacro::Role role,bool echo); QString StripPoint(QString); void LoadLocalMacros(); void RunLocalMacros(RDMacro *rml); @@ -108,14 +108,14 @@ class MainObject : public QObject QSqlDatabase *ripcd_db; QString ripcd_host; bool debug; - QServerSocket *server; + Q3ServerSocket *server; std::vector ripcd_conns; QSignalMapper *ripcd_ready_mapper; QSignalMapper *ripcd_kill_mapper; - QSocketDevice *ripcd_rml_send; - QSocketDevice *ripcd_rml_echo; - QSocketDevice *ripcd_rml_noecho; - QSocketDevice *ripcd_rml_reply; + Q3SocketDevice *ripcd_rml_send; + Q3SocketDevice *ripcd_rml_echo; + Q3SocketDevice *ripcd_rml_noecho; + Q3SocketDevice *ripcd_rml_reply; QHostAddress ripcd_host_addr; Switcher *ripcd_switcher[MAX_MATRICES]; bool ripcd_gpi_state[MAX_MATRICES][MAX_GPIO_PINS]; diff --git a/ripcd/ripcd_connection.cpp b/ripcd/ripcd_connection.cpp index c153c7fd..c1f7e65f 100644 --- a/ripcd/ripcd_connection.cpp +++ b/ripcd/ripcd_connection.cpp @@ -25,7 +25,7 @@ RipcdConnection::RipcdConnection(int id,int fd) ripcd_id=id; ripcd_authenticated=false; accum=""; - ripcd_socket=new QSocket(); + ripcd_socket=new Q3Socket(); ripcd_socket->setSocket(fd); } @@ -42,7 +42,7 @@ int RipcdConnection::id() const } -QSocket *RipcdConnection::socket() const +Q3Socket *RipcdConnection::socket() const { return ripcd_socket; } diff --git a/ripcd/ripcd_connection.h b/ripcd/ripcd_connection.h index 217087c4..2f0eb33f 100644 --- a/ripcd/ripcd_connection.h +++ b/ripcd/ripcd_connection.h @@ -22,7 +22,7 @@ #define RIPCD_CONNECTION_H #include -#include +#include #include #include @@ -33,13 +33,13 @@ class RipcdConnection RipcdConnection(int id,int fd); ~RipcdConnection(); int id() const; - QSocket *socket() const; + Q3Socket *socket() const; bool isAuthenticated() const; void setAuthenticated(bool state); QString accum; int ripcd_id; bool ripcd_authenticated; - QSocket *ripcd_socket; + Q3Socket *ripcd_socket; }; /* diff --git a/ripcd/ripcd_socket.cpp b/ripcd/ripcd_socket.cpp index 8fb257ba..551377bd 100644 --- a/ripcd/ripcd_socket.cpp +++ b/ripcd/ripcd_socket.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -33,14 +33,14 @@ #include RipcdSocket::RipcdSocket(Q_UINT16 port,int backlog,QObject *parent) - : QServerSocket(port,0,parent) + : Q3ServerSocket(port,0,parent) { } RipcdSocket::RipcdSocket(const QHostAddress &address,Q_UINT16 port,int backlog, QObject *parent) - : QServerSocket(address,port,0,parent) + : Q3ServerSocket(address,port,0,parent) { } diff --git a/ripcd/ripcd_socket.h b/ripcd/ripcd_socket.h index fcabcdfb..9abacd20 100644 --- a/ripcd/ripcd_socket.h +++ b/ripcd/ripcd_socket.h @@ -23,10 +23,10 @@ #include #include -#include +#include #include -class RipcdSocket : public QServerSocket +class RipcdSocket : public Q3ServerSocket { Q_OBJECT public: @@ -39,7 +39,7 @@ class RipcdSocket : public QServerSocket void connection(int); private: - QServerSocket *socket; + Q3ServerSocket *socket; }; diff --git a/ripcd/rossnkscp.cpp b/ripcd/rossnkscp.cpp index 34accefe..2ac11cd6 100644 --- a/ripcd/rossnkscp.cpp +++ b/ripcd/rossnkscp.cpp @@ -45,7 +45,7 @@ RossNkScp::RossNkScp(RDMatrix *matrix,QObject *parent) ross_device->setSpeed(tty->baudRate()); ross_device->setWordLength(tty->dataBits()); ross_device->setParity(tty->parity()); - ross_device->open(IO_Raw|IO_ReadWrite); + ross_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; } diff --git a/ripcd/sas16000.cpp b/ripcd/sas16000.cpp index 8601f64e..8e900f86 100644 --- a/ripcd/sas16000.cpp +++ b/ripcd/sas16000.cpp @@ -51,7 +51,7 @@ Sas16000::Sas16000(RDMatrix *matrix,QObject *parent) sas_device->setSpeed(tty->baudRate()); sas_device->setWordLength(tty->dataBits()); sas_device->setParity(tty->parity()); - sas_device->open(IO_Raw|IO_ReadWrite); + sas_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; } diff --git a/ripcd/sas16000.h b/ripcd/sas16000.h index dadf5c47..5a2518e8 100644 --- a/ripcd/sas16000.h +++ b/ripcd/sas16000.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/ripcd/sas32000.cpp b/ripcd/sas32000.cpp index c0bc2078..2a6eb9fb 100644 --- a/ripcd/sas32000.cpp +++ b/ripcd/sas32000.cpp @@ -44,7 +44,7 @@ Sas32000::Sas32000(RDMatrix *matrix,QObject *parent) sas_device->setSpeed(tty->baudRate()); sas_device->setWordLength(tty->dataBits()); sas_device->setParity(tty->parity()); - sas_device->open(IO_Raw|IO_ReadWrite); + sas_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/sas64000.cpp b/ripcd/sas64000.cpp index c260183d..ae77e262 100644 --- a/ripcd/sas64000.cpp +++ b/ripcd/sas64000.cpp @@ -44,7 +44,7 @@ Sas64000::Sas64000(RDMatrix *matrix,QObject *parent) sas_device->setSpeed(tty->baudRate()); sas_device->setWordLength(tty->dataBits()); sas_device->setParity(tty->parity()); - sas_device->open(IO_Raw|IO_ReadWrite); + sas_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; } diff --git a/ripcd/sas64000gpi.cpp b/ripcd/sas64000gpi.cpp index b30aad5b..7c95a74c 100644 --- a/ripcd/sas64000gpi.cpp +++ b/ripcd/sas64000gpi.cpp @@ -48,7 +48,7 @@ Sas64000Gpi::Sas64000Gpi(RDMatrix *matrix,QObject *parent) sas_device->setSpeed(tty->baudRate()); sas_device->setWordLength(tty->dataBits()); sas_device->setParity(tty->parity()); - sas_device->open(IO_Raw|IO_ReadWrite); + sas_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; diff --git a/ripcd/sasusi.cpp b/ripcd/sasusi.cpp index 6c1c3d5f..cfc28e77 100644 --- a/ripcd/sasusi.cpp +++ b/ripcd/sasusi.cpp @@ -87,12 +87,12 @@ SasUsi::SasUsi(RDMatrix *matrix,QObject *parent) sas_device->setSpeed(tty->baudRate()); sas_device->setWordLength(tty->dataBits()); sas_device->setParity(tty->parity()); - sas_device->open(IO_Raw|IO_ReadWrite); + sas_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; case RDMatrix::TcpPort: - sas_socket=new QSocket(this); + sas_socket=new Q3Socket(this); connect(sas_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(sas_socket,SIGNAL(connectionClosed()), this,SLOT(connectionClosedData())); @@ -388,8 +388,8 @@ void SasUsi::readyReadData() void SasUsi::errorData(int err) { - switch((QSocket::Error)err) { - case QSocket::ErrConnectionRefused: + switch((Q3Socket::Error)err) { + case Q3Socket::ErrConnectionRefused: LogLine(RDConfig::LogNotice,QString().sprintf( "Connection to SasUsi device at %s:%d refused, attempting reconnect", (const char *)sas_ipaddress.toString(), @@ -397,14 +397,14 @@ void SasUsi::errorData(int err) sas_reconnect_timer->start(SASUSI_RECONNECT_INTERVAL,true); break; - case QSocket::ErrHostNotFound: + case Q3Socket::ErrHostNotFound: LogLine(RDConfig::LogWarning,QString().sprintf( "Error on connection to SasUsi device at %s:%d: Host Not Found", (const char *)sas_ipaddress.toString(), sas_ipport)); break; - case QSocket::ErrSocketRead: + case Q3Socket::ErrSocketRead: LogLine(RDConfig::LogWarning,QString().sprintf( "Error on connection to SasUsi device at %s:%d: Socket Read Error", (const char *)sas_ipaddress.toString(), diff --git a/ripcd/sasusi.h b/ripcd/sasusi.h index caf694f2..86f8243c 100644 --- a/ripcd/sasusi.h +++ b/ripcd/sasusi.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include @@ -62,7 +62,7 @@ class SasUsi : public Switcher void ExecuteMacroCart(unsigned cartnum); QString PrettifyCommand(const char *cmd) const; RDTTYDevice *sas_device; - QSocket *sas_socket; + Q3Socket *sas_socket; char sas_buffer[SASUSI_MAX_LENGTH]; unsigned sas_ptr; QHostAddress sas_ipaddress; diff --git a/ripcd/starguide3.cpp b/ripcd/starguide3.cpp index 8af21d46..e88ecac3 100644 --- a/ripcd/starguide3.cpp +++ b/ripcd/starguide3.cpp @@ -73,7 +73,7 @@ StarGuide3::StarGuide3(RDMatrix *matrix,QObject *parent) sg_device->setSpeed(tty->baudRate()); sg_device->setWordLength(tty->dataBits()); sg_device->setParity(tty->parity()); - sg_device->open(IO_Raw|IO_ReadWrite); + sg_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; } diff --git a/ripcd/swauthority.cpp b/ripcd/swauthority.cpp index e9370fd9..5eb0f327 100644 --- a/ripcd/swauthority.cpp +++ b/ripcd/swauthority.cpp @@ -60,7 +60,7 @@ SoftwareAuthority::SoftwareAuthority(RDMatrix *matrix,QObject *parent) // // Initialize the connection // - swa_socket=new QSocket(this); + swa_socket=new Q3Socket(this); connect(swa_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(swa_socket,SIGNAL(connectionClosed()), this,SLOT(connectionClosedData())); @@ -204,8 +204,8 @@ void SoftwareAuthority::readyReadData() void SoftwareAuthority::errorData(int err) { - switch((QSocket::Error)err) { - case QSocket::ErrConnectionRefused: + switch((Q3Socket::Error)err) { + case Q3Socket::ErrConnectionRefused: LogLine(RDConfig::LogNotice,QString().sprintf( "Connection to SoftwareAuthority device at %s:%d refused, attempting reconnect", (const char *)swa_ipaddress.toString(), @@ -213,14 +213,14 @@ void SoftwareAuthority::errorData(int err) swa_reconnect_timer->start(SWAUTHORITY_RECONNECT_INTERVAL,true); break; - case QSocket::ErrHostNotFound: + case Q3Socket::ErrHostNotFound: LogLine(RDConfig::LogWarning,QString().sprintf( "Error on connection to SoftwareAuthority device at %s:%d: Host Not Found", (const char *)swa_ipaddress.toString(), swa_ipport)); break; - case QSocket::ErrSocketRead: + case Q3Socket::ErrSocketRead: LogLine(RDConfig::LogWarning,QString().sprintf( "Error on connection to SoftwareAuthority device at %s:%d: Socket Read Error", (const char *)swa_ipaddress.toString(), diff --git a/ripcd/swauthority.h b/ripcd/swauthority.h index 4405076b..6bb9536e 100644 --- a/ripcd/swauthority.h +++ b/ripcd/swauthority.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -62,7 +62,7 @@ class SoftwareAuthority : public Switcher void ExecuteMacroCart(unsigned cartnum); QString PrettifyCommand(const char *cmd) const; QString BundleString(int offset,bool state); - QSocket *swa_socket; + Q3Socket *swa_socket; char swa_buffer[SWAUTHORITY_MAX_LENGTH]; unsigned swa_ptr; QHostAddress swa_ipaddress; diff --git a/ripcd/unity4000.cpp b/ripcd/unity4000.cpp index 77b0620e..9c4bbad4 100644 --- a/ripcd/unity4000.cpp +++ b/ripcd/unity4000.cpp @@ -72,7 +72,7 @@ Unity4000::Unity4000(RDMatrix *matrix,QObject *parent) unity_device->setSpeed(tty->baudRate()); unity_device->setWordLength(tty->dataBits()); unity_device->setParity(tty->parity()); - unity_device->open(IO_Raw|IO_ReadWrite); + unity_device->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; } diff --git a/ripcd/vguest.cpp b/ripcd/vguest.cpp index 869794e5..616eaa09 100644 --- a/ripcd/vguest.cpp +++ b/ripcd/vguest.cpp @@ -234,7 +234,7 @@ VGuest::VGuest(RDMatrix *matrix,QObject *parent) vguest_device[i]->setSpeed(tty->baudRate()); vguest_device[i]->setWordLength(tty->dataBits()); vguest_device[i]->setParity(tty->parity()); - vguest_device[i]->open(IO_Raw|IO_ReadWrite); + vguest_device[i]->open(QIODevice::Unbuffered|QIODevice::ReadWrite); } delete tty; } @@ -536,8 +536,8 @@ void VGuest::errorData(int err,int id) { int interval=VGUEST_RECONNECT_MIN_INTERVAL; - switch((QSocket::Error)err) { - case QSocket::ErrConnectionRefused: + switch((Q3Socket::Error)err) { + case Q3Socket::ErrConnectionRefused: interval=GetHoldoff(); if(!vguest_error_notified[id]) { LogLine(RDConfig::LogNotice,QString().sprintf( @@ -549,7 +549,7 @@ void VGuest::errorData(int err,int id) vguest_reconnect_timer[id]->start(interval,true); break; - case QSocket::ErrHostNotFound: + case Q3Socket::ErrHostNotFound: if(!vguest_error_notified[id]) { LogLine(RDConfig::LogWarning,QString().sprintf( "Error on connection to vGuest device at %s:%d: Host Not Found", @@ -559,7 +559,7 @@ void VGuest::errorData(int err,int id) } break; - case QSocket::ErrSocketRead: + case Q3Socket::ErrSocketRead: if(!vguest_error_notified[id]) { LogLine(RDConfig::LogWarning,QString().sprintf( "Error on connection to vGuest device at %s:%d: Socket Read Error", @@ -769,7 +769,7 @@ void VGuest::MetadataCommand(char *cmd,int len,int id) } -QString VGuest::PadString(QString str,unsigned len) +QString VGuest::PadString(QString str,int len) { QString out; out=str.left(len); diff --git a/ripcd/vguest.h b/ripcd/vguest.h index 8bf95726..f26d645c 100644 --- a/ripcd/vguest.h +++ b/ripcd/vguest.h @@ -74,7 +74,7 @@ class VGuest : public Switcher int GetRelay(int enginenum,int devicenum,int surfacenum,int relaynum); int GetHoldoff(); QString RenderCommand(char *cmd,int len); - QString PadString(QString str,unsigned len); + QString PadString(QString str,int len); void ExecuteMacroCart(unsigned cartnum); RDTTYDevice *vguest_device[2]; RDSocket *vguest_socket[2]; diff --git a/ripcd/wheatnet_lio.cpp b/ripcd/wheatnet_lio.cpp index 581aa08c..0b4ecef9 100644 --- a/ripcd/wheatnet_lio.cpp +++ b/ripcd/wheatnet_lio.cpp @@ -35,7 +35,7 @@ WheatnetLio::WheatnetLio(RDMatrix *matrix,QObject *parent) lio_ip_port=matrix->ipPort(RDMatrix::Primary); lio_card=matrix->card(); - lio_socket=new QSocket(this); + lio_socket=new Q3Socket(this); connect(lio_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(lio_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); connect(lio_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); diff --git a/ripcd/wheatnet_lio.h b/ripcd/wheatnet_lio.h index 91cd6e4b..f71531d6 100644 --- a/ripcd/wheatnet_lio.h +++ b/ripcd/wheatnet_lio.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -63,7 +63,7 @@ class WheatnetLio : public Switcher void ProcessLioevent(int chan,QString &cmd); void ProcessCommand(const QString &cmd); void SendCommand(const QString &cmd); - QSocket *lio_socket; + Q3Socket *lio_socket; QTimer *lio_watchdog_timer; bool lio_watchdog_active; QHostAddress lio_ip_address; diff --git a/ripcd/wheatnet_slio.cpp b/ripcd/wheatnet_slio.cpp index 036846ec..23764c43 100644 --- a/ripcd/wheatnet_slio.cpp +++ b/ripcd/wheatnet_slio.cpp @@ -34,7 +34,7 @@ WheatnetSlio::WheatnetSlio(RDMatrix *matrix,QObject *parent) slio_ip_address=matrix->ipAddress(RDMatrix::Primary); slio_ip_port=matrix->ipPort(RDMatrix::Primary); - slio_socket=new QSocket(this); + slio_socket=new Q3Socket(this); connect(slio_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(slio_socket,SIGNAL(readyRead()),this,SLOT(readyReadData())); connect(slio_socket,SIGNAL(error(int)),this,SLOT(errorData(int))); diff --git a/ripcd/wheatnet_slio.h b/ripcd/wheatnet_slio.h index 1104066e..6dfa6807 100644 --- a/ripcd/wheatnet_slio.h +++ b/ripcd/wheatnet_slio.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -63,7 +63,7 @@ class WheatnetSlio : public Switcher void ProcessSlioevent(int chan,QString &cmd); void ProcessCommand(const QString &cmd); void SendCommand(const QString &cmd); - QSocket *slio_socket; + Q3Socket *slio_socket; QTimer *slio_watchdog_timer; bool slio_watchdog_active; QHostAddress slio_ip_address; diff --git a/rivendell.spec.in b/rivendell.spec.in index 114407d7..0c031b11 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -111,8 +111,6 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/@LOCAL_PREFIX@/@RD_LIB_PATH@/libqmysqlutf* mkdir $RPM_BUILD_ROOT/.qt touch $RPM_BUILD_ROOT/.qt/qt -rm -f $RPM_BUILD_ROOT/lib/security/pam_rd.la -rm -f $RPM_BUILD_ROOT/lib64/security/pam_rd.la rm -rf $RPM_BUILD_ROOT/@libexecdir@/logos if test "@WIN32_SOURCE@" ; then mkdir -p $RPM_BUILD_ROOT/var/win32 @@ -136,7 +134,6 @@ cp conf/asound.conf-sample $RPM_BUILD_ROOT/@DOC_PATH@/ cp utils/sas_shim/rc.sas_shim $RPM_BUILD_ROOT/@DOC_PATH@/ mkdir -p $RPM_BUILD_ROOT/@DOC_PATH@/misc cp docs/misc/colors $RPM_BUILD_ROOT/@DOC_PATH@/misc/ -cp docs/misc/pam_rd.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/ cp docs/misc/reports.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/ cp docs/misc/ALSA.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/ cp docs/misc/RDMONITOR.txt $RPM_BUILD_ROOT/@DOC_PATH@/misc/ @@ -291,7 +288,6 @@ rm -rf $RPM_BUILD_ROOT @LOCAL_PREFIX@/bin/rd_config @LOCAL_PREFIX@/bin/sage_endec_rwt.sh @LOCAL_PREFIX@/bin/rd_backup -@LOCAL_PREFIX@/bin/rdchunk @LOCAL_PREFIX@/bin/rdmemcheck.sh @LOCAL_PREFIX@/bin/rdrender %attr(4755,root,root)@LOCAL_PREFIX@/bin/ripcd @@ -394,15 +390,12 @@ rm -rf $RPM_BUILD_ROOT @LOCAL_PREFIX@/share/desktop-directories/rivendell-rivendell.directory @LOCAL_PREFIX@/share/desktop-directories/rivendell-utilities.directory /etc/xdg/menus/applications-merged/rivendell-rivendell.menu -/@RD_LIB_PATH@/security/pam_rd.so /.qt/qt @libexecdir@/* %attr(6755,root,root) @libexecdir@/rdxport.cgi %attr(6755,root,root) @libexecdir@/webget.cgi @sysconfdir@/rd-bin.conf @WIN32_PATH@ -/etc/pam.d/rivendell -/etc/pam.d/rdalsaconfig-root /etc/security/console.apps/rdalsaconfig-root %{_mandir}/man1/rdclilogedit.1.gz %{_mandir}/man1/rdconvert.1.gz diff --git a/tests/Makefile.am b/tests/Makefile.am index dc3735e5..cbf50dce 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/tests -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +18,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -46,55 +44,55 @@ noinst_PROGRAMS = audio_convert_test\ wav_chunk_test dist_audio_convert_test_SOURCES = audio_convert_test.cpp audio_convert_test.h -audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_audio_export_test_SOURCES = audio_export_test.cpp audio_export_test.h -audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_audio_import_test_SOURCES = audio_import_test.cpp audio_import_test.h -audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_audio_peaks_test_SOURCES = audio_peaks_test.cpp audio_peaks_test.h -audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_datedecode_test_SOURCES = datedecode_test.cpp datedecode_test.h -datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_db_charset_test_SOURCES = db_charset_test.cpp db_charset_test.h -db_charset_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +db_charset_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_log_unlink_test_SOURCES = log_unlink_test.cpp log_unlink_test.h nodist_log_unlink_test_SOURCES = moc_log_unlink_test.cpp -log_unlink_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +log_unlink_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_mcast_recv_test_SOURCES = mcast_recv_test.cpp mcast_recv_test.h nodist_mcast_recv_test_SOURCES = moc_mcast_recv_test.cpp -mcast_recv_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +mcast_recv_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_rdxml_parse_test_SOURCES = rdxml_parse_test.cpp rdxml_parse_test.h -rdxml_parse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdxml_parse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_reserve_carts_test_SOURCES = reserve_carts_test.cpp reserve_carts_test.h -reserve_carts_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +reserve_carts_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_stringcode_test_SOURCES = stringcode_test.cpp stringcode_test.h -stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_test_hash_SOURCES = test_hash.cpp test_hash.h -test_hash_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +test_hash_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_test_pam_SOURCES = test_pam.cpp test_pam.h -test_pam_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +test_pam_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_timer_test_SOURCES = timer_test.cpp timer_test.h nodist_timer_test_SOURCES = moc_timer_test.cpp -timer_test_LDADD = -lqui +timer_test_LDADD = @QT4_LIBS@ -lQt3Support dist_upload_test_SOURCES = upload_test.cpp upload_test.h -upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support dist_wav_chunk_test_SOURCES = wav_chunk_test.cpp wav_chunk_test.h -wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rivendell_standard.txt\ visualtraffic.txt diff --git a/tests/audio_convert_test.cpp b/tests/audio_convert_test.cpp index 52e95827..1d955b2f 100644 --- a/tests/audio_convert_test.cpp +++ b/tests/audio_convert_test.cpp @@ -29,7 +29,7 @@ MainObject::MainObject(QObject *parent) :QObject(parent) { - unsigned schema=0; + int schema=0; destination_settings=new RDSettings(); start_point=-1; @@ -172,8 +172,7 @@ MainObject::MainObject(QObject *parent) // Open Database // QString err (tr("audio_convert_test: ")); - QSqlDatabase *db=RDInitDb(&schema,&err); - if(!db) { + if(!RDOpenDb(&schema,&err,rdconfig)) { fprintf(stderr,err.ascii()); delete cmd; exit(256); diff --git a/tests/datedecode_test.cpp b/tests/datedecode_test.cpp index 8b968d01..97d94f70 100644 --- a/tests/datedecode_test.cpp +++ b/tests/datedecode_test.cpp @@ -36,7 +36,7 @@ MainObject::MainObject(QObject *parent) QString date=""; QString datetime=""; QString service=""; - unsigned schema=0; + int schema=0; // // Read Command Options @@ -84,8 +84,7 @@ MainObject::MainObject(QObject *parent) // Open Database // QString err (tr("datedecode_test: ")); - QSqlDatabase *db=RDInitDb(&schema,&err); - if(!db) { + if(!RDOpenDb(&schema,&err,config)) { fprintf(stderr,err.ascii()); delete cmd; exit(256); diff --git a/tests/log_unlink_test.cpp b/tests/log_unlink_test.cpp index d17f871d..e037f794 100644 --- a/tests/log_unlink_test.cpp +++ b/tests/log_unlink_test.cpp @@ -38,7 +38,7 @@ MainObject::MainObject(QObject *parent) :QObject(parent) { test_import_source=RDSvc::Traffic; - unsigned schema=0; + int schema=0; // // Read Command Options @@ -89,8 +89,7 @@ MainObject::MainObject(QObject *parent) // Open Database // QString err (tr("upload_test: ")); - QSqlDatabase *db=RDInitDb(&schema,&err); - if(!db) { + if(!RDOpenDb(&schema,&err,test_config)) { fprintf(stderr,err.ascii()); delete cmd; exit(256); diff --git a/tests/rdxml_parse_test.cpp b/tests/rdxml_parse_test.cpp index 23e9522b..d5d16b93 100644 --- a/tests/rdxml_parse_test.cpp +++ b/tests/rdxml_parse_test.cpp @@ -37,7 +37,7 @@ MainObject::MainObject(QObject *parent) { QString filename=""; QFile *file=NULL; - QString line; + char line[1025]; QString xml=""; // @@ -66,7 +66,7 @@ MainObject::MainObject(QObject *parent) // Read File // file=new QFile(filename); - if(!file->open(IO_ReadOnly)) { + if(!file->open(QIODevice::ReadOnly)) { fprintf(stderr,"rdxml_parse_test: unable to open \"%s\"\n", (const char *)filename); exit(256); diff --git a/tests/reserve_carts_test.cpp b/tests/reserve_carts_test.cpp index afd49e60..a59c97fb 100644 --- a/tests/reserve_carts_test.cpp +++ b/tests/reserve_carts_test.cpp @@ -42,7 +42,7 @@ MainObject::MainObject(QObject *parent) bool ok=false; RDGroup *group=NULL; std::vector cart_nums; - unsigned schema=0; + int schema=0; // // Read Command Options @@ -93,8 +93,7 @@ MainObject::MainObject(QObject *parent) // Open Database // QString err (tr("upload_test: ")); - QSqlDatabase *db=RDInitDb(&schema,&err); - if(!db) { + if(!RDOpenDb(&schema,&err,config)) { fprintf(stderr,err.ascii()); delete cmd; exit(256); diff --git a/tests/timer_test.cpp b/tests/timer_test.cpp index 704de51c..91a47928 100644 --- a/tests/timer_test.cpp +++ b/tests/timer_test.cpp @@ -19,6 +19,7 @@ // #include +#include #include diff --git a/tests/upload_test.cpp b/tests/upload_test.cpp index 9df6bfed..afb5bfb0 100644 --- a/tests/upload_test.cpp +++ b/tests/upload_test.cpp @@ -37,7 +37,6 @@ MainObject::MainObject(QObject *parent) username=""; password=""; RDUpload::ErrorCode conv_err; - unsigned schema=0; // // Open the Database diff --git a/tests/wav_chunk_test.cpp b/tests/wav_chunk_test.cpp index 73d1c8ca..85bf3c29 100644 --- a/tests/wav_chunk_test.cpp +++ b/tests/wav_chunk_test.cpp @@ -2,7 +2,7 @@ // // Test Rivendell file uploading. // -// (C) Copyright 2010,2016 Fred Gleason +// (C) Copyright 2010,2016-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/utils/Makefile.am b/utils/Makefile.am index fa7e6978..13293606 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -26,7 +26,6 @@ endif SUBDIRS = $(ALSACONFIG_RD_OPT)\ rddgimport\ rdcheckcuts\ - rdchunk\ rdcleandirs\ rdclilogedit\ rdcollect\ diff --git a/utils/rdalsaconfig/Makefile.am b/utils/rdalsaconfig/Makefile.am index b2aa17b7..47601e1d 100644 --- a/utils/rdalsaconfig/Makefile.am +++ b/utils/rdalsaconfig/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for utils/rdalsaconfig -## -## (C) Copyright 2009,2016 Fred Gleason +## (C) Copyright 2009,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,8 +18,8 @@ ## Use automake to process this into a Makefile.in ## -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -36,7 +34,7 @@ dist_rdalsaconfig_SOURCES = alsaitem.cpp alsaitem.h\ nodist_rdalsaconfig_SOURCES = moc_rdalsaconfig.cpp -rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ +rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdalsaconfig.pro diff --git a/utils/rdalsaconfig/alsaitem.cpp b/utils/rdalsaconfig/alsaitem.cpp index e4d0decc..32200797 100644 --- a/utils/rdalsaconfig/alsaitem.cpp +++ b/utils/rdalsaconfig/alsaitem.cpp @@ -20,14 +20,14 @@ #include -AlsaItem::AlsaItem(QListBox *listbox,const QString &text) -: QListBoxText(listbox,text) +AlsaItem::AlsaItem(Q3ListBox *listbox,const QString &text) +: Q3ListBoxText(listbox,text) { } AlsaItem::AlsaItem(const QString &text) - : QListBoxText(text) + : Q3ListBoxText(text) { alsa_card=-1; alsa_device=-1; diff --git a/utils/rdalsaconfig/alsaitem.h b/utils/rdalsaconfig/alsaitem.h index 9a99c64b..5501da7f 100644 --- a/utils/rdalsaconfig/alsaitem.h +++ b/utils/rdalsaconfig/alsaitem.h @@ -22,12 +22,12 @@ #ifndef ALSAITEM_H #define ALSAITEM_H -#include +#include -class AlsaItem : public QListBoxText +class AlsaItem : public Q3ListBoxText { public: - AlsaItem(QListBox *listbox,const QString &text=QString::null); + AlsaItem(Q3ListBox *listbox,const QString &text=QString::null); AlsaItem(const QString &text=QString::null); AlsaItem(const AlsaItem &item); int card() const; diff --git a/utils/rdalsaconfig/rdalsa.cpp b/utils/rdalsaconfig/rdalsa.cpp index 8e2db5d1..3952a9ac 100644 --- a/utils/rdalsaconfig/rdalsa.cpp +++ b/utils/rdalsaconfig/rdalsa.cpp @@ -271,7 +271,7 @@ bool RDAlsa::SaveAsoundConfig(const QString &filename) if((f=fopen(filename,"w"))==NULL) { return false; } - for(unsigned i=0;i #include #include +//Added by qt3to4: +#include +#include +#include #include @@ -80,12 +84,12 @@ MainWidget::MainWidget(QWidget *parent) // // Available Devices // - alsa_system_list=new QListBox(this); + alsa_system_list=new Q3ListBox(this); alsa_system_list->setFont(font); alsa_system_label= new QLabel(alsa_system_list,tr("Available Sound Devices"),this); alsa_system_label->setFont(label_font); - alsa_system_label->setAlignment(AlignLeft|AlignVCenter); + alsa_system_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Up Button @@ -103,11 +107,11 @@ MainWidget::MainWidget(QWidget *parent) // // Selected Devices // - alsa_config_list=new QListBox(this); + alsa_config_list=new Q3ListBox(this); alsa_config_list->setFont(font); alsa_config_label=new QLabel(alsa_config_list,tr("Active Sound Devices"),this); alsa_config_label->setFont(label_font); - alsa_config_label->setAlignment(AlignLeft|AlignVCenter); + alsa_config_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Save Button @@ -254,7 +258,7 @@ void MainWidget::closeEvent(QCloseEvent *e) } -void MainWidget::LoadList(QListBox *system,QListBox *config) +void MainWidget::LoadList(Q3ListBox *system,Q3ListBox *config) { for(unsigned i=0;icards();i++) { for(int j=0;jpcmDevices(i);j++) { @@ -297,7 +301,7 @@ bool MainWidget::PcmUnused(int card,int device) } -void MainWidget::MoveItem(QListBox *src,QListBox *dest) +void MainWidget::MoveItem(Q3ListBox *src,Q3ListBox *dest) { AlsaItem *item=(AlsaItem *)src->selectedItem(); if(item==NULL) { diff --git a/utils/rdalsaconfig/rdalsaconfig.h b/utils/rdalsaconfig/rdalsaconfig.h index 5fdb459a..99ab8c5c 100644 --- a/utils/rdalsaconfig/rdalsaconfig.h +++ b/utils/rdalsaconfig/rdalsaconfig.h @@ -22,8 +22,11 @@ #define RDALSACONFIG_H #include -#include +#include #include +//Added by qt3to4: +#include +#include #include @@ -55,13 +58,13 @@ class MainWidget : public QWidget void closeEvent(QCloseEvent *e); private: - void LoadList(QListBox *system,QListBox *config); + void LoadList(Q3ListBox *system,Q3ListBox *config); bool PcmUnused(int card,int device); - void MoveItem(QListBox *src,QListBox *dest); + void MoveItem(Q3ListBox *src,Q3ListBox *dest); QLabel *alsa_system_label; - QListBox *alsa_system_list; + Q3ListBox *alsa_system_list; QLabel *alsa_config_label; - QListBox *alsa_config_list; + Q3ListBox *alsa_config_list; RDTransportButton *alsa_up_button; RDTransportButton *alsa_down_button; QPushButton *alsa_save_button; diff --git a/utils/rdcheckcuts/Makefile.am b/utils/rdcheckcuts/Makefile.am index 39d9b4eb..e534a5b4 100644 --- a/utils/rdcheckcuts/Makefile.am +++ b/utils/rdcheckcuts/Makefile.am @@ -1,6 +1,4 @@ -## automake.am -## -## Automake.am for rivendell/utils/rdcheckcuts +## Makefile.am ## ## (C) Copyright 2012,2016 Fred Gleason ## @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -31,7 +29,7 @@ bin_PROGRAMS = rdcheckcuts dist_rdcheckcuts_SOURCES = rdcheckcuts.cpp rdcheckcuts.h -rdcheckcuts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdcheckcuts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdcheckcuts.pro diff --git a/utils/rdchunk/Makefile.am b/utils/rdchunk/Makefile.am deleted file mode 100644 index 0e7c1777..00000000 --- a/utils/rdchunk/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -## automake.am -## -## Automake.am for rivendell/utils/rdchunk -## -## (C) Copyright 2002-2006,2016 Fred Gleason -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License version 2 as -## published by the Free Software Foundation. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public -## License along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -## -## Use automake to process this into a Makefile.in - -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib -MOC = @QT_MOC@ - -# The dependency for qt's Meta Object Compiler (moc) -moc_%.cpp: %.h - $(MOC) $< -o $@ - -# I18N Stuff -install-exec-local: - mkdir -p $(DESTDIR)$(prefix)/share/rivendell - cp rdchunk_*.qm $(DESTDIR)$(prefix)/share/rivendell - -uninstall-local: - rm -f $(DESTDIR)$(prefix)/share/rivendell/rdchunk_*.qm - -all: - @QT_BIN@/lupdate rdchunk.pro - @QT_BIN@/lrelease rdchunk.pro - -bin_PROGRAMS = rdchunk - -dist_rdchunk_SOURCES = rdchunk.cpp rdchunk.h - -nodist_rdchunk_SOURCES = moc_rdchunk.cpp - -rdchunk_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ - -EXTRA_DIST = rdchunk.pro\ - rdchunk_de.ts\ - rdchunk_es.ts\ - rdchunk_fr.ts\ - rdchunk_pt_BR.ts - -CLEANFILES = *~\ - *.idb\ - *ilk\ - *.obj\ - *.pdb\ - *.qm\ - moc_* - -MAINTAINERCLEANFILES = *~\ - *.tar.gz\ - aclocal.m4\ - configure\ - Makefile.in\ - moc_* diff --git a/utils/rdchunk/rdchunk.cpp b/utils/rdchunk/rdchunk.cpp deleted file mode 100644 index a43cf9d2..00000000 --- a/utils/rdchunk/rdchunk.cpp +++ /dev/null @@ -1,741 +0,0 @@ -// rdchunk.cpp -// -// A Qt-based application for playing Microsoft WAV files. -// -// (C) Copyright 2002-2004,2016 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#include - -MainWidget::MainWidget(QWidget *parent) - :QWidget(parent) -{ - y_chunk_button=40; - - // - // Fix the Window Size - // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - - // - // Generate Fonts - // - QFont font("Helvetica",12,QFont::Normal); - font.setPixelSize(12); - QFont label_font("Helvetica",12,QFont::Bold); - label_font.setPixelSize(12); - - wave_loaded=false; - wavefile=NULL; - fmt_button=NULL; - data_button=NULL; - fact_button=NULL; - cart_button=NULL; - bext_button=NULL; - mext_button=NULL; - wave_base="RDChunk"; - setCaption(wave_base); - - // - // Load Button - // - QPushButton *button=new QPushButton(tr("Load"),this); - button->setGeometry(10,10,sizeHint().width()-20,30); - connect(button,SIGNAL(clicked()),this,SLOT(loadWaveFile())); - - // - // Chunk Label - // - wave_chunk_label=new QLabel(tr("Chunks"),this); - wave_chunk_label->setGeometry(25,55,sizeHint().width()-50,20); - wave_chunk_label->setAlignment(AlignCenter); - wave_chunk_label->setFont(label_font); - wave_chunk_label->hide(); -} - - -QSize MainWidget::sizeHint() const -{ - return QSize(120,y_chunk_button+10); -} - - -QSizePolicy MainWidget::sizePolicy() const -{ - return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); -} - - -void MainWidget::createChunkButtons() -{ - int xptr=20; - int yptr=78; - - // - // Create chunk buttons - // - if(wavefile->getFormatChunk()) { - fmt_button=new QPushButton(this); - fmt_button->setText("Format"); - fmt_button->setGeometry(xptr,yptr,80,25); - fmt_button->show(); - yptr+=30; - connect(fmt_button,SIGNAL(clicked()),this,SLOT(displayFmt())); - } - if(wavefile->getDataChunk()) { - data_button=new QPushButton(this); - data_button->setText("Data"); - data_button->setGeometry(xptr,yptr,80,25); - data_button->show(); - yptr+=30; - connect(data_button,SIGNAL(clicked()),this,SLOT(displayData())); - } - if(wavefile->getFactChunk()) { - fact_button=new QPushButton(this); - fact_button->setText("Fact"); - fact_button->setGeometry(xptr,yptr,80,25); - fact_button->show(); - yptr+=30; - connect(fact_button,SIGNAL(clicked()),this,SLOT(displayFact())); - } - if(wavefile->getCartChunk()) { - cart_button=new QPushButton(this); - cart_button->setText("Cart"); - cart_button->setGeometry(xptr,yptr,80,25); - cart_button->show(); - yptr+=30; - connect(cart_button,SIGNAL(clicked()),this,SLOT(displayCart())); - } - if(wavefile->getBextChunk()) { - bext_button=new QPushButton(this); - bext_button->setText("Bext"); - bext_button->setGeometry(xptr,yptr,80,25); - bext_button->show(); - yptr+=30; - connect(bext_button,SIGNAL(clicked()),this,SLOT(displayBext())); - } - if(wavefile->getMextChunk()) { - mext_button=new QPushButton(this); - mext_button->setText("Mext"); - mext_button->setGeometry(xptr,yptr,80,25); - mext_button->show(); - yptr+=30; - connect(mext_button,SIGNAL(clicked()),this,SLOT(displayMext())); - } - if(wavefile->getLevlChunk()) { - levl_button=new QPushButton(this); - levl_button->setText("Levl"); - levl_button->setGeometry(xptr,yptr,80,25); - levl_button->show(); - yptr+=30; - connect(levl_button,SIGNAL(clicked()),this,SLOT(displayLevl())); - } - if(wavefile->getAIR1Chunk()) { - AIR1_button=new QPushButton(this); - AIR1_button->setText("AIR1"); - AIR1_button->setGeometry(xptr,yptr,80,25); - AIR1_button->show(); - yptr+=30; - connect(AIR1_button,SIGNAL(clicked()),this,SLOT(displayAIR1())); - } - y_chunk_button=yptr; - wave_chunk_label->show(); - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - setGeometry(geometry().x(),geometry().y(),sizeHint().width(), - sizeHint().height()); -} - - -void MainWidget::destroyChunkButtons() -{ - if(fmt_button!=NULL) { - fmt_button->hide(); - delete fmt_button; - fmt_button=NULL; - } - - if(data_button!=NULL) { - data_button->hide(); - delete data_button; - data_button=NULL; - } - - if(fact_button!=NULL) { - fact_button->hide(); - delete fact_button; - fact_button=NULL; - } - - if(cart_button!=NULL) { - cart_button->hide(); - delete cart_button; - cart_button=NULL; - } - - if(bext_button!=NULL) { - bext_button->hide(); - delete bext_button; - bext_button=NULL; - } - - if(mext_button!=NULL) { - mext_button->hide(); - delete mext_button; - mext_button=NULL; - } - wave_chunk_label->hide(); - y_chunk_button=40; - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); - setGeometry(geometry().x(),geometry().y(),sizeHint().width(), - sizeHint().height()); -} - - -void MainWidget::loadWaveFile() -{ - QString str; - - delete wavefile; - wavefile=NULL; - destroyChunkButtons(); - wave_name=QFileDialog::getOpenFileName(wave_path,RD_AUDIO_FILE_FILTER,this); - if(wave_name.isEmpty()) { - wave_loaded=false; - wave_path=RDHomeDir(); - wave_base=tr("RHPIPlay"); - update(); - return; - } - wavefile=new RDWaveFile(wave_name); - if(wavefile->openWave()) { - wave_loaded=true; - wave_path=RDGetPathPart(wave_name); - wave_base="RHPIPlay - "; - if(wavefile->getCartChunk()) { - wave_base+=wavefile->getCartTitle(); - } - else { - wave_base+=RDGetBasePart(wave_name); - } - createChunkButtons(); - update(); - } - else { - QMessageBox::warning(this,tr("RDChunk"),tr("Unable to open file!")); - delete wavefile; - wavefile=NULL; - } -} - - -void MainWidget::quitMainWidget() -{ - qApp->quit(); -} - - -void MainWidget::paintEvent(QPaintEvent *paintevent) -{ - QPainter *p=new QPainter(this); - p->setFont(QFont("arial",12,QFont::Bold)); - - if(wave_loaded) { - p->moveTo(10,65); - p->lineTo(sizeHint().width()-10,65); - p->lineTo(sizeHint().width()-10,y_chunk_button); - p->lineTo(10,y_chunk_button); - p->lineTo(10,65); - } -} - - -void MainWidget::displayFmt() -{ - char string[256]; - QString output; - QString str1; - QString str2; - - // - // Basic Data, common to all valid WAV files - // - switch(wavefile->getFormatTag()) { - case WAVE_FORMAT_PCM: - str1=QString(tr("Format: PCM")); - str2=QString(tr("Linear")); - sprintf(string,"%s%d %s\n",(const char *)str1, - wavefile->getBitsPerSample(),(const char *)str2); - output=output.append(string); - break; - case WAVE_FORMAT_MPEG: - str1=QString(tr("Format: MPEG Layer")); - sprintf(string,"%s %d\n",(const char *)str1,wavefile->getHeadLayer()); - output=output.append(string); - break; - case WAVE_FORMAT_VORBIS: - str1=QString(tr("Format: OggVorbis")); - sprintf(string,"%s\n",(const char *)str1); - output=output.append(string); - break; - default: - str1=QString(tr("Format: Unknown")); - sprintf(string,"Format: %s\n",(const char *)str1); - output=output.append(string); - break; - } - - str1=QString(tr("Channels:")); - sprintf(string,"%s %d\n",(const char *)str1,wavefile->getChannels()); - output=output.append(string); - - str1=QString(tr("Sample Rate:")); - str2=QString(tr("samples/sec")); - sprintf(string,"%s %d %s\n",(const char *)str1,wavefile->getSamplesPerSec(), - (const char *)str2); - output=output.append(string); - - str1=QString(tr("Average Data Rate:")); - str2=QString(tr("bytes/sec")); - sprintf(string,"%s %d %s\n",(const char *)str1,wavefile->getAvgBytesPerSec(), - (const char *)str2); - output=output.append(string); - - str1=QString(tr("Frame Size:")); - str2=QString(tr("byte3s")); - sprintf(string,"%s %d %s\n",(const char *)str1,wavefile->getBlockAlign(), - (const char *)str2); - output=output.append(string); - - // - // PCM Linear specific data - // - if(wavefile->getFormatTag()==WAVE_FORMAT_PCM) { - str1=QString(tr("Sample Size:")); - str2=QString(tr("bits/chan/sample")); - sprintf(string,"%s %d %s\n",(const char *)str1, - wavefile->getBitsPerSample(), - (const char *)str2); - output=output.append(string); - } - - // - // MPEG-1 specific data - // - if(wavefile->getFormatTag()==WAVE_FORMAT_MPEG) { - str1=QString(tr("Bit Rate:")); - str2=QString(tr("bits/sec")); - sprintf(string,"%s %d %s\n",(const char *)str1,wavefile->getHeadBitRate(), - (const char *)str2); - output=output.append(string); - sprintf(string,tr("Codec Mode(s): ")); - if((wavefile->getHeadMode()&ACM_MPEG_STEREO)!=0) { - strcat(string,tr("Stereo ")); - } - if((wavefile->getHeadMode()&ACM_MPEG_JOINTSTEREO)!=0) { - strcat(string,tr("JointStereo ")); - } - if((wavefile->getHeadMode()&ACM_MPEG_DUALCHANNEL)!=0) { - strcat(string,tr("DualChannel ")); - } - if((wavefile->getHeadMode()&ACM_MPEG_SINGLECHANNEL)!=0) { - strcat(string,tr("SingleChannel ")); - } - strcat(string,"\n"); - output=output.append(string); - - switch(wavefile->getHeadEmphasis()) { - case 1: - str1=QString(tr("None")); - sprintf(string,"Emphasis: %s\n",(const char *)str1); - output=output.append(string); - break; - case 2: - str1=QString(tr("50/15 ms")); - sprintf(string,"Emphasis: %s\n",(const char *)str1); - output=output.append(string); - break; - case 3: - str1=QString(tr("Reserved")); - sprintf(string,"Emphasis: %s\n",(const char *)str1); - output=output.append(string); - break; - case 4: - str1=QString(tr("CCITT J.17")); - sprintf(string,"Emphasis: %s\n",(const char *)str1); - output=output.append(string); - break; - default: - str1=QString(tr("Unknown")); - sprintf(string,"Emphasis: %s\n",(const char *)str1); - output=output.append(string); - break; - } - sprintf(string,tr("Flags: ")); - if((wavefile->getHeadFlags()&ACM_MPEG_PRIVATEBIT)!=0) { - strcat(string,tr("Private ")); - } - if((wavefile->getHeadFlags()&ACM_MPEG_COPYRIGHT)!=0) { - strcat(string,tr("Copyright ")); - } - if((wavefile->getHeadFlags()&ACM_MPEG_ORIGINALHOME)!=0) { - strcat(string,tr("Home ")); - } - if((wavefile->getHeadFlags()&ACM_MPEG_PROTECTIONBIT)!=0) { - strcat(string,"Protect "); - } - if((wavefile->getHeadFlags()&ACM_MPEG_ID_MPEG1)!=0) { - strcat(string,tr("MPEG ")); - } - strcat(string,"\n"); - output=output.append(string); - } - QMessageBox::information(this,tr("FMT Chunk"),output); - -} - -void MainWidget::displayData() -{ - QString str1; - QString str2; - char string[256]; - QString output; - - str1=QString(tr("Data Size:")); - str2=QString(tr("bytes")); - sprintf(string,"%s %d %s\n",(const char *)str1,wavefile->getDataLength(), - (const char *)str2); - output=output.append(string); - - QMessageBox::information(this,tr("DATA Chunk"),output); -} - - -void MainWidget::displayFact() -{ - QString str1; - QString str2; - char string[256]; - QString output; - - str1=QString(tr("Sample Size:")); - str2=QString(tr("samples")); - sprintf(string,"%s %d %s\n",(const char *)str1,wavefile->getSampleLength(), - (const char *)str2); - output=output.append(string); - - QMessageBox::information(this,"FACT Chunk",output); -} - - -void MainWidget::displayCart() -{ - QString str1; - QString str2; - char string[256]; - QString output; - bool timers_found=false; - -/* - sprintf(string,"Cart Chunk Version: %c.%c.%c\n", - (wavefile->getCartVersion()>>24)&255, - (wavefile->getCartVersion()>>16)&255, - (wavefile->getCartVersion()>>8)&255); - output=output.append(string); -*/ - output=output.append(tr("TITLE: ")); - output=output.append(wavefile->getCartTitle()); - output=output.append("\n"); - output=output.append(tr("ARTIST: ")); - output=output.append(wavefile->getCartArtist()); - output=output.append("\n"); - output=output.append(tr("CUT ID: ")); - output=output.append(wavefile->getCartCutID()); - output=output.append("\n"); - output=output.append(tr("CLIENT ID: ")); - output=output.append(wavefile->getCartClientID()); - output=output.append("\n"); - output=output.append(tr("CATEGORY: ")); - output=output.append(wavefile->getCartCategory()); - output=output.append("\n"); - output=output.append(tr("CLASSIFICATION: ")); - output=output.append(wavefile->getCartClassification()); - output=output.append("\n"); - output=output.append(tr("OUT CUE: ")); - output=output.append(wavefile->getCartOutCue()); - output=output.append("\n"); - output=output.append(tr("START DATE: ")); - output=output.append(wavefile->getCartStartDate().toString()); - output=output.append("\n"); - output=output.append(tr("START TIME: ")); - output=output.append(wavefile->getCartStartTime().toString()); - output=output.append("\n"); - output=output.append(tr("END DATE: ")); - output=output.append(wavefile->getCartEndDate().toString()); - output=output.append("\n"); - output=output.append(tr("END TIME: ")); - output=output.append(wavefile->getCartEndTime().toString()); - output=output.append("\n"); - output=output.append(tr("PRODUCER ID: ")); - output=output.append(wavefile->getCartProducerAppID()); - output=output.append("\n"); - output=output.append(tr("PRODUCER VERSION: ")); - output=output.append(wavefile->getCartProducerAppVer()); - output=output.append("\n"); - output=output.append(tr("USER DEFINED: ")); - output=output.append(wavefile->getCartUserDef()); - output=output.append("\n"); - if(wavefile->getCartLevelRef()>0) { - str1=QString(tr("LEVEL REFERENCE:")); - str2=QString(tr("dB")); - sprintf(string,"%s %5.1lf %s\n",(const char *)str1, - 20*log10((float)wavefile->getCartLevelRef()/32767), - (const char *)str2); - } - else { - str1=QString(tr("LEVEL REFERENCE:")); - str2=QString(tr("Undefined")); - sprintf(string,"%s %s\n",(const char *)str1,(const char *)str2); - } - output=output.append(string); - output=output.append(tr("URL: ")); - output=output.append(wavefile->getCartURL()); - output=output.append("\n"); - output=output.append(tr("CART TIMER(S): ")); - for(int i=0;igetCartTimerLabel(i).isEmpty()) { - output=output.append(wavefile->getCartTimerLabel(i)); - sprintf(string,": %u\n",wavefile->getCartTimerSample(i)); - output=output.append(string); - timers_found=true; - } - } - if(!timers_found) { - output=output.append("\n"); - } - output=output.append(tr("TAG TEXT: ")); - output=output.append(wavefile->getCartTagText()); - output=output.append("\n"); - - QMessageBox::information(this,tr("CART Chunk"),output); -} - - - -void MainWidget::displayBext() -{ - char string[256]; - QString output; - QString str; - - output=output.append(tr("DESCRIPTION: ")); - output=output.append(wavefile->getBextDescription()); - output=output.append("\n"); - output=output.append(tr("ORIGINATOR: ")); - output=output.append(wavefile->getBextOriginator()); - output=output.append("\n"); - output=output.append(tr("ORIGINATOR REFERENCE: ")); - output=output.append(wavefile->getBextOriginatorRef()); - output=output.append("\n"); - output=output.append(tr("ORIGINATION DATE: ")); - output=output.append(wavefile->getBextOriginationDate().toString()); - output=output.append("\n"); - output=output.append(tr("ORIGINATION TIME: ")); - output=output.append(wavefile->getBextOriginationTime().toString()); - output=output.append("\n"); - str=QString(tr("VERSION:")); - sprintf(string,"%s %d\n",(const char *)str,wavefile->getBextVersion()); - output=output.append(string); - output=output.append(tr("CODING HISTORY: ")); - output=output.append(wavefile->getBextCodingHistory()); - output=output.append("\n"); - - QMessageBox::information(this,tr("BEXT Chunk"),output); -} - - -void MainWidget::displayMext() -{ - QString output; - QString str1; - QString str2; - - output=output.append(tr("MPEG Data Composition: ")); - if(wavefile->getMextHomogenous()) { - output=output.append(tr("Homogenous")); - output=output.append("\n"); - if(wavefile->getMextPaddingUsed()) { - output=output.append(tr("The padding bit is active.")); - output=output.append("\n"); - } - else { - output=output.append(tr("The padding bit is inactive.")); - output=output.append("\n"); - } - if(wavefile->getMextHackedBitRate()) { - output=output.append(tr("The bit rate is non-standard.")); - output=output.append("\n"); - } - } - else { - output=output.append(tr("Non-homogenous")); - output=output.append("\n"); - } - if(wavefile->getMextFreeFormat()) { - output=output.append(tr("MPEG Format: Free Format")); - output=output.append("\n"); - } - else { - output=output.append(tr("MPEG Format: Constant Bit Rate")); - output=output.append("\n"); - } - str1=QString(tr("MPEG Frame Size:")); - str2=QString(tr("bytes")); - output=output.append(QString().sprintf("%s %d %s",(const char *)str1, - wavefile->getMextFrameSize(), - (const char *)str2)); - output=output.append("\n"); - str1=QString(tr("Ancillary Bytes:")); - str2=QString(tr("bytes")); - output=output.append(QString().sprintf("%s %d %s\n",(const char *)str1, - wavefile->getMextAncillaryLength(), - (const char *)str2)); - output=output.append("\n"); - if(wavefile->getMextAncillaryLength()>0) { - output=output.append(tr("Ancillary Data: ")); - if(wavefile->getMextLeftEnergyPresent()) { - output=output.append(tr(" LeftEnergy")); - } - if(wavefile->getMextRightEnergyPresent()) { - output=output.append(tr(" RightEnergy")); - } - if(wavefile->getMextPrivateDataPresent()) { - output=output.append(tr(" PrivateData")); - } - output=output.append("\n"); - } - - QMessageBox::information(this,tr("MEXT Chunk"),output); -} - - -void MainWidget::displayLevl() -{ - QString output; - QString str; - - output=output.append(tr("Version: ")); - output=output.append(QString().sprintf("%d\n",wavefile->getLevlVersion())); - output=output.append(tr("Samples per Peak: ")); - output= - output.append(QString().sprintf("%d\n",wavefile->getLevlBlockSize())); - output=output.append(tr("Sample Channels: ")); - output=output.append(QString().sprintf("%d\n",wavefile->getLevlChannels())); - output=output.append(tr("Overall Peak: ")); - if(wavefile->getLevlPeak()==0) { - output=output.append(tr("Unknown")); - output=output.append("\n"); - } - else { - str=QString(tr("dBFS")); - output=output.append(QString().sprintf("%5.1f %s\n", - 20.0*log10((double)wavefile->getLevlPeak()/32768.0), - (const char *)str)); - } - output=output.append(tr("Timestamp: ")); - output= - output.append(wavefile->getLevlTimestamp().toString("MM-dd-yyyy hh:mm:ss")); - - QMessageBox::information(this,tr("LEVL Chunk"),output); -} - - -void MainWidget::displayAIR1() -{ -} - - -int main(int argc,char *argv[]) -{ - QApplication a(argc,argv); - - // - // Load Translations - // - // - // Load Translations - // - QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(), - "."); - a.installTranslator(&qt); - - QTranslator rd(0); - rd.load(QString(PREFIX)+QString("/share/rivendell/librd_")+ - QTextCodec::locale(),"."); - a.installTranslator(&rd); - - QTranslator rdhpi(0); - rdhpi.load(QString(PREFIX)+QString("/share/rivendell/librdhpi_")+ - QTextCodec::locale(),"."); - a.installTranslator(&rdhpi); - - QTranslator tr(0); - tr.load(QString(PREFIX)+QString("/share/rivendell/rdutils_")+ - QTextCodec::locale(),"."); - a.installTranslator(&tr); - - // - // Start Event Loop - // - MainWidget *w=new MainWidget(); - a.setMainWidget(w); - w->setGeometry(QRect(QPoint(0,0),w->sizeHint())); - w->show(); - return a.exec(); -} - - diff --git a/utils/rdchunk/rdchunk.h b/utils/rdchunk/rdchunk.h deleted file mode 100644 index 09e2643b..00000000 --- a/utils/rdchunk/rdchunk.h +++ /dev/null @@ -1,80 +0,0 @@ -// rdchunk.h -// -// Utility for examining chunk data in WAV files. -// -// (C) Copyright 2002-2004,2008,2016 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#ifndef RDCHUNK_H -#define RDCHUNK_H - -#include -#include -#include - -#include - -#define MIXER_X 150 -#define MIXER_Y 200 -#define METER_UPDATE_INTERVAL 50 - -class MainWidget : public QWidget -{ - Q_OBJECT - public: - MainWidget(QWidget *parent=0); - QSize sizeHint() const; - QSizePolicy sizePolicy() const; - - protected: - void paintEvent(QPaintEvent *); - - private slots: - void loadWaveFile(); - void quitMainWidget(); - void displayFmt(); - void displayData(); - void displayFact(); - void displayCart(); - void displayBext(); - void displayMext(); - void displayLevl(); - void displayAIR1(); - - private: - void createChunkButtons(); - void destroyChunkButtons(); - QTimer *meter_timer; - RDWaveFile *wavefile; - int y_chunk_button; - bool wave_loaded; - QString wave_name; - QString wave_path; - QString wave_base; - QPushButton *fmt_button; - QPushButton *data_button; - QPushButton *fact_button; - QPushButton *cart_button; - QPushButton *bext_button; - QPushButton *mext_button; - QPushButton *levl_button; - QPushButton *AIR1_button; - QLabel *wave_chunk_label; - int play_port; -}; - - -#endif // RDCHUNK_H diff --git a/utils/rdchunk/rdchunk.pro b/utils/rdchunk/rdchunk.pro deleted file mode 100644 index e4bc85d5..00000000 --- a/utils/rdchunk/rdchunk.pro +++ /dev/null @@ -1,26 +0,0 @@ -# rdchunk.pro -# -# The utils/rdchunk/ QMake project file for Rivendell -# -# (C) Copyright 2003-2006,2008,2016 Fred Gleason -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -SOURCES += rdchunk.cpp -HEADERS += rdchunk.h - -TRANSLATIONS += rdchunk_es.ts -TRANSLATIONS += rdchunk_fr.ts -TRANSLATIONS += rdchunk_de.ts -TRANSLATIONS += rdchunk_pt_BR.ts diff --git a/utils/rdchunk/rdchunk_de.ts b/utils/rdchunk/rdchunk_de.ts deleted file mode 100644 index f7e23ab9..00000000 --- a/utils/rdchunk/rdchunk_de.ts +++ /dev/null @@ -1,373 +0,0 @@ - - - MainWidget - - Load - Laden - - - RHPIPlay - RHPIPlay - - - Format: PCM - Format: PCM - - - Linear - Linear - - - Format: MPEG Layer - Format: MPEG Layer - - - Format: OggVorbis - Format: OggVorbis - - - Format: Unknown - Format: Unknown - - - Channels: - Kanäle: - - - Sample Rate: - Samplerate: - - - samples/sec - samples/sec - - - Average Data Rate: - Durchschnittliche Datenrate: - - - bytes/sec - bytes/sec - - - Frame Size: - Framegröße: - - - byte3s - byte3s - - - Sample Size: - Samplegröße: - - - bits/chan/sample - Bits/Kanal/Sample - - - Bit Rate: - Bitrate: - - - bits/sec - bits/sec - - - Codec Mode(s): - Codec Mode(s): - - - Stereo - Stereo - - - JointStereo - JointStereo - - - DualChannel - Zwei Kanäle - - - SingleChannel - Ein Kanal - - - None - Keine - - - 50/15 ms - 50/15 ms - - - Reserved - Reserviert - - - CCITT J.17 - CCITT J.17 - - - Unknown - unbekannt - - - Flags: - Flags: - - - Private - Privat - - - Copyright - Copyright - - - Home - Home - - - MPEG - MPEG - - - FMT Chunk - FMT Chunk - - - Data Size: - Datengröße: - - - bytes - bytes - - - DATA Chunk - DATA Chunk - - - samples - samples - - - TITLE: - TITEL: - - - ARTIST: - KÜNSTLER: - - - CUT ID: - CUT ID: - - - CLIENT ID: - KUNDEN ID: - - - CATEGORY: - KATEGORIE: - - - CLASSIFICATION: - KLASSIFIKATION: - - - OUT CUE: - OUTCUE: - - - START DATE: - STARTDATUM: - - - START TIME: - STARTZEIT: - - - END DATE: - ENDDATUM: - - - END TIME: - ENDZEIT: - - - PRODUCER ID: - PRODUZENTEN-ID: - - - PRODUCER VERSION: - PRODUZENTEN-VERSION: - - - USER DEFINED: - BENUTZERDEFINIERT: - - - LEVEL REFERENCE: - LEVELREFERENZ: - - - dB - dB - - - Undefined - Nicht definiert - - - URL: - URL: - - - CART TIMER(S): - CART TIMER: - - - TAG TEXT: - TAG TEXT: - - - CART Chunk - CART Chunk - - - DESCRIPTION: - BESCHREIBUNG: - - - ORIGINATOR: - HERKUNFT: - - - ORIGINATOR REFERENCE: - HERKUNFTSREFERENZ: - - - ORIGINATION DATE: - HERKUNFTSDATUM: - - - ORIGINATION TIME: - HERKUNFTSZEIT: - - - VERSION: - VERSION: - - - CODING HISTORY: - CODING-HISTORIE: - - - BEXT Chunk - BEXT Chunk - - - MPEG Data Composition: - MPEG Datenkomposition: - - - Homogenous - Homogen - - - The padding bit is active. - Das Padding-Bit ist aktiv. - - - The padding bit is inactive. - Das Padding-Bit ist inaktiv. - - - The bit rate is non-standard. - Die Bitrate weicht vom Standard ab. - - - Non-homogenous - Nicht homogen - - - MPEG Format: Free Format - MPEG Format: Freies Format - - - MPEG Format: Constant Bit Rate - MPEG Format: Konstante Bitrate - - - MPEG Frame Size: - MPEG Frame Size: - - - Ancillary Bytes: - Ancillary Bytes: - - - Ancillary Data: - Ancillary Data: - - - LeftEnergy - LeftEnergy - - - RightEnergy - RightEnergy - - - PrivateData - PrivateData - - - MEXT Chunk - MEXT Chunk - - - Version: - Version: - - - Samples per Peak: - Samples pro Peak: - - - Sample Channels: - Sample Kanäle: - - - Overall Peak: - Overall Peak: - - - dBFS - dBFS - - - Timestamp: - Timestamp: - - - LEVL Chunk - LEVL Chunk - - - Chunks - Chunks - - - RDChunk - RDChunk - - - Unable to open file! - Kann die Datei nicht öffnen! - - - diff --git a/utils/rdchunk/rdchunk_es.ts b/utils/rdchunk/rdchunk_es.ts deleted file mode 100644 index 73a9c65c..00000000 --- a/utils/rdchunk/rdchunk_es.ts +++ /dev/null @@ -1,373 +0,0 @@ - - - MainWidget - - Load - Cargar - - - RHPIPlay - - - - Format: PCM - Formato: PCM - - - Linear - Lineal - - - Format: MPEG Layer - Formato: MPEG Capa - - - Format: OggVorbis - Formato: OGGVorbis - - - Format: Unknown - Formato: Desconocido - - - Channels: - Canales: - - - Sample Rate: - Tasa de muestreo: - - - samples/sec - muestras/seg - - - Average Data Rate: - Tasa promedio de datos: - - - bytes/sec - bytes/seg - - - Frame Size: - Tamaño de marco: - - - byte3s - - - - Sample Size: - Tamaño de muestra: - - - bits/chan/sample - bits/canal/muestra - - - Bit Rate: - Tasa de Bit: - - - bits/sec - bits/seg - - - Codec Mode(s): - Modo(s) de Codec: - - - Stereo - Estéreo - - - JointStereo - - - - DualChannel - - - - SingleChannel - - - - None - Ninguno - - - 50/15 ms - - - - Reserved - Reservado - - - CCITT J.17 - - - - Unknown - Desconocido - - - Flags: - Banderas: - - - Private - Privado - - - Copyright - - - - Home - - - - MPEG - - - - FMT Chunk - - - - Data Size: - Tamaño de datos: - - - bytes - bytes - - - DATA Chunk - - - - samples - muestras - - - TITLE: - TÍTULO: - - - ARTIST: - ARTISTA: - - - CUT ID: - ID AUDIO: - - - CLIENT ID: - ID CLIENTE: - - - CATEGORY: - CATEGORÍA: - - - CLASSIFICATION: - CLASIFICACIÓN: - - - OUT CUE: - - - - START DATE: - FECHA INICIO: - - - START TIME: - HORA INICIO: - - - END DATE: - FECHA FIN: - - - END TIME: - HORA FIN: - - - PRODUCER ID: - ID PRODUCTOR: - - - PRODUCER VERSION: - VERSIÓN DEL PRODUCTOR: - - - USER DEFINED: - DEFINIDO POR USUARIO: - - - LEVEL REFERENCE: - NIVEL DE REFERENCIA: - - - dB - dB - - - Undefined - Indefinido - - - URL: - URL: - - - CART TIMER(S): - - - - TAG TEXT: - TEXTO ETIQ: - - - CART Chunk - - - - DESCRIPTION: - DESCRIPCIÓN: - - - ORIGINATOR: - ORIGEN: - - - ORIGINATOR REFERENCE: - REFERENCIA DEL ORIGEN: - - - ORIGINATION DATE: - FECHA DE ORIGEN: - - - ORIGINATION TIME: - HORA DE ORIGEN: - - - VERSION: - VERSION: - - - CODING HISTORY: - - - - BEXT Chunk - - - - MPEG Data Composition: - Composición de datos MPEG: - - - Homogenous - Homogéneo - - - The padding bit is active. - - - - The padding bit is inactive. - - - - The bit rate is non-standard. - La tasa de bits no es estándar. - - - Non-homogenous - No homogéneo - - - MPEG Format: Free Format - Formato MPEG: formato libre - - - MPEG Format: Constant Bit Rate - Formato MPEG: Tasa de bit constante - - - MPEG Frame Size: - Tamaño frame MPEG: - - - Ancillary Bytes: - - - - Ancillary Data: - - - - LeftEnergy - - - - RightEnergy - - - - PrivateData - - - - MEXT Chunk - - - - Version: - Versión: - - - Samples per Peak: - Muestras por pico: - - - Sample Channels: - Canales de muestra: - - - Overall Peak: - - - - dBFS - - - - Timestamp: - - - - LEVL Chunk - - - - Chunks - - - - RDChunk - - - - Unable to open file! - ¡No pude abrir el archivo! - - - diff --git a/utils/rdchunk/rdchunk_fr.ts b/utils/rdchunk/rdchunk_fr.ts deleted file mode 100644 index 7cb9dbf8..00000000 --- a/utils/rdchunk/rdchunk_fr.ts +++ /dev/null @@ -1,373 +0,0 @@ - - - MainWidget - - Load - - - - RHPIPlay - - - - Format: PCM - - - - Linear - - - - Format: MPEG Layer - - - - Format: OggVorbis - - - - Format: Unknown - - - - Channels: - - - - Sample Rate: - - - - samples/sec - - - - Average Data Rate: - - - - bytes/sec - - - - Frame Size: - - - - byte3s - - - - Sample Size: - - - - bits/chan/sample - - - - Bit Rate: - - - - bits/sec - - - - Codec Mode(s): - - - - Stereo - - - - JointStereo - - - - DualChannel - - - - SingleChannel - - - - None - - - - 50/15 ms - - - - Reserved - - - - CCITT J.17 - - - - Unknown - - - - Flags: - - - - Private - - - - Copyright - - - - Home - - - - MPEG - - - - FMT Chunk - - - - Data Size: - - - - bytes - - - - DATA Chunk - - - - samples - - - - TITLE: - - - - ARTIST: - - - - CUT ID: - - - - CLIENT ID: - - - - CATEGORY: - - - - CLASSIFICATION: - - - - OUT CUE: - - - - START DATE: - - - - START TIME: - - - - END DATE: - - - - END TIME: - - - - PRODUCER ID: - - - - PRODUCER VERSION: - - - - USER DEFINED: - - - - LEVEL REFERENCE: - - - - dB - - - - Undefined - - - - URL: - - - - CART TIMER(S): - - - - TAG TEXT: - - - - CART Chunk - - - - DESCRIPTION: - - - - ORIGINATOR: - - - - ORIGINATOR REFERENCE: - - - - ORIGINATION DATE: - - - - ORIGINATION TIME: - - - - VERSION: - - - - CODING HISTORY: - - - - BEXT Chunk - - - - MPEG Data Composition: - - - - Homogenous - - - - The padding bit is active. - - - - The padding bit is inactive. - - - - The bit rate is non-standard. - - - - Non-homogenous - - - - MPEG Format: Free Format - - - - MPEG Format: Constant Bit Rate - - - - MPEG Frame Size: - - - - Ancillary Bytes: - - - - Ancillary Data: - - - - LeftEnergy - - - - RightEnergy - - - - PrivateData - - - - MEXT Chunk - - - - Version: - - - - Samples per Peak: - - - - Sample Channels: - - - - Overall Peak: - - - - dBFS - - - - Timestamp: - - - - LEVL Chunk - - - - Chunks - - - - RDChunk - - - - Unable to open file! - - - - diff --git a/utils/rdchunk/rdchunk_pt_BR.ts b/utils/rdchunk/rdchunk_pt_BR.ts deleted file mode 100644 index a3c2698e..00000000 --- a/utils/rdchunk/rdchunk_pt_BR.ts +++ /dev/null @@ -1,373 +0,0 @@ - - - MainWidget - - Load - - - - Chunks - - - - RHPIPlay - - - - RDChunk - - - - Unable to open file! - - - - Format: PCM - - - - Linear - - - - Format: MPEG Layer - - - - Format: OggVorbis - - - - Format: Unknown - - - - Channels: - - - - Sample Rate: - - - - samples/sec - - - - Average Data Rate: - - - - bytes/sec - - - - Frame Size: - - - - byte3s - - - - Sample Size: - - - - bits/chan/sample - - - - Bit Rate: - - - - bits/sec - - - - Codec Mode(s): - - - - Stereo - - - - JointStereo - - - - DualChannel - - - - SingleChannel - - - - None - - - - 50/15 ms - - - - Reserved - - - - CCITT J.17 - - - - Unknown - - - - Flags: - - - - Private - - - - Copyright - - - - Home - - - - MPEG - - - - FMT Chunk - - - - Data Size: - - - - bytes - - - - DATA Chunk - - - - samples - - - - TITLE: - - - - ARTIST: - - - - CUT ID: - - - - CLIENT ID: - - - - CATEGORY: - - - - CLASSIFICATION: - - - - OUT CUE: - - - - START DATE: - - - - START TIME: - - - - END DATE: - - - - END TIME: - - - - PRODUCER ID: - - - - PRODUCER VERSION: - - - - USER DEFINED: - - - - LEVEL REFERENCE: - - - - dB - - - - Undefined - - - - URL: - - - - CART TIMER(S): - - - - TAG TEXT: - - - - CART Chunk - - - - DESCRIPTION: - - - - ORIGINATOR: - - - - ORIGINATOR REFERENCE: - - - - ORIGINATION DATE: - - - - ORIGINATION TIME: - - - - VERSION: - - - - CODING HISTORY: - - - - BEXT Chunk - - - - MPEG Data Composition: - - - - Homogenous - - - - The padding bit is active. - - - - The padding bit is inactive. - - - - The bit rate is non-standard. - - - - Non-homogenous - - - - MPEG Format: Free Format - - - - MPEG Format: Constant Bit Rate - - - - MPEG Frame Size: - - - - Ancillary Bytes: - - - - Ancillary Data: - - - - LeftEnergy - - - - RightEnergy - - - - PrivateData - - - - MEXT Chunk - - - - Version: - - - - Samples per Peak: - - - - Sample Channels: - - - - Overall Peak: - - - - dBFS - - - - Timestamp: - - - - LEVL Chunk - - - - diff --git a/utils/rdcleandirs/Makefile.am b/utils/rdcleandirs/Makefile.am index 0928010a..bc4617cd 100644 --- a/utils/rdcleandirs/Makefile.am +++ b/utils/rdcleandirs/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdcleandirs -## -## (C) Copyright 2015 Fred Gleason +## (C) Copyright 2015-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -31,7 +29,7 @@ sbin_PROGRAMS = rdcleandirs dist_rdcleandirs_SOURCES = rdcleandirs.cpp rdcleandirs.h -rdcleandirs_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdcleandirs_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.exe\ diff --git a/utils/rdclilogedit/Makefile.am b/utils/rdclilogedit/Makefile.am index 8eba5206..f5e9c17e 100644 --- a/utils/rdclilogedit/Makefile.am +++ b/utils/rdclilogedit/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdclilogedit -## -## (C) Copyright 2016 Fred Gleason +## (C) Copyright 2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -36,7 +34,7 @@ dist_rdclilogedit_SOURCES = help.cpp\ nodist_rdclilogedit_SOURCES = moc_rdclilogedit.cpp -rdclilogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdclilogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdcollect/Makefile.am b/utils/rdcollect/Makefile.am index 96205f75..8c00ceb8 100644 --- a/utils/rdcollect/Makefile.am +++ b/utils/rdcollect/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdcollect -## -## (C) Copyright 2002-2010,2016 Fred Gleason +## (C) Copyright 2002-2010,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -31,7 +29,7 @@ bin_PROGRAMS = rdcollect dist_rdcollect_SOURCES = rdcollect.cpp rdcollect.h -rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdcollect.pro diff --git a/utils/rdcollect/rdcollect.cpp b/utils/rdcollect/rdcollect.cpp index 79a86e56..37243d1a 100644 --- a/utils/rdcollect/rdcollect.cpp +++ b/utils/rdcollect/rdcollect.cpp @@ -83,7 +83,7 @@ MainObject::MainObject(QObject *parent) // Process Data // QStringList src_lines; - for(unsigned i=0;i0) { - lines->push_back(line.left(line.length()-1)); + lines->push_back(QString(line).left(strlen(line)-1)); } file.close(); } @@ -140,7 +140,7 @@ void MainObject::SortLines(QStringList *lines,std::vector *index) // // Initialize Index // - for(unsigned i=0;isize();i++) { + for(int i=0;isize();i++) { index->push_back(i); start_times.push_back(ReadTime((*lines)[i])); } @@ -151,7 +151,7 @@ void MainObject::SortLines(QStringList *lines,std::vector *index) bool modified=true; while(modified) { modified=false; - for(unsigned i=1;isize();i++) { + for(int i=1;isize();i++) { if(start_times[i-1]>start_times[i]) { QTime time=start_times[i-1]; start_times[i-1]=start_times[i]; @@ -174,7 +174,7 @@ int MainObject::WriteOutputFile(const QString &filename, if((f=fopen(filename,"w"))==NULL) { return errno; } - for(unsigned i=0;iat(i)]); } fclose(f); @@ -187,7 +187,7 @@ void MainObject::AddDirs(const QString &path,QStringList *dirs) QDir dir(path); dir.setFilter(QDir::Dirs); QStringList list=dir.entryList(); - for(unsigned i=0;ipush_back(path+"/"+list[i]); AddDirs(path+"/"+list[i],dirs); diff --git a/utils/rdconvert/Makefile.am b/utils/rdconvert/Makefile.am index e04ebd7d..4ea3881d 100644 --- a/utils/rdconvert/Makefile.am +++ b/utils/rdconvert/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdconvert -## -## (C) Copyright 2017 Fred Gleason +## (C) Copyright 2017-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -31,7 +29,7 @@ bin_PROGRAMS = rdconvert dist_rdconvert_SOURCES = rdconvert.cpp rdconvert.h -rdconvert_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdconvert_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.exe\ diff --git a/utils/rdconvert/rdconvert.cpp b/utils/rdconvert/rdconvert.cpp index 205f8aa0..aeac7805 100644 --- a/utils/rdconvert/rdconvert.cpp +++ b/utils/rdconvert/rdconvert.cpp @@ -29,7 +29,7 @@ MainObject::MainObject(QObject *parent) :QObject(parent) { - unsigned schema=0; + int schema=0; destination_settings=new RDSettings(); start_point=-1; @@ -179,8 +179,7 @@ MainObject::MainObject(QObject *parent) // Open Database // QString err (tr("rdconvert: ")); - QSqlDatabase *db=RDInitDb(&schema,&err); - if(!db) { + if(!RDOpenDb(&schema,&err,rdconfig)) { fprintf(stderr,err.ascii()); delete cmd; exit(256); diff --git a/utils/rddbmgr/Makefile.am b/utils/rddbmgr/Makefile.am index 9be25339..7619808e 100644 --- a/utils/rddbmgr/Makefile.am +++ b/utils/rddbmgr/Makefile.am @@ -1,7 +1,5 @@ ## Makefile.am ## -## MAkefile.am for rivendell/utils/rddbmgr -## ## (C) Copyright 2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -38,7 +36,7 @@ dist_rddbmgr_SOURCES = check.cpp\ schemamap.cpp\ updateschema.cpp -rddbmgr_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rddbmgr_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.exe\ diff --git a/utils/rddbmgr/check.cpp b/utils/rddbmgr/check.cpp index c1cb311a..1a916707 100644 --- a/utils/rddbmgr/check.cpp +++ b/utils/rddbmgr/check.cpp @@ -26,6 +26,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -141,7 +143,7 @@ void MainObject::RelinkAudio(const QString &srcdir) const QDir dir(srcdir); QStringList files=dir.entryList(QDir::Files|QDir::Readable|QDir::Hidden); - for(unsigned i=0;iaudioRoot()); QStringList list=dir.entryList("??????_???.wav",QDir::Files); - for(unsigned i=0;i #include "rddbmgr.h" +//Added by qt3to4: +#include bool MainObject::Modify(QString *err_msg,int set_schema) const { diff --git a/utils/rddbmgr/rddbmgr.cpp b/utils/rddbmgr/rddbmgr.cpp index 8b8d32ec..1c9dc3d5 100644 --- a/utils/rddbmgr/rddbmgr.cpp +++ b/utils/rddbmgr/rddbmgr.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -282,19 +283,14 @@ MainObject::MainObject(QObject *parent) // // Open Database // - QSqlDatabase *db=QSqlDatabase::addDatabase(db_mysql_driver); - if(!db) { - fprintf(stderr,"rddbmgr: unable to connect to database server\n"); - exit(1); - } - db->setDatabaseName(db_mysql_database); - db->setUserName(db_mysql_loginname); - db->setPassword(db_mysql_password); - db->setHostName(db_mysql_hostname); - if(!db->open()) { + QSqlDatabase db=QSqlDatabase::addDatabase(db_mysql_driver); + db.setDatabaseName(db_mysql_database); + db.setUserName(db_mysql_loginname); + db.setPassword(db_mysql_password); + db.setHostName(db_mysql_hostname); + if(!db.open()) { fprintf(stderr,"rddbmgr: unable to open database [%s]\n", - (const char *)db->lastError().text()); - db->removeDatabase(db_mysql_database); + (const char *)db.lastError().text()); exit(1); } db_table_create_postfix= diff --git a/utils/rddbmgr/rddbmgr.h b/utils/rddbmgr/rddbmgr.h index be64e985..40d39910 100644 --- a/utils/rddbmgr/rddbmgr.h +++ b/utils/rddbmgr/rddbmgr.h @@ -22,6 +22,8 @@ #define RDDBMGR_H #include +//Added by qt3to4: +#include #include #include diff --git a/utils/rddelete/Makefile.am b/utils/rddelete/Makefile.am index 531f896c..ecd3d452 100644 --- a/utils/rddelete/Makefile.am +++ b/utils/rddelete/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rddelete -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -33,7 +31,7 @@ dist_rddelete_SOURCES = rddelete.cpp rddelete.h nodist_rddelete_SOURCES = moc_rddelete.cpp -rddelete_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rddelete_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rddelete/rddelete.cpp b/utils/rddelete/rddelete.cpp index fdf5bdb7..11a345ff 100644 --- a/utils/rddelete/rddelete.cpp +++ b/utils/rddelete/rddelete.cpp @@ -48,8 +48,8 @@ MainObject::MainObject(QObject *parent) fprintf(stderr,"rddelete: %s\n",(const char *)err_msg); exit(1); } - connect(RDDbStatus(),SIGNAL(logText(RDConfig::LogPriority,const QString &)), - this,SLOT(log(RDConfig::LogPriority,const QString &))); + // connect(RDDbStatus(),SIGNAL(logText(RDConfig::LogPriority,const QString &)), + // this,SLOT(log(RDConfig::LogPriority,const QString &))); // // Read Command Options diff --git a/utils/rddgimport/Makefile.am b/utils/rddgimport/Makefile.am index 523c5627..ac7adf9a 100644 --- a/utils/rddgimport/Makefile.am +++ b/utils/rddgimport/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rddgimport -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -36,8 +34,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rddgimport_*.qm all: - @QT_BIN@/lupdate rddgimport.pro - @QT_BIN@/lrelease rddgimport.pro + lupdate-qt4 rddgimport.pro + lrelease-qt4 rddgimport.pro bin_PROGRAMS = rddgimport @@ -46,7 +44,7 @@ dist_rddgimport_SOURCES = event.cpp event.h\ nodist_rddgimport_SOURCES = moc_rddgimport.cpp -rddgimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rddgimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rddgimport.pro\ rddgimport_de.ts\ diff --git a/utils/rddgimport/rddgimport.cpp b/utils/rddgimport/rddgimport.cpp index 00a49e03..7f3acf1a 100644 --- a/utils/rddgimport/rddgimport.cpp +++ b/utils/rddgimport/rddgimport.cpp @@ -25,10 +25,14 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -123,7 +127,7 @@ MainWidget::MainWidget(QWidget *parent) // // Date Selector // - dg_date_edit=new QDateEdit(this); + dg_date_edit=new Q3DateEdit(this); dg_date_edit->setDate(QDate::currentDate()); dg_date_label=new QLabel(dg_date_edit,tr("Date:"),this); dg_date_label->setFont(label_font); @@ -142,7 +146,7 @@ MainWidget::MainWidget(QWidget *parent) // // Messages Area // - dg_messages_text=new QTextEdit(this); + dg_messages_text=new Q3TextEdit(this); dg_messages_text->setReadOnly(true); dg_messages_label=new QLabel(dg_service_box,tr("Messages"),this); dg_messages_label->setFont(label_font); @@ -215,7 +219,7 @@ void MainWidget::filenameSelectedData() filename=RDGetHomeDir(); } filename= - QFileDialog::getOpenFileName(filename,tr("Text Files")+" (*.txt *.TXT);;"+ + Q3FileDialog::getOpenFileName(filename,tr("Text Files")+" (*.txt *.TXT);;"+ tr("All Files")+" (*.*)",this); if(!filename.isEmpty()) { dg_filename_edit->setText(filename); @@ -303,7 +307,7 @@ bool MainWidget::LoadEvents() if((f=fopen(dg_filename_edit->text(),"r"))==NULL) { QMessageBox::warning(this,tr("RDDgImport"), tr("Unable to open source file")+"["+ - strerror(errno)+"]."); + QString(strerror(errno))+"]."); return false; } while(fgets(data,1024,f)!=NULL) { @@ -374,7 +378,7 @@ bool MainWidget::WriteTrafficFile() rda->config(),dg_svc->name()); if((f=fopen(outname,"w"))==NULL) { LogMessage(tr("WARNING: Unable to open traffic output file")+" \""+ - outname+"\" ["+strerror(errno)+"]."); + outname+"\" ["+QString(strerror(errno))+"]."); return false; } @@ -630,7 +634,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(), + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(), "."); a.installTranslator(&qt); diff --git a/utils/rddgimport/rddgimport.h b/utils/rddgimport/rddgimport.h index 19df2003..8c087c92 100644 --- a/utils/rddgimport/rddgimport.h +++ b/utils/rddgimport/rddgimport.h @@ -32,8 +32,10 @@ #include #include #include -#include -#include +#include +#include +//Added by qt3to4: +#include #include #include @@ -84,10 +86,10 @@ class MainWidget : public QWidget QLineEdit *dg_filename_edit; QPushButton *dg_filename_button; QLabel *dg_date_label; - QDateEdit *dg_date_edit; + Q3DateEdit *dg_date_edit; QPushButton *dg_date_button; QLabel *dg_messages_label; - QTextEdit *dg_messages_text; + Q3TextEdit *dg_messages_text; RDBusyBar *dg_bar; QPushButton *dg_process_button; QPushButton *dg_close_button; diff --git a/utils/rddgimport/rddgimport_de.ts b/utils/rddgimport/rddgimport_de.ts index d64f7c4b..dae7d8a8 100644 --- a/utils/rddgimport/rddgimport_de.ts +++ b/utils/rddgimport/rddgimport_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddgimport/rddgimport_es.ts b/utils/rddgimport/rddgimport_es.ts index d64f7c4b..dae7d8a8 100644 --- a/utils/rddgimport/rddgimport_es.ts +++ b/utils/rddgimport/rddgimport_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddgimport/rddgimport_fr.ts b/utils/rddgimport/rddgimport_fr.ts index d64f7c4b..dae7d8a8 100644 --- a/utils/rddgimport/rddgimport_fr.ts +++ b/utils/rddgimport/rddgimport_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddgimport/rddgimport_nb.ts b/utils/rddgimport/rddgimport_nb.ts index d64f7c4b..dae7d8a8 100644 --- a/utils/rddgimport/rddgimport_nb.ts +++ b/utils/rddgimport/rddgimport_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddgimport/rddgimport_nn.ts b/utils/rddgimport/rddgimport_nn.ts index d64f7c4b..dae7d8a8 100644 --- a/utils/rddgimport/rddgimport_nn.ts +++ b/utils/rddgimport/rddgimport_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddgimport/rddgimport_pt_BR.ts b/utils/rddgimport/rddgimport_pt_BR.ts index d64f7c4b..dae7d8a8 100644 --- a/utils/rddgimport/rddgimport_pt_BR.ts +++ b/utils/rddgimport/rddgimport_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddiscimport/Makefile.am b/utils/rddiscimport/Makefile.am index 1f0e2f73..8198a00e 100644 --- a/utils/rddiscimport/Makefile.am +++ b/utils/rddiscimport/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rddiscimport -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -36,8 +34,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rddiscimport_*.qm all: - @QT_BIN@/lupdate rddiscimport.pro - @QT_BIN@/lrelease rddiscimport.pro + lupdate-qt4 rddiscimport.pro + lrelease-qt4 rddiscimport.pro bin_PROGRAMS = rddiscimport @@ -47,7 +45,7 @@ dist_rddiscimport_SOURCES = metalibrary.cpp metalibrary.h\ nodist_rddiscimport_SOURCES = moc_rddiscimport.cpp -rddiscimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rddiscimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rddiscimport.pro\ rddiscimport_de.ts\ diff --git a/utils/rddiscimport/metalibrary.cpp b/utils/rddiscimport/metalibrary.cpp index 074ee9fe..c25d7af9 100644 --- a/utils/rddiscimport/metalibrary.cpp +++ b/utils/rddiscimport/metalibrary.cpp @@ -122,7 +122,7 @@ void MetaLibrary::LoadLine(const QStringList fields) { MetaRecord *m=new MetaRecord(); meta_tracks.push_back(m); - for(unsigned i=0;isetDiscId(fields[i]); } @@ -193,8 +193,8 @@ QStringList MetaLibrary::Split(const QString &sep,const QString &str) QStringList ret; bool quoted=false; - for(unsigned i=0;i #include #include -#include +#include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include #include #include @@ -158,12 +162,12 @@ MainWidget::MainWidget(QWidget *parent) dg_track_list=new RDListView(this); dg_track_list->setAllColumnsShowFocus(true); dg_track_list->setItemMargin(5); - dg_track_list->setSelectionMode(QListView::Single); + dg_track_list->setSelectionMode(Q3ListView::Single); dg_track_list->setSortColumn(-1); connect(dg_track_list, - SIGNAL(doubleClicked(QListViewItem *,const QPoint &,int)), + SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), this, - SLOT(trackDoubleClickedData(QListViewItem *,const QPoint &,int))); + SLOT(trackDoubleClickedData(Q3ListViewItem *,const QPoint &,int))); dg_track_list->addColumn("#"); dg_track_list->setColumnAlignment(0,Qt::AlignHCenter); @@ -183,13 +187,13 @@ MainWidget::MainWidget(QWidget *parent) dg_disc_label=new QLabel(tr("Disk Progress"),this); dg_disc_label->setFont(label_font); dg_disc_label->setDisabled(true); - dg_disc_bar=new QProgressBar(this); + dg_disc_bar=new Q3ProgressBar(this); dg_disc_bar->setDisabled(true); dg_track_label=new QLabel(tr("Track Progress"),this); dg_track_label->setFont(label_font); dg_track_label->setDisabled(true); - dg_track_bar=new QProgressBar(this); + dg_track_bar=new Q3ProgressBar(this); dg_track_bar->setTotalSteps(dg_ripper->totalSteps()+1); dg_track_bar->setDisabled(true); connect(dg_ripper,SIGNAL(progressChanged(int)), @@ -221,7 +225,7 @@ MainWidget::MainWidget(QWidget *parent) dg_channels_box->setCurrentItem(rda->libraryConf()->defaultChannels()-1); dg_channels_label=new QLabel(dg_channels_box,tr("Channels")+":",this); dg_channels_label->setFont(label_font); - dg_channels_label->setAlignment(AlignRight|AlignVCenter); + dg_channels_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); // // Autotrim Check Box @@ -241,10 +245,10 @@ MainWidget::MainWidget(QWidget *parent) dg_autotrim_spin->setValue(rda->libraryConf()->trimThreshold()/100); dg_autotrim_label=new QLabel(dg_autotrim_spin,tr("Level")+":",this); dg_autotrim_label->setFont(label_font); - dg_autotrim_label->setAlignment(AlignRight|AlignVCenter); + dg_autotrim_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); dg_autotrim_unit=new QLabel(tr("dBFS"),this); dg_autotrim_unit->setFont(label_font); - dg_autotrim_unit->setAlignment(AlignLeft|AlignVCenter); + dg_autotrim_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Normalize Check Box @@ -264,10 +268,10 @@ MainWidget::MainWidget(QWidget *parent) dg_normalize_spin->setValue(rda->libraryConf()->ripperLevel()/100); dg_normalize_label=new QLabel(dg_normalize_spin,tr("Level:"),this); dg_normalize_label->setFont(label_font); - dg_normalize_label->setAlignment(AlignRight|AlignVCenter); + dg_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); dg_normalize_unit=new QLabel(tr("dBFS"),this); dg_normalize_unit->setFont(label_font); - dg_normalize_unit->setAlignment(AlignLeft|AlignVCenter); + dg_normalize_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); // // Eject Button @@ -312,7 +316,7 @@ void MainWidget::indexFileSelectedData() QString filename; int lines; - filename=QFileDialog::getOpenFileName(dg_indexfile_edit->text(), + filename=Q3FileDialog::getOpenFileName(dg_indexfile_edit->text(), "CSV Files *.csv",this,"", tr("RDDiscImport - Open Index File")); dg_metalibrary->clear(); @@ -349,7 +353,7 @@ void MainWidget::autotrimCheckData(bool state) } -void MainWidget::trackDoubleClickedData(QListViewItem *it,const QPoint &pt, +void MainWidget::trackDoubleClickedData(Q3ListViewItem *it,const QPoint &pt, int row) { RDListViewItem *item=(RDListViewItem *)it; @@ -558,7 +562,7 @@ void MainWidget::userChangedData() dg_group_box->clear(); groups=rda->user()->groups(); - for(unsigned i=0;iinsertItem(groups[i]); if(dg_group_name==groups[i]) { dg_group_box->setCurrentItem(i); @@ -711,7 +715,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(), + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(), "."); a.installTranslator(&qt); diff --git a/utils/rddiscimport/rddiscimport.h b/utils/rddiscimport/rddiscimport.h index 4d9447e9..d454e53e 100644 --- a/utils/rddiscimport/rddiscimport.h +++ b/utils/rddiscimport/rddiscimport.h @@ -33,7 +33,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -59,7 +61,7 @@ class MainWidget : public QWidget void indexFileSelectedData(); void groupActivatedData(int); void autotrimCheckData(bool state); - void trackDoubleClickedData(QListViewItem *item,const QPoint &pt,int row); + void trackDoubleClickedData(Q3ListViewItem *item,const QPoint &pt,int row); void ripData(); void normalizeCheckData(bool state); void mediaChangedData(); @@ -85,9 +87,9 @@ class MainWidget : public QWidget QLineEdit *dg_userdef_edit; RDListView *dg_track_list; QLabel *dg_disc_label; - QProgressBar *dg_disc_bar; + Q3ProgressBar *dg_disc_bar; QLabel *dg_track_label; - QProgressBar *dg_track_bar; + Q3ProgressBar *dg_track_bar; QLabel *dg_discid_label; QLineEdit *dg_discid_edit; QPushButton *dg_rip_button; diff --git a/utils/rddiscimport/rddiscimport_de.ts b/utils/rddiscimport/rddiscimport_de.ts index 28765af2..99147cee 100644 --- a/utils/rddiscimport/rddiscimport_de.ts +++ b/utils/rddiscimport/rddiscimport_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddiscimport/rddiscimport_es.ts b/utils/rddiscimport/rddiscimport_es.ts index 28765af2..99147cee 100644 --- a/utils/rddiscimport/rddiscimport_es.ts +++ b/utils/rddiscimport/rddiscimport_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddiscimport/rddiscimport_fr.ts b/utils/rddiscimport/rddiscimport_fr.ts index 28765af2..99147cee 100644 --- a/utils/rddiscimport/rddiscimport_fr.ts +++ b/utils/rddiscimport/rddiscimport_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddiscimport/rddiscimport_nb.ts b/utils/rddiscimport/rddiscimport_nb.ts index 28765af2..99147cee 100644 --- a/utils/rddiscimport/rddiscimport_nb.ts +++ b/utils/rddiscimport/rddiscimport_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddiscimport/rddiscimport_nn.ts b/utils/rddiscimport/rddiscimport_nn.ts index 28765af2..99147cee 100644 --- a/utils/rddiscimport/rddiscimport_nn.ts +++ b/utils/rddiscimport/rddiscimport_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddiscimport/rddiscimport_pt_BR.ts b/utils/rddiscimport/rddiscimport_pt_BR.ts index 28765af2..99147cee 100644 --- a/utils/rddiscimport/rddiscimport_pt_BR.ts +++ b/utils/rddiscimport/rddiscimport_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdexport/Makefile.am b/utils/rdexport/Makefile.am index 2e9dec31..8e72d351 100644 --- a/utils/rdexport/Makefile.am +++ b/utils/rdexport/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdexport -## -## (C) Copyright 2016 Fred Gleason +## (C) Copyright 2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -33,7 +31,7 @@ dist_rdexport_SOURCES = rdexport.cpp rdexport.h nodist_rdexport_SOURCES = moc_rdexport.cpp -rdexport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdexport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdexport/rdexport.cpp b/utils/rdexport/rdexport.cpp index 2307c368..85716635 100644 --- a/utils/rdexport/rdexport.cpp +++ b/utils/rdexport/rdexport.cpp @@ -436,7 +436,7 @@ void MainObject::ExportCut(RDCart *cart,RDCut *cut) FILE *f=NULL; f0=f0.split(".",conv->destinationFile(),true); QString filename; - for(unsigned i=0;i +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,14 +17,6 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib -MOC = @QT_MOC@ - -# The dependency for qt's Meta Object Compiler (moc) -moc_%.cpp: %.h - $(MOC) $< -o $@ - bin_PROGRAMS = rdgen dist_rdgen_SOURCES = rdgen.c\ diff --git a/utils/rdgpimon/Makefile.am b/utils/rdgpimon/Makefile.am index fa8e6a55..92662642 100644 --- a/utils/rdgpimon/Makefile.am +++ b/utils/rdgpimon/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdgpimon -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -36,8 +34,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rdgpimon_*.qm all: - @QT_BIN@/lupdate rdgpimon.pro - @QT_BIN@/lrelease rdgpimon.pro + lupdate-qt4 rdgpimon.pro + lrelease-qt4 rdgpimon.pro bin_PROGRAMS = rdgpimon @@ -47,7 +45,7 @@ dist_rdgpimon_SOURCES = gpi_label.cpp gpi_label.h\ nodist_rdgpimon_SOURCES = moc_gpi_label.cpp\ moc_rdgpimon.cpp -rdgpimon_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdgpimon_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdgpimon.pro\ rdgpimon_cs.ts\ diff --git a/utils/rdgpimon/gpi_label.cpp b/utils/rdgpimon/gpi_label.cpp index 0a3dabea..2aaa6523 100644 --- a/utils/rdgpimon/gpi_label.cpp +++ b/utils/rdgpimon/gpi_label.cpp @@ -20,6 +20,8 @@ #include +//Added by qt3to4: +#include GpiLabel::GpiLabel(QWidget *parent) @@ -41,32 +43,32 @@ GpiLabel::GpiLabel(QWidget *parent) gpi_line_label=new QLabel(this); gpi_line_label->setGeometry(0,0,59,33); gpi_line_label->setFont(line_font); - gpi_line_label->setAlignment(AlignHCenter|AlignVCenter); - gpi_line_label->setPalette(gray); + gpi_line_label->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); + gpi_line_label->setPalette(Qt::gray); // // On Cart Label // QPalette p=palette(); - p.setColor(QPalette::Active,QColorGroup::Foreground,darkGreen); - p.setColor(QPalette::Inactive,QColorGroup::Foreground,darkGreen); - p.setColor(QPalette::Disabled,QColorGroup::Foreground,darkGreen); + p.setColor(QPalette::Active,QColorGroup::Foreground,Qt::darkGreen); + p.setColor(QPalette::Inactive,QColorGroup::Foreground,Qt::darkGreen); + p.setColor(QPalette::Disabled,QColorGroup::Foreground,Qt::darkGreen); gpi_oncart_label=new QLabel(this); gpi_oncart_label->setGeometry(0,33,59,16); gpi_oncart_label->setFont(cart_font); - gpi_oncart_label->setAlignment(AlignHCenter|AlignTop); + gpi_oncart_label->setAlignment(Qt::AlignHCenter|Qt::AlignTop); gpi_oncart_label->setPalette(p); // // Off Cart Label // - p.setColor(QPalette::Active,QColorGroup::Foreground,darkRed); - p.setColor(QPalette::Inactive,QColorGroup::Foreground,darkRed); - p.setColor(QPalette::Disabled,QColorGroup::Foreground,darkRed); + p.setColor(QPalette::Active,QColorGroup::Foreground,Qt::darkRed); + p.setColor(QPalette::Inactive,QColorGroup::Foreground,Qt::darkRed); + p.setColor(QPalette::Disabled,QColorGroup::Foreground,Qt::darkRed); gpi_offcart_label=new QLabel(this); gpi_offcart_label->setGeometry(0,49,59,16); gpi_offcart_label->setFont(cart_font); - gpi_offcart_label->setAlignment(AlignHCenter|AlignTop); + gpi_offcart_label->setAlignment(Qt::AlignHCenter|Qt::AlignTop); gpi_offcart_label->setPalette(p); } @@ -99,10 +101,10 @@ void GpiLabel::setLine(int line) void GpiLabel::setState(bool state) { if(state) { - gpi_line_label->setPalette(green); + gpi_line_label->setPalette(Qt::green); } else { - gpi_line_label->setPalette(gray); + gpi_line_label->setPalette(Qt::gray); } } diff --git a/utils/rdgpimon/rdgpimon.cpp b/utils/rdgpimon/rdgpimon.cpp index 31bad3c6..a7f7c33c 100644 --- a/utils/rdgpimon/rdgpimon.cpp +++ b/utils/rdgpimon/rdgpimon.cpp @@ -32,6 +32,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -136,7 +139,7 @@ MainWidget::MainWidget(QWidget *parent) QLabel *label=new QLabel(gpi_type_box,tr("Show:"),this); label->setGeometry(20,10,55,21); label->setFont(main_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(gpi_type_box,SIGNAL(activated(int)), this,SLOT(matrixActivatedData(int))); @@ -151,7 +154,7 @@ MainWidget::MainWidget(QWidget *parent) label=new QLabel(gpi_matrix_box,tr("Matrix:"),this); label->setGeometry(220,10,55,21); label->setFont(main_font); - label->setAlignment(AlignRight|AlignVCenter); + label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); connect(gpi_matrix_box,SIGNAL(activated(int)), this,SLOT(matrixActivatedData(int))); @@ -191,20 +194,20 @@ MainWidget::MainWidget(QWidget *parent) label=new QLabel(tr("Green = ON Cart"),this); label->setGeometry(200,370,300,12); label->setFont(main_font); - label->setAlignment(AlignLeft|AlignVCenter); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); QPalette p=palette(); - p.setColor(QPalette::Active,QColorGroup::Foreground,darkGreen); - p.setColor(QPalette::Inactive,QColorGroup::Foreground,darkGreen); - p.setColor(QPalette::Disabled,QColorGroup::Foreground,darkGreen); + p.setColor(QPalette::Active,QColorGroup::Foreground,Qt::darkGreen); + p.setColor(QPalette::Inactive,QColorGroup::Foreground,Qt::darkGreen); + p.setColor(QPalette::Disabled,QColorGroup::Foreground,Qt::darkGreen); label->setPalette(p); label=new QLabel(tr("Red = OFF Cart"),this); label->setGeometry(200,392,300,12); label->setFont(main_font); - label->setAlignment(AlignLeft|AlignVCenter); - p.setColor(QPalette::Active,QColorGroup::Foreground,darkRed); - p.setColor(QPalette::Inactive,QColorGroup::Foreground,darkRed); - p.setColor(QPalette::Disabled,QColorGroup::Foreground,darkRed); + label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); + p.setColor(QPalette::Active,QColorGroup::Foreground,Qt::darkRed); + p.setColor(QPalette::Inactive,QColorGroup::Foreground,Qt::darkRed); + p.setColor(QPalette::Disabled,QColorGroup::Foreground,Qt::darkRed); label->setPalette(p); // @@ -215,7 +218,7 @@ MainWidget::MainWidget(QWidget *parent) label->setAlignment(Qt::AlignCenter); label->setGeometry(110,423,sizeHint().width()-220,30); - gpi_events_date_edit=new QDateEdit(this); + gpi_events_date_edit=new Q3DateEdit(this); gpi_events_date_edit->setGeometry(155,453,90,20); gpi_events_date_edit->setDate(QDate::currentDate()); connect(gpi_events_date_edit,SIGNAL(valueChanged(const QDate &)), @@ -241,7 +244,7 @@ MainWidget::MainWidget(QWidget *parent) gpi_events_list->setFont(main_font); gpi_events_list->setGeometry(110,480,sizeHint().width()-220,230); gpi_events_list->setItemMargin(5); - gpi_events_list->setSelectionMode(QListView::NoSelection); + gpi_events_list->setSelectionMode(Q3ListView::NoSelection); gpi_events_list->addColumn("Time"); gpi_events_list->setColumnAlignment(0,Qt::AlignHCenter); @@ -265,13 +268,13 @@ MainWidget::MainWidget(QWidget *parent) gpi_scroll_color.setColor(QPalette::Active,QColorGroup::Button, Qt::blue); gpi_scroll_color.setColor(QPalette::Active,QColorGroup::Background, - lightGray); + Qt::lightGray); gpi_scroll_color.setColor(QPalette::Inactive,QColorGroup::ButtonText, Qt::white); gpi_scroll_color.setColor(QPalette::Inactive,QColorGroup::Button, Qt::blue); gpi_scroll_color.setColor(QPalette::Inactive,QColorGroup::Background, - lightGray); + Qt::lightGray); gpi_events_report_button=new QPushButton(tr("Report"),this); gpi_events_report_button->setGeometry(sizeHint().width()-100,570,80,50); @@ -754,8 +757,7 @@ int main(int argc,char *argv[]) // Load Translations // QTranslator qt(0); - qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(), - "."); + qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(),"."); a.installTranslator(&qt); QTranslator rd(0); diff --git a/utils/rdgpimon/rdgpimon.h b/utils/rdgpimon/rdgpimon.h index 1d3173a7..1abc0c0f 100644 --- a/utils/rdgpimon/rdgpimon.h +++ b/utils/rdgpimon/rdgpimon.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include @@ -89,7 +89,7 @@ class MainWidget : public QWidget int gpi_first_line; int gpi_last_line; QLabel *gpi_events_date_label; - QDateEdit *gpi_events_date_edit; + Q3DateEdit *gpi_events_date_edit; QLabel *gpi_events_state_label; QComboBox *gpi_events_state_box; QPushButton *gpi_events_scroll_button; diff --git a/utils/rdgpimon/rdgpimon_cs.ts b/utils/rdgpimon/rdgpimon_cs.ts index 8e72a0a4..9de69321 100644 --- a/utils/rdgpimon/rdgpimon_cs.ts +++ b/utils/rdgpimon/rdgpimon_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_de.ts b/utils/rdgpimon/rdgpimon_de.ts index 9c118f98..eeb0a527 100644 --- a/utils/rdgpimon/rdgpimon_de.ts +++ b/utils/rdgpimon/rdgpimon_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_es.ts b/utils/rdgpimon/rdgpimon_es.ts index 3f864ed2..6c6264c0 100644 --- a/utils/rdgpimon/rdgpimon_es.ts +++ b/utils/rdgpimon/rdgpimon_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_fr.ts b/utils/rdgpimon/rdgpimon_fr.ts index 9969c4f4..4980d899 100644 --- a/utils/rdgpimon/rdgpimon_fr.ts +++ b/utils/rdgpimon/rdgpimon_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_nb.ts b/utils/rdgpimon/rdgpimon_nb.ts index a215de9c..c7d1ba1f 100644 --- a/utils/rdgpimon/rdgpimon_nb.ts +++ b/utils/rdgpimon/rdgpimon_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_nn.ts b/utils/rdgpimon/rdgpimon_nn.ts index a215de9c..c7d1ba1f 100644 --- a/utils/rdgpimon/rdgpimon_nn.ts +++ b/utils/rdgpimon/rdgpimon_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_pt_BR.ts b/utils/rdgpimon/rdgpimon_pt_BR.ts index 8e72a0a4..9de69321 100644 --- a/utils/rdgpimon/rdgpimon_pt_BR.ts +++ b/utils/rdgpimon/rdgpimon_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdimport/Makefile.am b/utils/rdimport/Makefile.am index 57ccc165..af898efe 100644 --- a/utils/rdimport/Makefile.am +++ b/utils/rdimport/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdimport -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -34,7 +32,7 @@ dist_rdimport_SOURCES = markerset.cpp markerset.h\ nodist_rdimport_SOURCES = moc_rdimport.cpp -rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdimport/rdimport.cpp b/utils/rdimport/rdimport.cpp index eefa02d3..40f19422 100644 --- a/utils/rdimport/rdimport.cpp +++ b/utils/rdimport/rdimport.cpp @@ -895,7 +895,7 @@ void MainObject::ProcessFileList(const QString &flist) { QString entry; - for(unsigned i=0;isetArtist(value); wavedata->setMetadataFound(true); @@ -1843,13 +1843,13 @@ bool MainObject::RunPattern(const QString &pattern,const QString &filename, bool MainObject::VerifyPattern(const QString &pattern) { bool macro_active=false; - for(unsigned i=0;i +## (C) Copyright 2008,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -31,7 +29,7 @@ bin_PROGRAMS = rdmaint dist_rdmaint_SOURCES = rdmaint.cpp rdmaint.h -rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdmarkerset/Makefile.am b/utils/rdmarkerset/Makefile.am index e7386e63..7daa5006 100644 --- a/utils/rdmarkerset/Makefile.am +++ b/utils/rdmarkerset/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdmarkerset -## -## (C) Copyright 2002-2014,2016 Fred Gleason +## (C) Copyright 2002-2014,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -33,7 +31,7 @@ dist_rdmarkerset_SOURCES = rdmarkerset.cpp rdmarkerset.h nodist_rdmarkerset_SOURCES = moc_rdmarkerset.cpp -rdmarkerset_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdmarkerset_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = diff --git a/utils/rdmarkerset/rdmarkerset.cpp b/utils/rdmarkerset/rdmarkerset.cpp index 86aaeec0..3dc47c9c 100644 --- a/utils/rdmarkerset/rdmarkerset.cpp +++ b/utils/rdmarkerset/rdmarkerset.cpp @@ -29,6 +29,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include diff --git a/utils/rdpopup/Makefile.am b/utils/rdpopup/Makefile.am index 7d4f2565..337719a5 100644 --- a/utils/rdpopup/Makefile.am +++ b/utils/rdpopup/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdpopup -## -## (C) Copyright 2009,2016 Fred Gleason +## (C) Copyright 2009,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -31,7 +29,7 @@ bin_PROGRAMS = rdpopup dist_rdpopup_SOURCES = rdpopup.cpp rdpopup.h -rdpopup_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdpopup_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdpopup/rdpopup.cpp b/utils/rdpopup/rdpopup.cpp index 25382e4d..8d481009 100644 --- a/utils/rdpopup/rdpopup.cpp +++ b/utils/rdpopup/rdpopup.cpp @@ -2,7 +2,7 @@ // // A utility for displaying messages on the desktop // -// (C) Copyright 2009,2016 Fred Gleason +// (C) Copyright 2009,2016-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -18,6 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#include #include #include diff --git a/utils/rdpurgecasts/Makefile.am b/utils/rdpurgecasts/Makefile.am index 39ced0ab..5de5754c 100644 --- a/utils/rdpurgecasts/Makefile.am +++ b/utils/rdpurgecasts/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdpurgecasts -## -## (C) Copyright 2007-2016 Fred Gleason +## (C) Copyright 2007-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -31,7 +29,7 @@ bin_PROGRAMS = rdpurgecasts dist_rdpurgecasts_SOURCES = rdpurgecasts.cpp rdpurgecasts.h -rdpurgecasts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdpurgecasts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdrender/Makefile.am b/utils/rdrender/Makefile.am index 57f18185..07631d53 100644 --- a/utils/rdrender/Makefile.am +++ b/utils/rdrender/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rdrender -## -## (C) Copyright 2017 Fred Gleason +## (C) Copyright 2017-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -33,7 +31,7 @@ dist_rdrender_SOURCES = rdrender.cpp rdrender.h nodist_rdrender_SOURCES = moc_rdrender.cpp -rdrender_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdrender_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support CLEANFILES = *~\ *.idb\ diff --git a/utils/rdrender/rdrender.cpp b/utils/rdrender/rdrender.cpp index a886b011..93377d60 100644 --- a/utils/rdrender/rdrender.cpp +++ b/utils/rdrender/rdrender.cpp @@ -318,7 +318,7 @@ void MainObject::userData() } } QStringList warnings=r->warnings(); - for(unsigned i=0;i +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -33,7 +31,7 @@ dist_rdsoftkeys_SOURCES = rdsoftkeys.cpp rdsoftkeys.h nodist_rdsoftkeys_SOURCES = moc_rdsoftkeys.cpp -rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdsoftkeys.pro diff --git a/utils/rdsoftkeys/rdsoftkeys.cpp b/utils/rdsoftkeys/rdsoftkeys.cpp index 4b14f44f..39a9d555 100644 --- a/utils/rdsoftkeys/rdsoftkeys.cpp +++ b/utils/rdsoftkeys/rdsoftkeys.cpp @@ -2,7 +2,7 @@ // // A utility for sending RML Commands // -// (C) Copyright 2002-2006,2016 Fred Gleason +// (C) Copyright 2002-2006,2016-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,6 +34,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -48,7 +51,7 @@ #include "../icons/rivendell-22x22.xpm" MainWidget::MainWidget(QWidget *parent) - : QMainWindow(parent) + : Q3MainWindow(parent) { key_ysize=70; @@ -86,7 +89,7 @@ MainWidget::MainWidget(QWidget *parent) // // RML Send Socket // - key_socket=new QSocketDevice(QSocketDevice::Datagram); + key_socket=new Q3SocketDevice(Q3SocketDevice::Datagram); // // Create Buttons @@ -112,7 +115,7 @@ MainWidget::MainWidget(QWidget *parent) unsigned row=0; while(!(rmlcmd=profile->stringValue("SoftKeys",QString(). sprintf("Command%d",n+1),"")).isEmpty()) { - for(unsigned i=0;i -#include +#include #include #include #include -#include +#include +//Added by qt3to4: +#include #include @@ -37,7 +39,7 @@ #define RDSOFTKEYS_USAGE "[--map-file=]\n\nWhere is the name of the file load soft key definitions from.\nThe default value is master Rivendell configuration file.\n" #define RDSOFTKEYS_DEFAULT_COLUMNS 1 -class MainWidget : public QMainWindow +class MainWidget : public Q3MainWindow { Q_OBJECT public: @@ -52,7 +54,7 @@ class MainWidget : public QMainWindow private: QString WrapText(QWidget *w,const QString &text); QPixmap *key_icon_map; - QSocketDevice *key_socket; + Q3SocketDevice *key_socket; unsigned key_columns; unsigned key_ysize; std::vector key_macros; diff --git a/utils/rmlsend/Makefile.am b/utils/rmlsend/Makefile.am index a9139a36..bd06bac7 100644 --- a/utils/rmlsend/Makefile.am +++ b/utils/rmlsend/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/rmlsend -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -36,8 +34,8 @@ uninstall-local: rm -f $(DESTDIR)$(prefix)/share/rivendell/rmlsend_*.qm all: - @QT_BIN@/lupdate rmlsend.pro - @QT_BIN@/lrelease rmlsend.pro + lupdate-qt4 rmlsend.pro + lrelease-qt4 rmlsend.pro bin_PROGRAMS = rmlsend @@ -45,7 +43,7 @@ dist_rmlsend_SOURCES = rmlsend.cpp rmlsend.h nodist_rmlsend_SOURCES = moc_rmlsend.cpp -rmlsend_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rmlsend_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rmlsend.pro\ rmlsend_cs.ts\ diff --git a/utils/rmlsend/rmlsend.cpp b/utils/rmlsend/rmlsend.cpp index 9912d330..4a229258 100644 --- a/utils/rmlsend/rmlsend.cpp +++ b/utils/rmlsend/rmlsend.cpp @@ -30,11 +30,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -43,6 +43,8 @@ #include #include #include +//Added by qt3to4: +#include #include @@ -71,7 +73,7 @@ RDCmdSwitch *rdcmdswitch=NULL; MainWidget::MainWidget(QWidget *parent) - :QMainWindow(parent) + :Q3MainWindow(parent) { // // Set Window Size @@ -106,7 +108,7 @@ MainWidget::MainWidget(QWidget *parent) QLabel *label=new QLabel(host,"Sent To:",this); label->setGeometry(10,16,65,14); label->setFont(label_font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); for(unsigned i=0;ikeys();i++) { if(rdcmdswitch->key(i)=="--to-host") { rdcmdswitch->setProcessed(i,true); @@ -120,7 +122,7 @@ MainWidget::MainWidget(QWidget *parent) label=new QLabel(port_box,"Dest:",this); label->setGeometry(270,16,30,14); label->setFont(label_font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); port_box->insertItem(tr("RML")); port_box->insertItem(tr("RML (no echo)")); port_box->insertItem(tr("Set Port")); @@ -134,7 +136,7 @@ MainWidget::MainWidget(QWidget *parent) port_edit_label=new QLabel(port_edit,tr("UDP Port:"),this); port_edit_label->setGeometry(sizeHint().width()-130,16,65,14); port_edit_label->setFont(label_font); - port_edit_label->setAlignment(AlignRight); + port_edit_label->setAlignment(Qt::AlignRight); port_edit_label->setDisabled(true); command=new QLineEdit(this); @@ -143,7 +145,7 @@ MainWidget::MainWidget(QWidget *parent) label=new QLabel(command,tr("Command:"),this); label->setGeometry(10,46,65,14); label->setFont(label_font); - label->setAlignment(AlignRight); + label->setAlignment(Qt::AlignRight); response=new QLineEdit(this); response->setGeometry(80,70,sizeHint().width()-90,25); @@ -151,7 +153,7 @@ MainWidget::MainWidget(QWidget *parent) response_label=new QLabel(response,tr("Response:"),this); response_label->setGeometry(10,76,65,14); response_label->setFont(label_font); - response_label->setAlignment(AlignRight); + response_label->setAlignment(Qt::AlignRight); send=new QPushButton(tr("&Send Command"),this); send->setGeometry(10,sizeHint().height()-50,120,40); @@ -164,9 +166,9 @@ MainWidget::MainWidget(QWidget *parent) quit->setDefault(true); connect(quit,SIGNAL(clicked()),qApp,SLOT(quit())); - udp_command=new QSocketDevice(QSocketDevice::Datagram); + udp_command=new Q3SocketDevice(Q3SocketDevice::Datagram); - udp_response=new QSocketDevice(QSocketDevice::Datagram); + udp_response=new Q3SocketDevice(Q3SocketDevice::Datagram); udp_response->bind(QHostAddress(),RD_RML_REPLY_PORT); udp_response->setBlocking(false); @@ -418,8 +420,8 @@ void MainObject::InitStream() exit(1); } } - input_stream=new QTextStream(f,IO_ReadOnly); - input_stream->setEncoding(QTextStream::UnicodeUTF8); + input_stream=new Q3TextStream(f,QIODevice::ReadOnly); + input_stream->setEncoding(Q3TextStream::UnicodeUTF8); } @@ -440,15 +442,6 @@ bool MainObject::GetNextChar(QChar *c) *input_stream >> *c; return false; } - - /* - if(rml_cmd.isNull()) { - if(read(input_fd,c,1)<=0) { - return true; - } - return false; - } - */ if(rml_ptr>=rml_cmd.length()) { return true; } @@ -460,7 +453,7 @@ bool MainObject::GetNextChar(QChar *c) void MainObject::ProcessCommands() { QChar c; - QSocketDevice *udp_command=new QSocketDevice(QSocketDevice::Datagram); + Q3SocketDevice *udp_command=new Q3SocketDevice(Q3SocketDevice::Datagram); QString rml=""; bool active=false; @@ -530,7 +523,7 @@ int main(int argc,char *argv[]) qt_path=tr_path; #else tr_path=QString(PREFIX)+QString("/share/rivendell/"); - qt_path=QString(QTDIR)+QString("/translation/"); + qt_path=QString("/usr/share/qt4/translation/"); #endif // WIN32 QTranslator qt(0); qt.load(qt_path+QString("qt_")+QTextCodec::locale(),"."); diff --git a/utils/rmlsend/rmlsend.h b/utils/rmlsend/rmlsend.h index 05924a87..7cdd7156 100644 --- a/utils/rmlsend/rmlsend.h +++ b/utils/rmlsend/rmlsend.h @@ -24,13 +24,15 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include +//Added by qt3to4: +#include #include @@ -41,7 +43,7 @@ #define RMLSEND_DEFAULT_ADDR "localhost" #define RMLSEND_DEFAULT_PORT 5859 -class MainWidget : public QMainWindow +class MainWidget : public Q3MainWindow { Q_OBJECT public: @@ -62,7 +64,7 @@ class MainWidget : public QMainWindow QLabel *port_edit_label; QComboBox *port_box; QLineEdit *port_edit; - QSocketDevice *udp_command,*udp_response; + Q3SocketDevice *udp_command,*udp_response; QHostAddress host_addr; QTimer *timer; int countdown; @@ -87,12 +89,12 @@ class MainObject : public QObject void ProcessCommands(); int input_fd; QString input_file; - QTextStream *input_stream; + Q3TextStream *input_stream; QString dest_hostname; QHostAddress *dest_addr; unsigned dest_port; QString rml_cmd; - unsigned rml_ptr; + int rml_ptr; }; #endif // RMLSEND_H diff --git a/utils/rmlsend/rmlsend_cs.ts b/utils/rmlsend/rmlsend_cs.ts index e572f35c..956ff819 100644 --- a/utils/rmlsend/rmlsend_cs.ts +++ b/utils/rmlsend/rmlsend_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_de.ts b/utils/rmlsend/rmlsend_de.ts index a72bcb97..80cd9bb8 100644 --- a/utils/rmlsend/rmlsend_de.ts +++ b/utils/rmlsend/rmlsend_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_es.ts b/utils/rmlsend/rmlsend_es.ts index cdf006cc..017dec34 100644 --- a/utils/rmlsend/rmlsend_es.ts +++ b/utils/rmlsend/rmlsend_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_fr.ts b/utils/rmlsend/rmlsend_fr.ts index e572f35c..956ff819 100644 --- a/utils/rmlsend/rmlsend_fr.ts +++ b/utils/rmlsend/rmlsend_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_nb.ts b/utils/rmlsend/rmlsend_nb.ts index 144b2838..532d57a5 100644 --- a/utils/rmlsend/rmlsend_nb.ts +++ b/utils/rmlsend/rmlsend_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_nn.ts b/utils/rmlsend/rmlsend_nn.ts index 144b2838..532d57a5 100644 --- a/utils/rmlsend/rmlsend_nn.ts +++ b/utils/rmlsend/rmlsend_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_pt_BR.ts b/utils/rmlsend/rmlsend_pt_BR.ts index 28218f69..439f83a5 100644 --- a/utils/rmlsend/rmlsend_pt_BR.ts +++ b/utils/rmlsend/rmlsend_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/sas_shim/Makefile.am b/utils/sas_shim/Makefile.am index fe9e1e19..d1a7b4e0 100644 --- a/utils/sas_shim/Makefile.am +++ b/utils/sas_shim/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/utils/sas_shim -## -## (C) Copyright 2002-2006,2016 Fred Gleason +## (C) Copyright 2002-2006,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -33,7 +31,7 @@ dist_sas_shim_SOURCES = sas_shim.cpp sas_shim.h nodist_sas_shim_SOURCES = moc_sas_shim.cpp -sas_shim_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +sas_shim_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rc.sas_shim diff --git a/utils/sas_shim/sas_shim.cpp b/utils/sas_shim/sas_shim.cpp index 64e62319..668b5191 100644 --- a/utils/sas_shim/sas_shim.cpp +++ b/utils/sas_shim/sas_shim.cpp @@ -83,7 +83,7 @@ MainObject::MainObject(QObject *parent) // shim_tty=new RDTTYDevice(); shim_tty->setName(rda->config()->sasTtyDevice()); - if(!shim_tty->open(IO_ReadOnly)) { + if(!shim_tty->open(QIODevice::ReadOnly)) { fprintf(stderr,"sas_shim: unabled to open tty device\n"); exit(1); } diff --git a/web/rdcastmanager/Makefile.am b/web/rdcastmanager/Makefile.am index d89d0408..7d8a7244 100644 --- a/web/rdcastmanager/Makefile.am +++ b/web/rdcastmanager/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/web/rdcastmanager -## -## (C) Copyright 2002-2007,2016 Fred Gleason +## (C) Copyright 2002-2007,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -40,7 +38,7 @@ libexec_PROGRAMS = rdcastmanager.cgi dist_rdcastmanager_cgi_SOURCES = rdcastmanager.cpp rdcastmanager.h -rdcastmanager_cgi_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdcastmanager_cgi_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdcastmanager.js\ rdcastmanager.pro diff --git a/web/rdfeed/Makefile.am b/web/rdfeed/Makefile.am index 69660537..a9c837d5 100644 --- a/web/rdfeed/Makefile.am +++ b/web/rdfeed/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/web/rdfeed -## -## (C) Copyright 2002-2007,2016 Fred Gleason +## (C) Copyright 2002-2007,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ install-exec-local: @@ -33,7 +31,7 @@ libexec_PROGRAMS = rdfeed.xml dist_rdfeed_xml_SOURCES = rdfeed_script.cpp rdfeed_script.h -rdfeed_xml_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ +rdfeed_xml_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdfeed.pro diff --git a/web/rdfeed/rdfeed_script.cpp b/web/rdfeed/rdfeed_script.cpp index cfc4701f..e6822e8e 100644 --- a/web/rdfeed/rdfeed_script.cpp +++ b/web/rdfeed/rdfeed_script.cpp @@ -340,7 +340,7 @@ bool MainObject::ShouldCount(const QString &hdr) int n; QString str; - for(unsigned i=0;i0) { if(lines[i].left(n).lower()=="bytes") { str=lines[i].right(lines[i].length()-n-1).stripWhiteSpace(); diff --git a/web/rdxport/Makefile.am b/web/rdxport/Makefile.am index 048fc75b..eb1ff0b8 100644 --- a/web/rdxport/Makefile.am +++ b/web/rdxport/Makefile.am @@ -1,8 +1,6 @@ -## automake.am +## Makefile.am ## -## Automake.am for rivendell/web/rdxport -## -## (C) Copyright 2010,2016 Fred Gleason +## (C) Copyright 2010,2016-2018 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -19,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -52,7 +50,7 @@ dist_rdxport_cgi_SOURCES = audioinfo.cpp\ nodist_rdxport_cgi_SOURCES = moc_rdxport.cpp -rdxport_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ +rdxport_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT4_LIBS@ -lQt3Support EXTRA_DIST = rdxport.pro diff --git a/web/rdxport/schedcodes.cpp b/web/rdxport/schedcodes.cpp index b99973a8..8339bc45 100644 --- a/web/rdxport/schedcodes.cpp +++ b/web/rdxport/schedcodes.cpp @@ -92,7 +92,7 @@ void Xport::AssignSchedCode() XmlExit("No such scheduler code",404,"schedcodes.cpp",LINE_NUMBER); } codes=cart->schedCodesList(); - for(unsigned i=0;i\n"); printf("\n"); - for(unsigned i=0;ixml().utf8()); delete schedcode; diff --git a/web/webget/Makefile.am b/web/webget/Makefile.am index 2f9b6261..16add80b 100644 --- a/web/webget/Makefile.am +++ b/web/webget/Makefile.am @@ -17,8 +17,8 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support +LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -43,7 +43,8 @@ dist_webget_cgi_SOURCES = webget.cpp webget.h nodist_webget_cgi_SOURCES = moc_webget.cpp -webget_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ +webget_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT4_LIBS@ -lQt3Support + EXTRA_DIST = webget.html\ webget.js