diff options
60 files changed, 1122 insertions, 1122 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 9ba678f..97d5e73 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1036,7 +1036,7 @@ elif test "$kde_use_qt_emb" = "yes"; then x_includes="" x_libraries="" elif test "$kde_use_qt_mac" = "yes"; then - dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to + dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to dnl be included to get the information) --Sam CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" @@ -1068,19 +1068,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM], AC_REQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext <<EOF #include "confdefs.h" -#include <qglobal.h> -#include <qapplication.h> +#include <ntqglobal.h> +#include <ntqapplication.h> EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext <<EOF -#include <qevent.h> -#include <qstring.h> -#include <qstyle.h> +#include <ntqevent.h> +#include <ntqstring.h> +#include <ntqstyle.h> EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <<EOF -#if QT_VERSION < 210 +#if TQT_VERSION < 210 #error 1 #endif EOF @@ -1089,8 +1089,8 @@ fi if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF -#include <qcursor.h> -#include <qstylefactory.h> +#include <ntqcursor.h> +#include <ntqstylefactory.h> #include <private/qucomextra_p.h> EOF fi @@ -1173,22 +1173,22 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x03@VER@00" + kde_qt_verstring="TQT_VERSION >= 0x03@VER@00" qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` else - kde_qt_verstring="QT_VERSION >= 300" + kde_qt_verstring="TQT_VERSION >= 300" fi fi if test $kde_qtver = 2; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222" else - kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200" fi fi if test $kde_qtver = 1; then - kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" + kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200" fi else kde_qt_verstring=$3 @@ -1294,7 +1294,7 @@ AC_ARG_ENABLE( USING_QT_MT="" dnl ------------------------------------------------------------------------ -dnl If we not get --disable-qt-mt then adjust some vars for the host. +dnl If we not get --disable-tqt-mt then adjust some vars for the host. dnl ------------------------------------------------------------------------ KDE_MT_LDFLAGS= @@ -1357,7 +1357,7 @@ dnl ------------------------------------------------------------ fi dnl ------------------------------------------------------------------------ -dnl If we got --enable-qt-mt then adjust the Qt library name for the host. +dnl If we got --enable-tqt-mt then adjust the Qt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then @@ -1428,9 +1428,9 @@ if test ! "$ac_qt_includes" = "NO"; then fi if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h else - kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h fi AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) @@ -1980,7 +1980,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ - #include <qdom.h> + #include <ntqdom.h> ], [ QDomDocument doc; @@ -2530,7 +2530,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( -[#include <qapplication.h>], +[#include <ntqapplication.h>], [ int argc; char** argv; @@ -4256,7 +4256,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ #include <qimageio.h> -#include <qstring.h> +#include <ntqstring.h> int main() { QString t = "hallo"; t.fill('t'); @@ -5040,7 +5040,7 @@ if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) +AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) AC_MSG_RESULT($QTDOCDIR) AC_SUBST(QTDOCDIR) @@ -5061,7 +5061,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/ntqsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) diff --git a/src/Makefile.am b/src/Makefile.am index 1b77e56..2a14b4a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,7 @@ METASOURCES = AUTO messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kasablanca.pot -KDE_ICON = kasablanca +TDE_ICON = kasablanca ######################################################################### # APPLICATION SECTION @@ -21,8 +21,8 @@ bin_PROGRAMS = kasablanca # the application source, library search path, and link libraries kasablanca_SOURCES = main.cpp kasablanca.cpp bookmarkdialog.cpp customconnectdialog.cpp fileexistsdialog.cpp kbitem.cpp Q_bookmarkdialog.ui Q_fileexistsdialog.ui Q_mainwindow.ui eventhandler.cpp ftpthread.cpp ftplib.cpp ftpsession.cpp kbfileinfo.cpp kbdirinfo.cpp kbdir.cpp kbfile.cpp kbtransferitem.cpp kbtransferdir.cpp kbtransferfile.cpp kbconfig.kcfgc Q_colorspreferencesdialog.ui Q_generalpreferencesdialog.ui kbtaskview.cpp Q_userinterfacepreferencesdialog.ui kbbookmarkitem.cpp kbsiteinfo.cpp Q_customconnectdialog.ui Q_importdialog.ui importdialog.cpp kbstatustip.cpp -kasablanca_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kasablanca_LDADD = -lssl $(LIB_KDEUI) -lcrypto $(LIB_KDECORE) -lDCOP $(LIB_QT) +kasablanca_LDFLAGS = $(TDE_RPATH) $(all_libraries) +kasablanca_LDADD = -lssl $(LIB_TDEUI) -lcrypto $(LIB_TDECORE) -lDCOP $(LIB_TQT) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/src/Q_bookmarkdialog.cpp b/src/Q_bookmarkdialog.cpp index 4e60db1..b736ab0 100644 --- a/src/Q_bookmarkdialog.cpp +++ b/src/Q_bookmarkdialog.cpp @@ -1,5 +1,5 @@ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/mkulke/Development/kasablanca/src/Q_bookmarkdialog.ui' ** @@ -11,49 +11,49 @@ #include "Q_bookmarkdialog.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qsplitter.h> -#include <qheader.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqsplitter.h> +#include <ntqheader.h> #include <klistview.h> -#include <qtabwidget.h> +#include <ntqtabwidget.h> #include <klineedit.h> -#include <qlabel.h> +#include <ntqlabel.h> #include <kcombobox.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqlineedit.h> +#include <ntqcheckbox.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a KasablancaBookmarkDialog as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -KasablancaBookmarkDialog::KasablancaBookmarkDialog( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +KasablancaBookmarkDialog::KasablancaBookmarkDialog( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "KasablancaBookmarkDialog" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); - KasablancaBookmarkDialogLayout = new QGridLayout( this, 1, 1, 2, 6, "KasablancaBookmarkDialogLayout"); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); + KasablancaBookmarkDialogLayout = new TQGridLayout( this, 1, 1, 2, 6, "KasablancaBookmarkDialogLayout"); - splitter1 = new QSplitter( this, "splitter1" ); - splitter1->setOrientation( QSplitter::Horizontal ); + splitter1 = new TQSplitter( this, "splitter1" ); + splitter1->setOrientation( TQSplitter::Horizontal ); BookmarkListView = new KListView( splitter1, "BookmarkListView" ); BookmarkListView->addColumn( tr2i18n( "Name" ) ); BookmarkListView->header()->setClickEnabled( FALSE, BookmarkListView->header()->count() - 1 ); - BookmarkListView->setMinimumSize( QSize( 0, 0 ) ); + BookmarkListView->setMinimumSize( TQSize( 0, 0 ) ); BookmarkListView->setAcceptDrops( TRUE ); BookmarkListView->setDragEnabled( TRUE ); - SettingsTab = new QTabWidget( splitter1, "SettingsTab" ); + SettingsTab = new TQTabWidget( splitter1, "SettingsTab" ); SettingsTab->setEnabled( TRUE ); - SettingsTab->setMinimumSize( QSize( 360, 232 ) ); + SettingsTab->setMinimumSize( TQSize( 360, 232 ) ); - tab = new QWidget( SettingsTab, "tab" ); - tabLayout = new QGridLayout( tab, 1, 1, 2, 6, "tabLayout"); + tab = new TQWidget( SettingsTab, "tab" ); + tabLayout = new TQGridLayout( tab, 1, 1, 2, 6, "tabLayout"); PassEdit = new KLineEdit( tab, "PassEdit" ); PassEdit->setEnabled( FALSE ); @@ -73,34 +73,34 @@ KasablancaBookmarkDialog::KasablancaBookmarkDialog( QWidget* parent, const char* NameEdit = new KLineEdit( tab, "NameEdit" ); NameEdit->setEnabled( FALSE ); - NameEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, NameEdit->sizePolicy().hasHeightForWidth() ) ); + NameEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, NameEdit->sizePolicy().hasHeightForWidth() ) ); tabLayout->addMultiCellWidget( NameEdit, 0, 0, 1, 2 ); - textLabel1_3 = new QLabel( tab, "textLabel1_3" ); + textLabel1_3 = new TQLabel( tab, "textLabel1_3" ); tabLayout->addWidget( textLabel1_3, 2, 0 ); - textLabel1 = new QLabel( tab, "textLabel1" ); + textLabel1 = new TQLabel( tab, "textLabel1" ); tabLayout->addWidget( textLabel1, 0, 0 ); - textLabel1_2_2_2 = new QLabel( tab, "textLabel1_2_2_2" ); + textLabel1_2_2_2 = new TQLabel( tab, "textLabel1_2_2_2" ); tabLayout->addWidget( textLabel1_2_2_2, 4, 0 ); - textLabel1_2 = new QLabel( tab, "textLabel1_2" ); + textLabel1_2 = new TQLabel( tab, "textLabel1_2" ); tabLayout->addWidget( textLabel1_2, 1, 0 ); - textLabel1_2_2 = new QLabel( tab, "textLabel1_2_2" ); + textLabel1_2_2 = new TQLabel( tab, "textLabel1_2_2" ); tabLayout->addWidget( textLabel1_2_2, 3, 0 ); - textLabel1_2_2_3 = new QLabel( tab, "textLabel1_2_2_3" ); + textLabel1_2_2_3 = new TQLabel( tab, "textLabel1_2_2_3" ); tabLayout->addWidget( textLabel1_2_2_3, 5, 0 ); - spacer8 = new QSpacerItem( 20, 16, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer8 = new TQSpacerItem( 20, 16, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout->addItem( spacer8, 6, 2 ); ModeComboBox = new KComboBox( FALSE, tab, "ModeComboBox" ); @@ -112,48 +112,48 @@ KasablancaBookmarkDialog::KasablancaBookmarkDialog( QWidget* parent, const char* EncryptionComboBox->setEnabled( FALSE ); tabLayout->addWidget( EncryptionComboBox, 4, 1 ); - spacer10 = new QSpacerItem( 111, 31, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer10 = new TQSpacerItem( 111, 31, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tabLayout->addMultiCell( spacer10, 4, 5, 2, 2 ); - SettingsTab->insertTab( tab, QString("") ); + SettingsTab->insertTab( tab, TQString("") ); - tab_2 = new QWidget( SettingsTab, "tab_2" ); - tabLayout_2 = new QGridLayout( tab_2, 1, 1, 2, 6, "tabLayout_2"); + tab_2 = new TQWidget( SettingsTab, "tab_2" ); + tabLayout_2 = new TQGridLayout( tab_2, 1, 1, 2, 6, "tabLayout_2"); - textLabel3 = new QLabel( tab_2, "textLabel3" ); + textLabel3 = new TQLabel( tab_2, "textLabel3" ); tabLayout_2->addWidget( textLabel3, 0, 0 ); - DefaultDirectoryEdit = new QLineEdit( tab_2, "DefaultDirectoryEdit" ); + DefaultDirectoryEdit = new TQLineEdit( tab_2, "DefaultDirectoryEdit" ); DefaultDirectoryEdit->setEnabled( FALSE ); tabLayout_2->addMultiCellWidget( DefaultDirectoryEdit, 0, 0, 1, 3 ); - textLabel2 = new QLabel( tab_2, "textLabel2" ); + textLabel2 = new TQLabel( tab_2, "textLabel2" ); tabLayout_2->addWidget( textLabel2, 1, 0 ); - AlternativeFxpCheckBox = new QCheckBox( tab_2, "AlternativeFxpCheckBox" ); + AlternativeFxpCheckBox = new TQCheckBox( tab_2, "AlternativeFxpCheckBox" ); AlternativeFxpCheckBox->setEnabled( FALSE ); tabLayout_2->addWidget( AlternativeFxpCheckBox, 1, 3 ); - CorrectPasvCheckBox = new QCheckBox( tab_2, "CorrectPasvCheckBox" ); + CorrectPasvCheckBox = new TQCheckBox( tab_2, "CorrectPasvCheckBox" ); CorrectPasvCheckBox->setEnabled( FALSE ); tabLayout_2->addWidget( CorrectPasvCheckBox, 2, 3 ); - textLabel1_2_2_2_2 = new QLabel( tab_2, "textLabel1_2_2_2_2" ); + textLabel1_2_2_2_2 = new TQLabel( tab_2, "textLabel1_2_2_2_2" ); tabLayout_2->addMultiCellWidget( textLabel1_2_2_2_2, 2, 2, 0, 1 ); - spacer16 = new QSpacerItem( 60, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer16 = new TQSpacerItem( 60, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tabLayout_2->addMultiCell( spacer16, 1, 2, 2, 2 ); - spacer7 = new QSpacerItem( 20, 71, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer7 = new TQSpacerItem( 20, 71, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout_2->addItem( spacer7, 3, 1 ); - SettingsTab->insertTab( tab_2, QString("") ); + SettingsTab->insertTab( tab_2, TQString("") ); KasablancaBookmarkDialogLayout->addWidget( splitter1, 0, 0 ); languageChange(); - resize( QSize(541, 240).expandedTo(minimumSizeHint()) ); + resize( TQSize(541, 240).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // tab order @@ -169,7 +169,7 @@ KasablancaBookmarkDialog::KasablancaBookmarkDialog( QWidget* parent, const char* */ KasablancaBookmarkDialog::~KasablancaBookmarkDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -180,28 +180,28 @@ void KasablancaBookmarkDialog::languageChange() { setCaption( tr2i18n( "Bookmarks" ) ); BookmarkListView->header()->setLabel( 0, tr2i18n( "Name" ) ); - QWhatsThis::add( PassEdit, tr2i18n( "The user's password. Anonymous ftp servers ussually don't use passwords or accept passwords in the form of \"user@emailaddress.com\"." ) ); - QWhatsThis::add( UserEdit, tr2i18n( "The ftp Login Username. On open ftp servers you usually login using \"anonymous\"." ) ); - InfoEdit->setInputMask( QString::null ); - QWhatsThis::add( InfoEdit, tr2i18n( "This information points to the the ftp server. HOST can either be a standard ip adress like 192.168.2.1 or a domain name. PORT is the port number on which the ftp server listens. In most cases this is 21. Both are seperated by a \":\" character. A legit input would be \"ftp.kde.org:21\"." ) ); - QWhatsThis::add( NameEdit, tr2i18n( "The ftp's name is entered here." ) ); + TQWhatsThis::add( PassEdit, tr2i18n( "The user's password. Anonymous ftp servers ussually don't use passwords or accept passwords in the form of \"user@emailaddress.com\"." ) ); + TQWhatsThis::add( UserEdit, tr2i18n( "The ftp Login Username. On open ftp servers you usually login using \"anonymous\"." ) ); + InfoEdit->setInputMask( TQString::null ); + TQWhatsThis::add( InfoEdit, tr2i18n( "This information points to the the ftp server. HOST can either be a standard ip adress like 192.168.2.1 or a domain name. PORT is the port number on which the ftp server listens. In most cases this is 21. Both are seperated by a \":\" character. A legit input would be \"ftp.kde.org:21\"." ) ); + TQWhatsThis::add( NameEdit, tr2i18n( "The ftp's name is entered here." ) ); textLabel1_3->setText( tr2i18n( "Username:" ) ); textLabel1->setText( tr2i18n( "Name:" ) ); textLabel1_2_2_2->setText( tr2i18n( "Encryption:" ) ); - QWhatsThis::add( textLabel1_2_2_2, QString::null ); + TQWhatsThis::add( textLabel1_2_2_2, TQString::null ); textLabel1_2->setText( tr2i18n( "Host:Port:" ) ); textLabel1_2_2->setText( tr2i18n( "Password:" ) ); textLabel1_2_2_3->setText( tr2i18n( "Mode:" ) ); ModeComboBox->clear(); ModeComboBox->insertItem( tr2i18n( "Active Mode" ) ); ModeComboBox->insertItem( tr2i18n( "Passive Mode" ) ); - QWhatsThis::add( ModeComboBox, tr2i18n( "The mode you are using for data transfer. This is quite important in case you're behind a firewall or a router. In these cases you depend on the passive mode, which makes the client connects to the ftp server for data transfer. Passive mode is the standard method today, while active mode is the old way to do data transfers, the client listens for the server to connect in active mode." ) ); + TQWhatsThis::add( ModeComboBox, tr2i18n( "The mode you are using for data transfer. This is quite important in case you're behind a firewall or a router. In these cases you depend on the passive mode, which makes the client connects to the ftp server for data transfer. Passive mode is the standard method today, while active mode is the old way to do data transfers, the client listens for the server to connect in active mode." ) ); EncryptionComboBox->clear(); EncryptionComboBox->insertItem( tr2i18n( "Unencrypted" ) ); EncryptionComboBox->insertItem( tr2i18n( "Level 1" ) ); EncryptionComboBox->insertItem( tr2i18n( "Level 2" ) ); EncryptionComboBox->insertItem( tr2i18n( "Level 3" ) ); - QWhatsThis::add( EncryptionComboBox, tr2i18n( "There are 4 encryption levels available. Unencrypted leaves all traffic clear and without encryption. Most ftp servers allow only this mode. Level 1 encryption means that the traffic on the control connection is encrypted while data transfer remains clear. Level 2 is basically the same with the exception of directory information which is transfered on the data channel, but is encrypted too. Eventually Level 3 encrypts everything all communication and all data traffic." ) ); + TQWhatsThis::add( EncryptionComboBox, tr2i18n( "There are 4 encryption levels available. Unencrypted leaves all traffic clear and without encryption. Most ftp servers allow only this mode. Level 1 encryption means that the traffic on the control connection is encrypted while data transfer remains clear. Level 2 is basically the same with the exception of directory information which is transfered on the data channel, but is encrypted too. Eventually Level 3 encrypts everything all communication and all data traffic." ) ); SettingsTab->changeTab( tab, tr2i18n( "General" ) ); textLabel3->setText( tr2i18n( "Default directory:" ) ); textLabel2->setText( tr2i18n( "Alternative fxp:" ) ); diff --git a/src/Q_bookmarkdialog.ui b/src/Q_bookmarkdialog.ui index 347797f..8c50701 100755 --- a/src/Q_bookmarkdialog.ui +++ b/src/Q_bookmarkdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KasablancaBookmarkDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KasablancaBookmarkDialog</cstring> </property> @@ -30,7 +30,7 @@ <property name="margin"> <number>2</number> </property> - <widget class="QSplitter" row="0" column="0"> + <widget class="TQSplitter" row="0" column="0"> <property name="name"> <cstring>splitter1</cstring> </property> @@ -65,7 +65,7 @@ <bool>true</bool> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>SettingsTab</cstring> </property> @@ -78,7 +78,7 @@ <height>232</height> </size> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -150,7 +150,7 @@ <string>The ftp's name is entered here.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -158,7 +158,7 @@ <string>Username:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -166,7 +166,7 @@ <string>Name:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_2_2_2</cstring> </property> @@ -177,7 +177,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -185,7 +185,7 @@ <string>Host:Port:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -193,7 +193,7 @@ <string>Password:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel1_2_2_3</cstring> </property> @@ -289,7 +289,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -303,7 +303,7 @@ <property name="margin"> <number>2</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -311,7 +311,7 @@ <string>Default directory:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>DefaultDirectoryEdit</cstring> </property> @@ -319,7 +319,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -327,7 +327,7 @@ <string>Alternative fxp:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="3"> + <widget class="TQCheckBox" row="1" column="3"> <property name="name"> <cstring>AlternativeFxpCheckBox</cstring> </property> @@ -338,7 +338,7 @@ <string>Enabled</string> </property> </widget> - <widget class="QCheckBox" row="2" column="3"> + <widget class="TQCheckBox" row="2" column="3"> <property name="name"> <cstring>CorrectPasvCheckBox</cstring> </property> @@ -349,7 +349,7 @@ <string>Enabled</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_2_2_2_2</cstring> </property> diff --git a/src/Q_colorspreferencesdialog.cpp b/src/Q_colorspreferencesdialog.cpp index a8ef1ab..ef15f86 100644 --- a/src/Q_colorspreferencesdialog.cpp +++ b/src/Q_colorspreferencesdialog.cpp @@ -1,5 +1,5 @@ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/mkulke/Development/kasablanca/src/Q_colorspreferencesdialog.ui' ** @@ -11,12 +11,12 @@ #include "Q_colorspreferencesdialog.h" -#include <qvariant.h> -#include <qlabel.h> +#include <ntqvariant.h> +#include <ntqlabel.h> #include <kcolorbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a KasablancaColorsPreferencesDialog as a child of 'parent', with the @@ -25,29 +25,29 @@ * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -KasablancaColorsPreferencesDialog::KasablancaColorsPreferencesDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) +KasablancaColorsPreferencesDialog::KasablancaColorsPreferencesDialog( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) setName( "KasablancaColorsPreferencesDialog" ); - KasablancaColorsPreferencesDialogLayout = new QGridLayout( this, 1, 1, 11, 6, "KasablancaColorsPreferencesDialogLayout"); + KasablancaColorsPreferencesDialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "KasablancaColorsPreferencesDialogLayout"); - textLabel1_2 = new QLabel( this, "textLabel1_2" ); + textLabel1_2 = new TQLabel( this, "textLabel1_2" ); KasablancaColorsPreferencesDialogLayout->addWidget( textLabel1_2, 0, 0 ); - textLabel1_3_3 = new QLabel( this, "textLabel1_3_3" ); + textLabel1_3_3 = new TQLabel( this, "textLabel1_3_3" ); KasablancaColorsPreferencesDialogLayout->addWidget( textLabel1_3_3, 1, 0 ); - textLabel1_3 = new QLabel( this, "textLabel1_3" ); + textLabel1_3 = new TQLabel( this, "textLabel1_3" ); KasablancaColorsPreferencesDialogLayout->addWidget( textLabel1_3, 2, 0 ); - textLabel1_3_2 = new QLabel( this, "textLabel1_3_2" ); + textLabel1_3_2 = new TQLabel( this, "textLabel1_3_2" ); KasablancaColorsPreferencesDialogLayout->addWidget( textLabel1_3_2, 3, 0 ); - spacer3 = new QSpacerItem( 30, 60, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer3 = new TQSpacerItem( 30, 60, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); KasablancaColorsPreferencesDialogLayout->addMultiCell( spacer3, 0, 2, 1, 1 ); kcfg_FailureColor = new KColorButton( this, "kcfg_FailureColor" ); @@ -65,10 +65,10 @@ KasablancaColorsPreferencesDialog::KasablancaColorsPreferencesDialog( QWidget* p kcfg_BackgroundColor = new KColorButton( this, "kcfg_BackgroundColor" ); KasablancaColorsPreferencesDialogLayout->addWidget( kcfg_BackgroundColor, 0, 2 ); - spacer5 = new QSpacerItem( 31, 30, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer5 = new TQSpacerItem( 31, 30, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); KasablancaColorsPreferencesDialogLayout->addItem( spacer5, 4, 1 ); languageChange(); - resize( QSize(241, 183).expandedTo(minimumSizeHint()) ); + resize( TQSize(241, 183).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -77,7 +77,7 @@ KasablancaColorsPreferencesDialog::KasablancaColorsPreferencesDialog( QWidget* p */ KasablancaColorsPreferencesDialog::~KasablancaColorsPreferencesDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -91,10 +91,10 @@ void KasablancaColorsPreferencesDialog::languageChange() textLabel1_3_3->setText( tr2i18n( "Success Text:" ) ); textLabel1_3->setText( tr2i18n( "Failure Text:" ) ); textLabel1_3_2->setText( tr2i18n( "Local Text:" ) ); - kcfg_FailureColor->setText( QString::null ); - kcfg_SuccessColor->setText( QString::null ); - kcfg_LocalColor->setText( QString::null ); - kcfg_BackgroundColor->setText( QString::null ); + kcfg_FailureColor->setText( TQString::null ); + kcfg_SuccessColor->setText( TQString::null ); + kcfg_LocalColor->setText( TQString::null ); + kcfg_BackgroundColor->setText( TQString::null ); } #include "Q_colorspreferencesdialog.moc" diff --git a/src/Q_colorspreferencesdialog.ui b/src/Q_colorspreferencesdialog.ui index bfcf2a6..dd0b7ef 100644 --- a/src/Q_colorspreferencesdialog.ui +++ b/src/Q_colorspreferencesdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KasablancaColorsPreferencesDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KasablancaColorsPreferencesDialog</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -27,7 +27,7 @@ <string>Background:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_3_3</cstring> </property> @@ -35,7 +35,7 @@ <string>Success Text:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -43,7 +43,7 @@ <string>Failure Text:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> diff --git a/src/Q_customconnectdialog.cpp b/src/Q_customconnectdialog.cpp index 42822e1..eea10e2 100644 --- a/src/Q_customconnectdialog.cpp +++ b/src/Q_customconnectdialog.cpp @@ -1,5 +1,5 @@ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/mkulke/Development/kasablanca/src/Q_customconnectdialog.ui' ** @@ -11,125 +11,125 @@ #include "Q_customconnectdialog.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qtabwidget.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqtabwidget.h> +#include <ntqlabel.h> +#include <ntqlineedit.h> +#include <ntqcheckbox.h> +#include <ntqcombobox.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a KasablancaCustomConnectDialog as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -KasablancaCustomConnectDialog::KasablancaCustomConnectDialog( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +KasablancaCustomConnectDialog::KasablancaCustomConnectDialog( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "KasablancaCustomConnectDialog" ); - KasablancaCustomConnectDialogLayout = new QGridLayout( this, 1, 1, 2, 6, "KasablancaCustomConnectDialogLayout"); + KasablancaCustomConnectDialogLayout = new TQGridLayout( this, 1, 1, 2, 6, "KasablancaCustomConnectDialogLayout"); - Custom = new QTabWidget( this, "Custom" ); + Custom = new TQTabWidget( this, "Custom" ); - tab = new QWidget( Custom, "tab" ); - tabLayout = new QGridLayout( tab, 1, 1, 2, 6, "tabLayout"); + tab = new TQWidget( Custom, "tab" ); + tabLayout = new TQGridLayout( tab, 1, 1, 2, 6, "tabLayout"); - textLabel4 = new QLabel( tab, "textLabel4" ); - textLabel4->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignLeft ) ); + textLabel4 = new TQLabel( tab, "textLabel4" ); + textLabel4->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); tabLayout->addWidget( textLabel4, 2, 0 ); - UserLineEdit = new QLineEdit( tab, "UserLineEdit" ); - UserLineEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, UserLineEdit->sizePolicy().hasHeightForWidth() ) ); + UserLineEdit = new TQLineEdit( tab, "UserLineEdit" ); + UserLineEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, UserLineEdit->sizePolicy().hasHeightForWidth() ) ); tabLayout->addMultiCellWidget( UserLineEdit, 1, 1, 1, 2 ); - PassLineEdit = new QLineEdit( tab, "PassLineEdit" ); - PassLineEdit->setEchoMode( QLineEdit::Password ); + PassLineEdit = new TQLineEdit( tab, "PassLineEdit" ); + PassLineEdit->setEchoMode( TQLineEdit::Password ); tabLayout->addMultiCellWidget( PassLineEdit, 2, 2, 1, 2 ); - InfoEdit = new QLineEdit( tab, "InfoEdit" ); - InfoEdit->setAlignment( int( QLineEdit::AlignAuto ) ); + InfoEdit = new TQLineEdit( tab, "InfoEdit" ); + InfoEdit->setAlignment( int( TQLineEdit::AlignAuto ) ); tabLayout->addMultiCellWidget( InfoEdit, 0, 0, 1, 2 ); - textLabel3 = new QLabel( tab, "textLabel3" ); - textLabel3->setAlignment( int( QLabel::AlignVCenter ) ); + textLabel3 = new TQLabel( tab, "textLabel3" ); + textLabel3->setAlignment( int( TQLabel::AlignVCenter ) ); tabLayout->addWidget( textLabel3, 1, 0 ); - textLabel2 = new QLabel( tab, "textLabel2" ); - textLabel2->setAlignment( int( QLabel::AlignVCenter ) ); + textLabel2 = new TQLabel( tab, "textLabel2" ); + textLabel2->setAlignment( int( TQLabel::AlignVCenter ) ); tabLayout->addWidget( textLabel2, 0, 0 ); - textLabel1 = new QLabel( tab, "textLabel1" ); - textLabel1->setAlignment( int( QLabel::AlignVCenter ) ); + textLabel1 = new TQLabel( tab, "textLabel1" ); + textLabel1->setAlignment( int( TQLabel::AlignVCenter ) ); tabLayout->addWidget( textLabel1, 3, 0 ); - textLabel1_2 = new QLabel( tab, "textLabel1_2" ); - textLabel1_2->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) ); + textLabel1_2 = new TQLabel( tab, "textLabel1_2" ); + textLabel1_2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); tabLayout->addWidget( textLabel1_2, 4, 0 ); - AnonymousCheckBox = new QCheckBox( tab, "AnonymousCheckBox" ); + AnonymousCheckBox = new TQCheckBox( tab, "AnonymousCheckBox" ); tabLayout->addWidget( AnonymousCheckBox, 1, 3 ); - spacer12 = new QSpacerItem( 20, 16, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer12 = new TQSpacerItem( 20, 16, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout->addItem( spacer12, 5, 1 ); - EncryptionComboBox = new QComboBox( FALSE, tab, "EncryptionComboBox" ); + EncryptionComboBox = new TQComboBox( FALSE, tab, "EncryptionComboBox" ); tabLayout->addWidget( EncryptionComboBox, 3, 1 ); - ModeComboBox = new QComboBox( FALSE, tab, "ModeComboBox" ); + ModeComboBox = new TQComboBox( FALSE, tab, "ModeComboBox" ); tabLayout->addWidget( ModeComboBox, 4, 1 ); - spacer10 = new QSpacerItem( 120, 31, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer10 = new TQSpacerItem( 120, 31, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tabLayout->addMultiCell( spacer10, 3, 4, 2, 3 ); - Custom->insertTab( tab, QString("") ); + Custom->insertTab( tab, TQString("") ); - tab_2 = new QWidget( Custom, "tab_2" ); - tabLayout_2 = new QGridLayout( tab_2, 1, 1, 2, 6, "tabLayout_2"); + tab_2 = new TQWidget( Custom, "tab_2" ); + tabLayout_2 = new TQGridLayout( tab_2, 1, 1, 2, 6, "tabLayout_2"); - textLabel2_2 = new QLabel( tab_2, "textLabel2_2" ); + textLabel2_2 = new TQLabel( tab_2, "textLabel2_2" ); tabLayout_2->addWidget( textLabel2_2, 1, 0 ); - AlternativeFxpCheckBox = new QCheckBox( tab_2, "AlternativeFxpCheckBox" ); + AlternativeFxpCheckBox = new TQCheckBox( tab_2, "AlternativeFxpCheckBox" ); tabLayout_2->addWidget( AlternativeFxpCheckBox, 1, 3 ); - DefaultDirectoryEdit = new QLineEdit( tab_2, "DefaultDirectoryEdit" ); + DefaultDirectoryEdit = new TQLineEdit( tab_2, "DefaultDirectoryEdit" ); tabLayout_2->addMultiCellWidget( DefaultDirectoryEdit, 0, 0, 1, 3 ); - textLabel1_2_2_2_2 = new QLabel( tab_2, "textLabel1_2_2_2_2" ); + textLabel1_2_2_2_2 = new TQLabel( tab_2, "textLabel1_2_2_2_2" ); tabLayout_2->addMultiCellWidget( textLabel1_2_2_2_2, 2, 2, 0, 1 ); - CorrectPasvCheckBox = new QCheckBox( tab_2, "CorrectPasvCheckBox" ); + CorrectPasvCheckBox = new TQCheckBox( tab_2, "CorrectPasvCheckBox" ); tabLayout_2->addWidget( CorrectPasvCheckBox, 2, 3 ); - textLabel3_2 = new QLabel( tab_2, "textLabel3_2" ); + textLabel3_2 = new TQLabel( tab_2, "textLabel3_2" ); tabLayout_2->addWidget( textLabel3_2, 0, 0 ); - spacer16 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer16 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout_2->addItem( spacer16, 3, 1 ); - spacer17 = new QSpacerItem( 21, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer17 = new TQSpacerItem( 21, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tabLayout_2->addMultiCell( spacer17, 1, 2, 2, 2 ); - Custom->insertTab( tab_2, QString("") ); + Custom->insertTab( tab_2, TQString("") ); KasablancaCustomConnectDialogLayout->addWidget( Custom, 0, 0 ); languageChange(); - resize( QSize(370, 214).expandedTo(minimumSizeHint()) ); + resize( TQSize(370, 214).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -138,7 +138,7 @@ KasablancaCustomConnectDialog::KasablancaCustomConnectDialog( QWidget* parent, c */ KasablancaCustomConnectDialog::~KasablancaCustomConnectDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -149,10 +149,10 @@ void KasablancaCustomConnectDialog::languageChange() { setCaption( tr2i18n( "Custom Site" ) ); textLabel4->setText( tr2i18n( "Password:" ) ); - QWhatsThis::add( UserLineEdit, tr2i18n( "The ftp Login Username. On open ftp servers you usually login using \"anonymous\"." ) ); - QWhatsThis::add( PassLineEdit, tr2i18n( "The user's password. Anonymous ftp servers ussually don't use passwords or accept passwords in the form of \"user@emailaddress.com\"." ) ); - InfoEdit->setText( QString::null ); - QWhatsThis::add( InfoEdit, tr2i18n( "This information points to the the ftp server. HOST can either be a standard ip adress like \"192.168.2.1\" or a domain name. PORT is the port number on which the ftp server listens. In most cases this is 21. Both are seperated by a \":\" character. A legit input would be \"ftp.kde.org:21\"." ) ); + TQWhatsThis::add( UserLineEdit, tr2i18n( "The ftp Login Username. On open ftp servers you usually login using \"anonymous\"." ) ); + TQWhatsThis::add( PassLineEdit, tr2i18n( "The user's password. Anonymous ftp servers ussually don't use passwords or accept passwords in the form of \"user@emailaddress.com\"." ) ); + InfoEdit->setText( TQString::null ); + TQWhatsThis::add( InfoEdit, tr2i18n( "This information points to the the ftp server. HOST can either be a standard ip adress like \"192.168.2.1\" or a domain name. PORT is the port number on which the ftp server listens. In most cases this is 21. Both are seperated by a \":\" character. A legit input would be \"ftp.kde.org:21\"." ) ); textLabel3->setText( tr2i18n( "Username:" ) ); textLabel2->setText( tr2i18n( "Host:Port:" ) ); textLabel1->setText( tr2i18n( "Encryption:" ) ); @@ -163,11 +163,11 @@ void KasablancaCustomConnectDialog::languageChange() EncryptionComboBox->insertItem( tr2i18n( "Level 1" ) ); EncryptionComboBox->insertItem( tr2i18n( "Level 2" ) ); EncryptionComboBox->insertItem( tr2i18n( "Level 3" ) ); - QWhatsThis::add( EncryptionComboBox, tr2i18n( "There are 4 encryption levels available. Unencrypted leaves all traffic clear and without encryption. Most ftp servers allow only this mode. Level 1 encryption means that the traffic on the control connection is encrypted while data transfer remains clear. Level 2 is basically the same with the exception of directory information which is transfered on the data channel, but is encrypted too. Eventually Level 3 encrypts everything all communication and all data traffic." ) ); + TQWhatsThis::add( EncryptionComboBox, tr2i18n( "There are 4 encryption levels available. Unencrypted leaves all traffic clear and without encryption. Most ftp servers allow only this mode. Level 1 encryption means that the traffic on the control connection is encrypted while data transfer remains clear. Level 2 is basically the same with the exception of directory information which is transfered on the data channel, but is encrypted too. Eventually Level 3 encrypts everything all communication and all data traffic." ) ); ModeComboBox->clear(); ModeComboBox->insertItem( tr2i18n( "Passive Mode" ) ); ModeComboBox->insertItem( tr2i18n( "Active Mode" ) ); - QWhatsThis::add( ModeComboBox, tr2i18n( "The mode you are using for data transfer. This is quite important in case you're behind a firewall or a router. In these cases you depend on the passive mode, which makes the client connects to the ftp server for data transfer. Passive mode is the standard method today, while active mode is the old way to do data transfers, the client listens for the server to connect in active mode." ) ); + TQWhatsThis::add( ModeComboBox, tr2i18n( "The mode you are using for data transfer. This is quite important in case you're behind a firewall or a router. In these cases you depend on the passive mode, which makes the client connects to the ftp server for data transfer. Passive mode is the standard method today, while active mode is the old way to do data transfers, the client listens for the server to connect in active mode." ) ); Custom->changeTab( tab, tr2i18n( "General" ) ); textLabel2_2->setText( tr2i18n( "Alternative fxp:" ) ); AlternativeFxpCheckBox->setText( tr2i18n( "Enabled" ) ); diff --git a/src/Q_customconnectdialog.ui b/src/Q_customconnectdialog.ui index 926a674..dcd5a64 100755 --- a/src/Q_customconnectdialog.ui +++ b/src/Q_customconnectdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KasablancaCustomConnectDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KasablancaCustomConnectDialog</cstring> </property> @@ -22,11 +22,11 @@ <property name="margin"> <number>2</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>Custom</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -40,7 +40,7 @@ <property name="margin"> <number>2</number> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -51,7 +51,7 @@ <set>AlignVCenter|AlignLeft</set> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>UserLineEdit</cstring> </property> @@ -67,7 +67,7 @@ <string>The ftp Login Username. On open ftp servers you usually login using "anonymous".</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>PassLineEdit</cstring> </property> @@ -78,7 +78,7 @@ <string>The user's password. Anonymous ftp servers ussually don't use passwords or accept passwords in the form of "user@emailaddress.com".</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>InfoEdit</cstring> </property> @@ -92,7 +92,7 @@ <string>This information points to the the ftp server. HOST can either be a standard ip adress like "192.168.2.1" or a domain name. PORT is the port number on which the ftp server listens. In most cases this is 21. Both are seperated by a ":" character. A legit input would be "ftp.kde.org:21".</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -103,7 +103,7 @@ <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -114,7 +114,7 @@ <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -125,7 +125,7 @@ <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -136,7 +136,7 @@ <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QCheckBox" row="1" column="3"> + <widget class="TQCheckBox" row="1" column="3"> <property name="name"> <cstring>AnonymousCheckBox</cstring> </property> @@ -161,7 +161,7 @@ </size> </property> </spacer> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>Unencrypted</string> @@ -189,7 +189,7 @@ <string>There are 4 encryption levels available. Unencrypted leaves all traffic clear and without encryption. Most ftp servers allow only this mode. Level 1 encryption means that the traffic on the control connection is encrypted while data transfer remains clear. Level 2 is basically the same with the exception of directory information which is transfered on the data channel, but is encrypted too. Eventually Level 3 encrypts everything all communication and all data traffic.</string> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <item> <property name="text"> <string>Passive Mode</string> @@ -226,7 +226,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -240,7 +240,7 @@ <property name="margin"> <number>2</number> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -248,7 +248,7 @@ <string>Alternative fxp:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="3"> + <widget class="TQCheckBox" row="1" column="3"> <property name="name"> <cstring>AlternativeFxpCheckBox</cstring> </property> @@ -256,12 +256,12 @@ <string>Enabled</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>DefaultDirectoryEdit</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_2_2_2_2</cstring> </property> @@ -269,7 +269,7 @@ <string>Correct pasv responses:</string> </property> </widget> - <widget class="QCheckBox" row="2" column="3"> + <widget class="TQCheckBox" row="2" column="3"> <property name="name"> <cstring>CorrectPasvCheckBox</cstring> </property> @@ -277,7 +277,7 @@ <string>Enabled</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> diff --git a/src/Q_fileexistsdialog.cpp b/src/Q_fileexistsdialog.cpp index 5da867b..c3cba9b 100644 --- a/src/Q_fileexistsdialog.cpp +++ b/src/Q_fileexistsdialog.cpp @@ -1,5 +1,5 @@ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/mkulke/Development/kasablanca/src/Q_fileexistsdialog.ui' ** @@ -11,11 +11,11 @@ #include "Q_fileexistsdialog.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a KasablancaFileExistsDialog as a child of 'parent', with the @@ -24,35 +24,35 @@ * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -KasablancaFileExistsDialog::KasablancaFileExistsDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) +KasablancaFileExistsDialog::KasablancaFileExistsDialog( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) setName( "KasablancaFileExistsDialog" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); setModal( TRUE ); - KasablancaFileExistsDialogLayout = new QGridLayout( this, 1, 1, 2, 6, "KasablancaFileExistsDialogLayout"); - KasablancaFileExistsDialogLayout->setResizeMode( QLayout::Fixed ); + KasablancaFileExistsDialogLayout = new TQGridLayout( this, 1, 1, 2, 6, "KasablancaFileExistsDialogLayout"); + KasablancaFileExistsDialogLayout->setResizeMode( TQLayout::Fixed ); - SkipButton = new QPushButton( this, "SkipButton" ); + SkipButton = new TQPushButton( this, "SkipButton" ); KasablancaFileExistsDialogLayout->addWidget( SkipButton, 0, 3 ); - ResumeButton = new QPushButton( this, "ResumeButton" ); + ResumeButton = new TQPushButton( this, "ResumeButton" ); ResumeButton->setEnabled( TRUE ); KasablancaFileExistsDialogLayout->addWidget( ResumeButton, 0, 1 ); - RenameButton = new QPushButton( this, "RenameButton" ); + RenameButton = new TQPushButton( this, "RenameButton" ); RenameButton->setEnabled( TRUE ); KasablancaFileExistsDialogLayout->addWidget( RenameButton, 0, 2 ); - OverwriteButton = new QPushButton( this, "OverwriteButton" ); + OverwriteButton = new TQPushButton( this, "OverwriteButton" ); KasablancaFileExistsDialogLayout->addWidget( OverwriteButton, 0, 0 ); languageChange(); - resize( QSize(514, 57).expandedTo(minimumSizeHint()) ); + resize( TQSize(514, 57).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections @@ -72,7 +72,7 @@ KasablancaFileExistsDialog::KasablancaFileExistsDialog( QWidget* parent, const c */ KasablancaFileExistsDialog::~KasablancaFileExistsDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -90,22 +90,22 @@ void KasablancaFileExistsDialog::languageChange() void KasablancaFileExistsDialog::Skip() { - qWarning( "KasablancaFileExistsDialog::Skip(): Not implemented yet" ); + tqWarning( "KasablancaFileExistsDialog::Skip(): Not implemented yet" ); } void KasablancaFileExistsDialog::Overwrite() { - qWarning( "KasablancaFileExistsDialog::Overwrite(): Not implemented yet" ); + tqWarning( "KasablancaFileExistsDialog::Overwrite(): Not implemented yet" ); } void KasablancaFileExistsDialog::Resume() { - qWarning( "KasablancaFileExistsDialog::Resume(): Not implemented yet" ); + tqWarning( "KasablancaFileExistsDialog::Resume(): Not implemented yet" ); } void KasablancaFileExistsDialog::Rename() { - qWarning( "KasablancaFileExistsDialog::Rename(): Not implemented yet" ); + tqWarning( "KasablancaFileExistsDialog::Rename(): Not implemented yet" ); } #include "Q_fileexistsdialog.moc" diff --git a/src/Q_fileexistsdialog.ui b/src/Q_fileexistsdialog.ui index cc27a14..cd1d47c 100644 --- a/src/Q_fileexistsdialog.ui +++ b/src/Q_fileexistsdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KasablancaFileExistsDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KasablancaFileExistsDialog</cstring> </property> @@ -36,7 +36,7 @@ <property name="resizeMode"> <enum>Fixed</enum> </property> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>SkipButton</cstring> </property> @@ -44,7 +44,7 @@ <string>Skip</string> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>ResumeButton</cstring> </property> @@ -55,7 +55,7 @@ <string>Resume</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>RenameButton</cstring> </property> @@ -66,7 +66,7 @@ <string>Rename</string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>OverwriteButton</cstring> </property> diff --git a/src/Q_generalpreferencesdialog.cpp b/src/Q_generalpreferencesdialog.cpp index 0f638ec..560df47 100644 --- a/src/Q_generalpreferencesdialog.cpp +++ b/src/Q_generalpreferencesdialog.cpp @@ -1,5 +1,5 @@ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/mkulke/Development/kasablanca/src/Q_generalpreferencesdialog.ui' ** @@ -11,16 +11,16 @@ #include "Q_generalpreferencesdialog.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqlabel.h> +#include <ntqlineedit.h> +#include <ntqbuttongroup.h> +#include <ntqradiobutton.h> +#include <ntqcheckbox.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a KasablancaGeneralPreferencesDialog as a child of 'parent', with the @@ -29,107 +29,107 @@ * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -KasablancaGeneralPreferencesDialog::KasablancaGeneralPreferencesDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) +KasablancaGeneralPreferencesDialog::KasablancaGeneralPreferencesDialog( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) setName( "KasablancaGeneralPreferencesDialog" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); setSizeGripEnabled( FALSE ); - KasablancaGeneralPreferencesDialogLayout = new QGridLayout( this, 1, 1, 11, 6, "KasablancaGeneralPreferencesDialogLayout"); - KasablancaGeneralPreferencesDialogLayout->setResizeMode( QLayout::Minimum ); - spacer2_2 = new QSpacerItem( 20, 78, QSizePolicy::Minimum, QSizePolicy::Fixed ); + KasablancaGeneralPreferencesDialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "KasablancaGeneralPreferencesDialogLayout"); + KasablancaGeneralPreferencesDialogLayout->setResizeMode( TQLayout::Minimum ); + spacer2_2 = new TQSpacerItem( 20, 78, TQSizePolicy::Minimum, TQSizePolicy::Fixed ); KasablancaGeneralPreferencesDialogLayout->addItem( spacer2_2, 3, 0 ); - textLabel1_3 = new QLabel( this, "textLabel1_3" ); + textLabel1_3 = new TQLabel( this, "textLabel1_3" ); KasablancaGeneralPreferencesDialogLayout->addWidget( textLabel1_3, 4, 0 ); - textLabel1 = new QLabel( this, "textLabel1" ); + textLabel1 = new TQLabel( this, "textLabel1" ); KasablancaGeneralPreferencesDialogLayout->addWidget( textLabel1, 0, 0 ); - textLabel1_2 = new QLabel( this, "textLabel1_2" ); + textLabel1_2 = new TQLabel( this, "textLabel1_2" ); KasablancaGeneralPreferencesDialogLayout->addWidget( textLabel1_2, 1, 0 ); - textLabel1_2_2 = new QLabel( this, "textLabel1_2_2" ); + textLabel1_2_2 = new TQLabel( this, "textLabel1_2_2" ); KasablancaGeneralPreferencesDialogLayout->addWidget( textLabel1_2_2, 2, 0 ); - spacer2 = new QSpacerItem( 20, 78, QSizePolicy::Minimum, QSizePolicy::Fixed ); + spacer2 = new TQSpacerItem( 20, 78, TQSizePolicy::Minimum, TQSizePolicy::Fixed ); KasablancaGeneralPreferencesDialogLayout->addItem( spacer2, 3, 3 ); - kcfg_Skiplist = new QLineEdit( this, "kcfg_Skiplist" ); + kcfg_Skiplist = new TQLineEdit( this, "kcfg_Skiplist" ); KasablancaGeneralPreferencesDialogLayout->addMultiCellWidget( kcfg_Skiplist, 0, 0, 1, 2 ); - kcfg_OnQueueFinished = new QLineEdit( this, "kcfg_OnQueueFinished" ); + kcfg_OnQueueFinished = new TQLineEdit( this, "kcfg_OnQueueFinished" ); KasablancaGeneralPreferencesDialogLayout->addMultiCellWidget( kcfg_OnQueueFinished, 1, 1, 1, 2 ); - buttonGroup1 = new QButtonGroup( this, "buttonGroup1" ); - buttonGroup1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) ); - buttonGroup1->setColumnLayout(0, Qt::Vertical ); + buttonGroup1 = new TQButtonGroup( this, "buttonGroup1" ); + buttonGroup1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) ); + buttonGroup1->setColumnLayout(0, TQt::Vertical ); buttonGroup1->layout()->setSpacing( 6 ); buttonGroup1->layout()->setMargin( 11 ); - buttonGroup1Layout = new QGridLayout( buttonGroup1->layout() ); - buttonGroup1Layout->setAlignment( Qt::AlignTop ); + buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() ); + buttonGroup1Layout->setAlignment( TQt::AlignTop ); - kcfg_OnFileExistsResume = new QRadioButton( buttonGroup1, "kcfg_OnFileExistsResume" ); + kcfg_OnFileExistsResume = new TQRadioButton( buttonGroup1, "kcfg_OnFileExistsResume" ); buttonGroup1Layout->addWidget( kcfg_OnFileExistsResume, 1, 0 ); - kcfg_OnFileExistsSkip = new QRadioButton( buttonGroup1, "kcfg_OnFileExistsSkip" ); + kcfg_OnFileExistsSkip = new TQRadioButton( buttonGroup1, "kcfg_OnFileExistsSkip" ); buttonGroup1Layout->addWidget( kcfg_OnFileExistsSkip, 2, 0 ); - kcfg_OnFileExistsOverwrite = new QRadioButton( buttonGroup1, "kcfg_OnFileExistsOverwrite" ); + kcfg_OnFileExistsOverwrite = new TQRadioButton( buttonGroup1, "kcfg_OnFileExistsOverwrite" ); buttonGroup1Layout->addWidget( kcfg_OnFileExistsOverwrite, 0, 0 ); KasablancaGeneralPreferencesDialogLayout->addMultiCellWidget( buttonGroup1, 2, 3, 1, 2 ); - kcfg_Prioritylist = new QLineEdit( this, "kcfg_Prioritylist" ); + kcfg_Prioritylist = new TQLineEdit( this, "kcfg_Prioritylist" ); KasablancaGeneralPreferencesDialogLayout->addMultiCellWidget( kcfg_Prioritylist, 4, 4, 1, 2 ); - textLabel1_3_2 = new QLabel( this, "textLabel1_3_2" ); + textLabel1_3_2 = new TQLabel( this, "textLabel1_3_2" ); KasablancaGeneralPreferencesDialogLayout->addMultiCellWidget( textLabel1_3_2, 5, 5, 0, 1 ); - textLabel1_3_2_2 = new QLabel( this, "textLabel1_3_2_2" ); + textLabel1_3_2_2 = new TQLabel( this, "textLabel1_3_2_2" ); KasablancaGeneralPreferencesDialogLayout->addMultiCellWidget( textLabel1_3_2_2, 6, 6, 0, 1 ); - spacer9 = new QSpacerItem( 20, 16, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer9 = new TQSpacerItem( 20, 16, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); KasablancaGeneralPreferencesDialogLayout->addItem( spacer9, 7, 2 ); - kcfg_SkiplistIsEnabled = new QCheckBox( this, "kcfg_SkiplistIsEnabled" ); + kcfg_SkiplistIsEnabled = new TQCheckBox( this, "kcfg_SkiplistIsEnabled" ); KasablancaGeneralPreferencesDialogLayout->addWidget( kcfg_SkiplistIsEnabled, 0, 3 ); - kcfg_OnQueueFinishedIsEnabled = new QCheckBox( this, "kcfg_OnQueueFinishedIsEnabled" ); + kcfg_OnQueueFinishedIsEnabled = new TQCheckBox( this, "kcfg_OnQueueFinishedIsEnabled" ); KasablancaGeneralPreferencesDialogLayout->addWidget( kcfg_OnQueueFinishedIsEnabled, 1, 3 ); - kcfg_OnFileExistsIsEnabled = new QCheckBox( this, "kcfg_OnFileExistsIsEnabled" ); + kcfg_OnFileExistsIsEnabled = new TQCheckBox( this, "kcfg_OnFileExistsIsEnabled" ); KasablancaGeneralPreferencesDialogLayout->addWidget( kcfg_OnFileExistsIsEnabled, 2, 3 ); - kcfg_PrioritylistIsEnabled = new QCheckBox( this, "kcfg_PrioritylistIsEnabled" ); + kcfg_PrioritylistIsEnabled = new TQCheckBox( this, "kcfg_PrioritylistIsEnabled" ); KasablancaGeneralPreferencesDialogLayout->addWidget( kcfg_PrioritylistIsEnabled, 4, 3 ); - kcfg_DirCachingIsEnabled = new QCheckBox( this, "kcfg_DirCachingIsEnabled" ); + kcfg_DirCachingIsEnabled = new TQCheckBox( this, "kcfg_DirCachingIsEnabled" ); KasablancaGeneralPreferencesDialogLayout->addWidget( kcfg_DirCachingIsEnabled, 5, 3 ); - kcfg_DeleteMovesIntoTrashIsEnabled = new QCheckBox( this, "kcfg_DeleteMovesIntoTrashIsEnabled" ); + kcfg_DeleteMovesIntoTrashIsEnabled = new TQCheckBox( this, "kcfg_DeleteMovesIntoTrashIsEnabled" ); KasablancaGeneralPreferencesDialogLayout->addWidget( kcfg_DeleteMovesIntoTrashIsEnabled, 6, 3 ); - spacer10 = new QSpacerItem( 81, 51, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer10 = new TQSpacerItem( 81, 51, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); KasablancaGeneralPreferencesDialogLayout->addMultiCell( spacer10, 5, 6, 2, 2 ); languageChange(); - resize( QSize(455, 303).expandedTo(minimumSizeHint()) ); + resize( TQSize(455, 303).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -138,7 +138,7 @@ KasablancaGeneralPreferencesDialog::KasablancaGeneralPreferencesDialog( QWidget* */ KasablancaGeneralPreferencesDialog::~KasablancaGeneralPreferencesDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -148,21 +148,21 @@ KasablancaGeneralPreferencesDialog::~KasablancaGeneralPreferencesDialog() void KasablancaGeneralPreferencesDialog::languageChange() { setCaption( tr2i18n( "General" ) ); - QWhatsThis::add( this, tr2i18n( "Directory caching means that once you browsed a folder on a ftp session the content of that folder is cached, and will be loaded from there in case you enter it again. This can speed up browsing especially with large dirs. If you want a fresh representation of the dir content, you can press the refresh button." ) ); + TQWhatsThis::add( this, tr2i18n( "Directory caching means that once you browsed a folder on a ftp session the content of that folder is cached, and will be loaded from there in case you enter it again. This can speed up browsing especially with large dirs. If you want a fresh representation of the dir content, you can press the refresh button." ) ); textLabel1_3->setText( tr2i18n( "Priority list:" ) ); textLabel1->setText( tr2i18n( "Skiplist:" ) ); textLabel1_2->setText( tr2i18n( "On queue finished:" ) ); textLabel1_2_2->setText( tr2i18n( "On file exist:" ) ); - QWhatsThis::add( kcfg_Skiplist, tr2i18n( "Here you can enter a Regular Expression. Transfer items which match this Regular Expression are skipped. For example a value of \"^\\.\" excludes every entry beginning with \".\" from transfer." ) ); - QWhatsThis::add( kcfg_OnQueueFinished, tr2i18n( "This field can hold an executable and its arguments which will be run, when last item of in queue has finished transferring. For Example, on KDE desktops the entry \"dcop ksmserver ksmserver logout 0 0 0\" would shutdown the computer automatically." ) ); - buttonGroup1->setTitle( QString::null ); + TQWhatsThis::add( kcfg_Skiplist, tr2i18n( "Here you can enter a Regular Expression. Transfer items which match this Regular Expression are skipped. For example a value of \"^\\.\" excludes every entry beginning with \".\" from transfer." ) ); + TQWhatsThis::add( kcfg_OnQueueFinished, tr2i18n( "This field can hold an executable and its arguments which will be run, when last item of in queue has finished transferring. For Example, on KDE desktops the entry \"dcop ksmserver ksmserver logout 0 0 0\" would shutdown the computer automatically." ) ); + buttonGroup1->setTitle( TQString::null ); kcfg_OnFileExistsResume->setText( tr2i18n( "Resume (if possible)" ) ); - QWhatsThis::add( kcfg_OnFileExistsResume, tr2i18n( "These Radio Buttons indicate how the application should proceed if a file to be transfered already exists on the destination. Usually the user is asked by the application how to proceed if this occurs, in case you aren't present during the transfer you can enable this feature." ) ); + TQWhatsThis::add( kcfg_OnFileExistsResume, tr2i18n( "These Radio Buttons indicate how the application should proceed if a file to be transfered already exists on the destination. Usually the user is asked by the application how to proceed if this occurs, in case you aren't present during the transfer you can enable this feature." ) ); kcfg_OnFileExistsSkip->setText( tr2i18n( "Skip" ) ); - QWhatsThis::add( kcfg_OnFileExistsSkip, tr2i18n( "These Radio Buttons indicate how the application should proceed if a file to be transfered already exists on the destination. Usually the user is asked by the application how to proceed if this occurs, in case you aren't present during the transfer you can enable this feature." ) ); + TQWhatsThis::add( kcfg_OnFileExistsSkip, tr2i18n( "These Radio Buttons indicate how the application should proceed if a file to be transfered already exists on the destination. Usually the user is asked by the application how to proceed if this occurs, in case you aren't present during the transfer you can enable this feature." ) ); kcfg_OnFileExistsOverwrite->setText( tr2i18n( "Overwrite" ) ); - QWhatsThis::add( kcfg_OnFileExistsOverwrite, tr2i18n( "These Radio Buttons indicate how the application should proceed if a file to be transfered already exists on the destination. Usually the user is asked by the application how to proceed if this occurs, in case you aren't present during the transfer you can enable this feature." ) ); - QWhatsThis::add( kcfg_Prioritylist, tr2i18n( "This Field contains a regular expression, which queues the items matching this regular expression before the items which don't. For example, \".sfv\" would make the common checksum files with this fileending transfer first." ) ); + TQWhatsThis::add( kcfg_OnFileExistsOverwrite, tr2i18n( "These Radio Buttons indicate how the application should proceed if a file to be transfered already exists on the destination. Usually the user is asked by the application how to proceed if this occurs, in case you aren't present during the transfer you can enable this feature." ) ); + TQWhatsThis::add( kcfg_Prioritylist, tr2i18n( "This Field contains a regular expression, which queues the items matching this regular expression before the items which don't. For example, \".sfv\" would make the common checksum files with this fileending transfer first." ) ); textLabel1_3_2->setText( tr2i18n( "Directory caching:" ) ); textLabel1_3_2_2->setText( tr2i18n( "Delete moves files into trash:" ) ); kcfg_SkiplistIsEnabled->setText( tr2i18n( "Enabled" ) ); diff --git a/src/Q_generalpreferencesdialog.ui b/src/Q_generalpreferencesdialog.ui index d9beaa1..fcbd257 100644 --- a/src/Q_generalpreferencesdialog.ui +++ b/src/Q_generalpreferencesdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KasablancaGeneralPreferencesDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KasablancaGeneralPreferencesDialog</cstring> </property> @@ -53,7 +53,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -61,7 +61,7 @@ <string>Priority list:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -69,7 +69,7 @@ <string>Skiplist:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -77,7 +77,7 @@ <string>On queue finished:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -102,7 +102,7 @@ </size> </property> </spacer> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_Skiplist</cstring> </property> @@ -110,7 +110,7 @@ <string>Here you can enter a Regular Expression. Transfer items which match this Regular Expression are skipped. For example a value of "^\." excludes every entry beginning with "." from transfer.</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_OnQueueFinished</cstring> </property> @@ -118,7 +118,7 @@ <string>This field can hold an executable and its arguments which will be run, when last item of in queue has finished transferring. For Example, on KDE desktops the entry "dcop ksmserver ksmserver logout 0 0 0" would shutdown the computer automatically.</string> </property> </widget> - <widget class="QButtonGroup" row="2" column="1" rowspan="2" colspan="2"> + <widget class="TQButtonGroup" row="2" column="1" rowspan="2" colspan="2"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -137,7 +137,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>kcfg_OnFileExistsResume</cstring> </property> @@ -148,7 +148,7 @@ <string>These Radio Buttons indicate how the application should proceed if a file to be transfered already exists on the destination. Usually the user is asked by the application how to proceed if this occurs, in case you aren't present during the transfer you can enable this feature.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>kcfg_OnFileExistsSkip</cstring> </property> @@ -159,7 +159,7 @@ <string>These Radio Buttons indicate how the application should proceed if a file to be transfered already exists on the destination. Usually the user is asked by the application how to proceed if this occurs, in case you aren't present during the transfer you can enable this feature.</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>kcfg_OnFileExistsOverwrite</cstring> </property> @@ -172,7 +172,7 @@ </widget> </grid> </widget> - <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_Prioritylist</cstring> </property> @@ -180,7 +180,7 @@ <string>This Field contains a regular expression, which queues the items matching this regular expression before the items which don't. For example, ".sfv" would make the common checksum files with this fileending transfer first.</string> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -188,7 +188,7 @@ <string>Directory caching:</string> </property> </widget> - <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_3_2_2</cstring> </property> @@ -213,7 +213,7 @@ </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="3"> + <widget class="TQCheckBox" row="0" column="3"> <property name="name"> <cstring>kcfg_SkiplistIsEnabled</cstring> </property> @@ -221,7 +221,7 @@ <string>Enabled</string> </property> </widget> - <widget class="QCheckBox" row="1" column="3"> + <widget class="TQCheckBox" row="1" column="3"> <property name="name"> <cstring>kcfg_OnQueueFinishedIsEnabled</cstring> </property> @@ -229,7 +229,7 @@ <string>Enabled</string> </property> </widget> - <widget class="QCheckBox" row="2" column="3"> + <widget class="TQCheckBox" row="2" column="3"> <property name="name"> <cstring>kcfg_OnFileExistsIsEnabled</cstring> </property> @@ -237,7 +237,7 @@ <string>Enabled</string> </property> </widget> - <widget class="QCheckBox" row="4" column="3"> + <widget class="TQCheckBox" row="4" column="3"> <property name="name"> <cstring>kcfg_PrioritylistIsEnabled</cstring> </property> @@ -245,7 +245,7 @@ <string>Enabled</string> </property> </widget> - <widget class="QCheckBox" row="5" column="3"> + <widget class="TQCheckBox" row="5" column="3"> <property name="name"> <cstring>kcfg_DirCachingIsEnabled</cstring> </property> @@ -253,7 +253,7 @@ <string>Enabled</string> </property> </widget> - <widget class="QCheckBox" row="6" column="3"> + <widget class="TQCheckBox" row="6" column="3"> <property name="name"> <cstring>kcfg_DeleteMovesIntoTrashIsEnabled</cstring> </property> diff --git a/src/Q_importdialog.cpp b/src/Q_importdialog.cpp index 51567ec..4b5679b 100644 --- a/src/Q_importdialog.cpp +++ b/src/Q_importdialog.cpp @@ -1,5 +1,5 @@ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/mkulke/Development/kasablanca/src/Q_importdialog.ui' ** @@ -11,40 +11,40 @@ #include "Q_importdialog.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqbuttongroup.h> +#include <ntqradiobutton.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a KasablancaImportDialog as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -KasablancaImportDialog::KasablancaImportDialog( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +KasablancaImportDialog::KasablancaImportDialog( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "KasablancaImportDialog" ); - KasablancaImportDialogLayout = new QGridLayout( this, 1, 1, 11, 6, "KasablancaImportDialogLayout"); + KasablancaImportDialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "KasablancaImportDialogLayout"); - ImportGroupBox = new QButtonGroup( this, "ImportGroupBox" ); - ImportGroupBox->setColumnLayout(0, Qt::Vertical ); + ImportGroupBox = new TQButtonGroup( this, "ImportGroupBox" ); + ImportGroupBox->setColumnLayout(0, TQt::Vertical ); ImportGroupBox->layout()->setSpacing( 6 ); ImportGroupBox->layout()->setMargin( 11 ); - ImportGroupBoxLayout = new QGridLayout( ImportGroupBox->layout() ); - ImportGroupBoxLayout->setAlignment( Qt::AlignTop ); + ImportGroupBoxLayout = new TQGridLayout( ImportGroupBox->layout() ); + ImportGroupBoxLayout->setAlignment( TQt::AlignTop ); - GftpRadioButton = new QRadioButton( ImportGroupBox, "GftpRadioButton" ); + GftpRadioButton = new TQRadioButton( ImportGroupBox, "GftpRadioButton" ); GftpRadioButton->setChecked( TRUE ); ImportGroupBoxLayout->addWidget( GftpRadioButton, 0, 0 ); KasablancaImportDialogLayout->addWidget( ImportGroupBox, 0, 0 ); languageChange(); - resize( QSize(231, 80).expandedTo(minimumSizeHint()) ); + resize( TQSize(231, 80).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -53,7 +53,7 @@ KasablancaImportDialog::KasablancaImportDialog( QWidget* parent, const char* nam */ KasablancaImportDialog::~KasablancaImportDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/src/Q_importdialog.ui b/src/Q_importdialog.ui index bbfeef9..b185561 100644 --- a/src/Q_importdialog.ui +++ b/src/Q_importdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KasablancaImportDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KasablancaImportDialog</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>ImportGroupBox</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>GftpRadioButton</cstring> </property> diff --git a/src/Q_mainwindow.cpp b/src/Q_mainwindow.cpp index 40ef350..b42aafa 100644 --- a/src/Q_mainwindow.cpp +++ b/src/Q_mainwindow.cpp @@ -1,5 +1,5 @@ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/mkulke/Development/kasablanca/src/Q_mainwindow.ui' ** @@ -11,83 +11,83 @@ #include "Q_mainwindow.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qtoolbutton.h> -#include <qheader.h> -#include <qlistview.h> +#include <ntqvariant.h> +#include <ntqpushbutton.h> +#include <ntqtoolbutton.h> +#include <ntqheader.h> +#include <ntqlistview.h> #include <klineedit.h> -#include <qsplitter.h> -#include <qtextedit.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqsplitter.h> +#include <ntqtextedit.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> #include "kbtaskview.h" /* * Constructs a KasablancaMainWindow as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -KasablancaMainWindow::KasablancaMainWindow( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +KasablancaMainWindow::KasablancaMainWindow( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "KasablancaMainWindow" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); - KasablancaMainWindowLayout = new QGridLayout( this, 1, 1, 2, 6, "KasablancaMainWindowLayout"); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); + KasablancaMainWindowLayout = new TQGridLayout( this, 1, 1, 2, 6, "KasablancaMainWindowLayout"); - ConnectButtonA = new QToolButton( this, "ConnectButtonA" ); + ConnectButtonA = new TQToolButton( this, "ConnectButtonA" ); ConnectButtonA->setEnabled( TRUE ); ConnectButtonA->setAutoRaise( FALSE ); KasablancaMainWindowLayout->addWidget( ConnectButtonA, 0, 0 ); - RefreshButtonA = new QToolButton( this, "RefreshButtonA" ); + RefreshButtonA = new TQToolButton( this, "RefreshButtonA" ); RefreshButtonA->setEnabled( TRUE ); RefreshButtonA->setAutoRaise( FALSE ); KasablancaMainWindowLayout->addWidget( RefreshButtonA, 0, 1 ); - TransferButtonA = new QToolButton( this, "TransferButtonA" ); + TransferButtonA = new TQToolButton( this, "TransferButtonA" ); TransferButtonA->setEnabled( FALSE ); TransferButtonA->setAutoRaise( FALSE ); KasablancaMainWindowLayout->addWidget( TransferButtonA, 0, 2 ); - ConnectButtonB = new QToolButton( this, "ConnectButtonB" ); + ConnectButtonB = new TQToolButton( this, "ConnectButtonB" ); ConnectButtonB->setEnabled( TRUE ); ConnectButtonB->setAutoRaise( FALSE ); KasablancaMainWindowLayout->addWidget( ConnectButtonB, 0, 4 ); - RefreshButtonB = new QToolButton( this, "RefreshButtonB" ); + RefreshButtonB = new TQToolButton( this, "RefreshButtonB" ); RefreshButtonB->setEnabled( TRUE ); RefreshButtonB->setAutoRaise( FALSE ); KasablancaMainWindowLayout->addWidget( RefreshButtonB, 0, 5 ); - TransferButtonB = new QToolButton( this, "TransferButtonB" ); + TransferButtonB = new TQToolButton( this, "TransferButtonB" ); TransferButtonB->setEnabled( FALSE ); TransferButtonB->setAutoRaise( FALSE ); KasablancaMainWindowLayout->addWidget( TransferButtonB, 0, 6 ); - BrowserA = new QListView( this, "BrowserA" ); + BrowserA = new TQListView( this, "BrowserA" ); BrowserA->addColumn( tr2i18n( "Name" ) ); BrowserA->addColumn( tr2i18n( "Size" ) ); BrowserA->addColumn( tr2i18n( "Date" ) ); - BrowserA->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)2, (QSizePolicy::SizeType)7, 0, 0, BrowserA->sizePolicy().hasHeightForWidth() ) ); - BrowserA->setResizePolicy( QScrollView::Manual ); - BrowserA->setSelectionMode( QListView::Extended ); + BrowserA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)2, (TQSizePolicy::SizeType)7, 0, 0, BrowserA->sizePolicy().hasHeightForWidth() ) ); + BrowserA->setResizePolicy( TQScrollView::Manual ); + BrowserA->setSelectionMode( TQListView::Extended ); KasablancaMainWindowLayout->addMultiCellWidget( BrowserA, 1, 1, 0, 3 ); - BrowserB = new QListView( this, "BrowserB" ); + BrowserB = new TQListView( this, "BrowserB" ); BrowserB->addColumn( tr2i18n( "Name" ) ); BrowserB->addColumn( tr2i18n( "Size" ) ); BrowserB->addColumn( tr2i18n( "Date" ) ); - BrowserB->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)2, (QSizePolicy::SizeType)7, 0, 0, BrowserB->sizePolicy().hasHeightForWidth() ) ); - BrowserB->setSelectionMode( QListView::Extended ); + BrowserB->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)2, (TQSizePolicy::SizeType)7, 0, 0, BrowserB->sizePolicy().hasHeightForWidth() ) ); + BrowserB->setSelectionMode( TQListView::Extended ); KasablancaMainWindowLayout->addMultiCellWidget( BrowserB, 1, 1, 4, 7 ); @@ -107,43 +107,43 @@ KasablancaMainWindow::KasablancaMainWindow( QWidget* parent, const char* name, W KasablancaMainWindowLayout->addMultiCellWidget( CommandLineB, 2, 2, 4, 7 ); - splitter4 = new QSplitter( this, "splitter4" ); - splitter4->setOrientation( QSplitter::Vertical ); + splitter4 = new TQSplitter( this, "splitter4" ); + splitter4->setOrientation( TQSplitter::Vertical ); TaskView = new KbTaskView( splitter4, "TaskView" ); - QWidget* privateLayoutWidget = new QWidget( splitter4, "layout2" ); - layout2 = new QGridLayout( privateLayoutWidget, 1, 1, 0, 6, "layout2"); + TQWidget* privateLayoutWidget = new TQWidget( splitter4, "layout2" ); + layout2 = new TQGridLayout( privateLayoutWidget, 1, 1, 0, 6, "layout2"); - LogWindowB = new QTextEdit( privateLayoutWidget, "LogWindowB" ); - LogWindowB->setPaletteForegroundColor( QColor( 255, 255, 255 ) ); - LogWindowB->setPaletteBackgroundColor( QColor( 82, 194, 255 ) ); - QFont LogWindowB_font( LogWindowB->font() ); + LogWindowB = new TQTextEdit( privateLayoutWidget, "LogWindowB" ); + LogWindowB->setPaletteForegroundColor( TQColor( 255, 255, 255 ) ); + LogWindowB->setPaletteBackgroundColor( TQColor( 82, 194, 255 ) ); + TQFont LogWindowB_font( LogWindowB->font() ); LogWindowB_font.setFamily( "Dec Terminal" ); LogWindowB->setFont( LogWindowB_font ); - LogWindowB->setHScrollBarMode( QTextEdit::AlwaysOff ); - LogWindowB->setTextFormat( QTextEdit::PlainText ); - LogWindowB->setWrapPolicy( QTextEdit::AtWordOrDocumentBoundary ); + LogWindowB->setHScrollBarMode( TQTextEdit::AlwaysOff ); + LogWindowB->setTextFormat( TQTextEdit::PlainText ); + LogWindowB->setWrapPolicy( TQTextEdit::AtWordOrDocumentBoundary ); LogWindowB->setReadOnly( TRUE ); layout2->addWidget( LogWindowB, 0, 1 ); - LogWindowA = new QTextEdit( privateLayoutWidget, "LogWindowA" ); - LogWindowA->setPaletteForegroundColor( QColor( 255, 255, 255 ) ); - LogWindowA->setPaletteBackgroundColor( QColor( 82, 194, 255 ) ); - QFont LogWindowA_font( LogWindowA->font() ); + LogWindowA = new TQTextEdit( privateLayoutWidget, "LogWindowA" ); + LogWindowA->setPaletteForegroundColor( TQColor( 255, 255, 255 ) ); + LogWindowA->setPaletteBackgroundColor( TQColor( 82, 194, 255 ) ); + TQFont LogWindowA_font( LogWindowA->font() ); LogWindowA_font.setFamily( "Dec Terminal" ); LogWindowA->setFont( LogWindowA_font ); - LogWindowA->setHScrollBarMode( QTextEdit::AlwaysOff ); - LogWindowA->setTextFormat( QTextEdit::PlainText ); - LogWindowA->setWrapPolicy( QTextEdit::AtWordOrDocumentBoundary ); + LogWindowA->setHScrollBarMode( TQTextEdit::AlwaysOff ); + LogWindowA->setTextFormat( TQTextEdit::PlainText ); + LogWindowA->setWrapPolicy( TQTextEdit::AtWordOrDocumentBoundary ); LogWindowA->setReadOnly( TRUE ); layout2->addWidget( LogWindowA, 0, 0 ); KasablancaMainWindowLayout->addMultiCellWidget( splitter4, 3, 3, 0, 7 ); languageChange(); - resize( QSize(689, 626).expandedTo(minimumSizeHint()) ); + resize( TQSize(689, 626).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // tab order @@ -156,7 +156,7 @@ KasablancaMainWindow::KasablancaMainWindow( QWidget* parent, const char* name, W */ KasablancaMainWindow::~KasablancaMainWindow() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -166,20 +166,20 @@ KasablancaMainWindow::~KasablancaMainWindow() void KasablancaMainWindow::languageChange() { setCaption( tr2i18n( "Kasablanca x" ) ); - ConnectButtonA->setText( QString::null ); - RefreshButtonA->setText( QString::null ); - TransferButtonA->setText( QString::null ); - ConnectButtonB->setText( QString::null ); - RefreshButtonB->setText( QString::null ); - TransferButtonB->setText( QString::null ); + ConnectButtonA->setText( TQString::null ); + RefreshButtonA->setText( TQString::null ); + TransferButtonA->setText( TQString::null ); + ConnectButtonB->setText( TQString::null ); + RefreshButtonB->setText( TQString::null ); + TransferButtonB->setText( TQString::null ); BrowserA->header()->setLabel( 0, tr2i18n( "Name" ) ); BrowserA->header()->setLabel( 1, tr2i18n( "Size" ) ); BrowserA->header()->setLabel( 2, tr2i18n( "Date" ) ); BrowserB->header()->setLabel( 0, tr2i18n( "Name" ) ); BrowserB->header()->setLabel( 1, tr2i18n( "Size" ) ); BrowserB->header()->setLabel( 2, tr2i18n( "Date" ) ); - LogWindowB->setText( QString::null ); - LogWindowA->setText( QString::null ); + LogWindowB->setText( TQString::null ); + LogWindowA->setText( TQString::null ); } #include "Q_mainwindow.moc" diff --git a/src/Q_mainwindow.ui b/src/Q_mainwindow.ui index 2887033..43aeb46 100755 --- a/src/Q_mainwindow.ui +++ b/src/Q_mainwindow.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KasablancaMainWindow</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KasablancaMainWindow</cstring> </property> @@ -30,7 +30,7 @@ <property name="margin"> <number>2</number> </property> - <widget class="QToolButton" row="0" column="0"> + <widget class="TQToolButton" row="0" column="0"> <property name="name"> <cstring>ConnectButtonA</cstring> </property> @@ -44,7 +44,7 @@ <bool>false</bool> </property> </widget> - <widget class="QToolButton" row="0" column="1"> + <widget class="TQToolButton" row="0" column="1"> <property name="name"> <cstring>RefreshButtonA</cstring> </property> @@ -58,7 +58,7 @@ <bool>false</bool> </property> </widget> - <widget class="QToolButton" row="0" column="2"> + <widget class="TQToolButton" row="0" column="2"> <property name="name"> <cstring>TransferButtonA</cstring> </property> @@ -72,7 +72,7 @@ <bool>false</bool> </property> </widget> - <widget class="QToolButton" row="0" column="4"> + <widget class="TQToolButton" row="0" column="4"> <property name="name"> <cstring>ConnectButtonB</cstring> </property> @@ -86,7 +86,7 @@ <bool>false</bool> </property> </widget> - <widget class="QToolButton" row="0" column="5"> + <widget class="TQToolButton" row="0" column="5"> <property name="name"> <cstring>RefreshButtonB</cstring> </property> @@ -100,7 +100,7 @@ <bool>false</bool> </property> </widget> - <widget class="QToolButton" row="0" column="6"> + <widget class="TQToolButton" row="0" column="6"> <property name="name"> <cstring>TransferButtonB</cstring> </property> @@ -114,7 +114,7 @@ <bool>false</bool> </property> </widget> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="4"> <column> <property name="text"> <string>Name</string> @@ -166,7 +166,7 @@ <enum>Extended</enum> </property> </widget> - <widget class="QListView" row="1" column="4" rowspan="1" colspan="4"> + <widget class="TQListView" row="1" column="4" rowspan="1" colspan="4"> <column> <property name="text"> <string>Name</string> @@ -235,7 +235,7 @@ <cstring>CommandLineB</cstring> </property> </widget> - <widget class="QSplitter" row="3" column="0" rowspan="1" colspan="8"> + <widget class="TQSplitter" row="3" column="0" rowspan="1" colspan="8"> <property name="name"> <cstring>splitter4</cstring> </property> @@ -247,7 +247,7 @@ <cstring>TaskView</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -258,7 +258,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTextEdit" row="0" column="1"> + <widget class="TQTextEdit" row="0" column="1"> <property name="name"> <cstring>LogWindowB</cstring> </property> @@ -297,7 +297,7 @@ <bool>true</bool> </property> </widget> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>LogWindowA</cstring> </property> diff --git a/src/Q_userinterfacepreferencesdialog.cpp b/src/Q_userinterfacepreferencesdialog.cpp index 5aa2b31..daf741a 100644 --- a/src/Q_userinterfacepreferencesdialog.cpp +++ b/src/Q_userinterfacepreferencesdialog.cpp @@ -1,5 +1,5 @@ #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> /**************************************************************************** ** Form implementation generated from reading ui file '/home/mkulke/Development/kasablanca/src/Q_userinterfacepreferencesdialog.ui' ** @@ -11,13 +11,13 @@ #include "Q_userinterfacepreferencesdialog.h" -#include <qvariant.h> -#include <qlabel.h> -#include <qcheckbox.h> +#include <ntqvariant.h> +#include <ntqlabel.h> +#include <ntqcheckbox.h> #include <kfontrequester.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <ntqlayout.h> +#include <ntqtooltip.h> +#include <ntqwhatsthis.h> /* * Constructs a KasablancaUserInterfacePreferencesDialog as a child of 'parent', with the @@ -26,36 +26,36 @@ * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -KasablancaUserInterfacePreferencesDialog::KasablancaUserInterfacePreferencesDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) +KasablancaUserInterfacePreferencesDialog::KasablancaUserInterfacePreferencesDialog( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) setName( "KasablancaUserInterfacePreferencesDialog" ); - KasablancaUserInterfacePreferencesDialogLayout = new QGridLayout( this, 1, 1, 11, 6, "KasablancaUserInterfacePreferencesDialogLayout"); - spacer4 = new QSpacerItem( 20, 16, QSizePolicy::Minimum, QSizePolicy::Expanding ); + KasablancaUserInterfacePreferencesDialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "KasablancaUserInterfacePreferencesDialogLayout"); + spacer4 = new TQSpacerItem( 20, 16, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); KasablancaUserInterfacePreferencesDialogLayout->addItem( spacer4, 4, 3 ); - textLabel1_2_2_2_2 = new QLabel( this, "textLabel1_2_2_2_2" ); + textLabel1_2_2_2_2 = new TQLabel( this, "textLabel1_2_2_2_2" ); KasablancaUserInterfacePreferencesDialogLayout->addMultiCellWidget( textLabel1_2_2_2_2, 0, 0, 0, 1 ); - textLabel1_2_2_2_2_2 = new QLabel( this, "textLabel1_2_2_2_2_2" ); + textLabel1_2_2_2_2_2 = new TQLabel( this, "textLabel1_2_2_2_2_2" ); KasablancaUserInterfacePreferencesDialogLayout->addMultiCellWidget( textLabel1_2_2_2_2_2, 1, 1, 0, 1 ); - textLabel1_2_2_2_2_2_3 = new QLabel( this, "textLabel1_2_2_2_2_2_3" ); + textLabel1_2_2_2_2_2_3 = new TQLabel( this, "textLabel1_2_2_2_2_2_3" ); KasablancaUserInterfacePreferencesDialogLayout->addMultiCellWidget( textLabel1_2_2_2_2_2_3, 2, 2, 0, 2 ); - kcfg_SystrayIsEnabled = new QCheckBox( this, "kcfg_SystrayIsEnabled" ); + kcfg_SystrayIsEnabled = new TQCheckBox( this, "kcfg_SystrayIsEnabled" ); KasablancaUserInterfacePreferencesDialogLayout->addWidget( kcfg_SystrayIsEnabled, 0, 4 ); - kcfg_CommandLineIsEnabled = new QCheckBox( this, "kcfg_CommandLineIsEnabled" ); + kcfg_CommandLineIsEnabled = new TQCheckBox( this, "kcfg_CommandLineIsEnabled" ); KasablancaUserInterfacePreferencesDialogLayout->addWidget( kcfg_CommandLineIsEnabled, 1, 4 ); - kcfg_HideHiddenFilesIsEnabled = new QCheckBox( this, "kcfg_HideHiddenFilesIsEnabled" ); + kcfg_HideHiddenFilesIsEnabled = new TQCheckBox( this, "kcfg_HideHiddenFilesIsEnabled" ); KasablancaUserInterfacePreferencesDialogLayout->addWidget( kcfg_HideHiddenFilesIsEnabled, 2, 4 ); @@ -63,15 +63,15 @@ KasablancaUserInterfacePreferencesDialog::KasablancaUserInterfacePreferencesDial KasablancaUserInterfacePreferencesDialogLayout->addMultiCellWidget( kcfg_LogwindowFont, 3, 3, 2, 4 ); - textLabel1_2_2_2_2_2_2 = new QLabel( this, "textLabel1_2_2_2_2_2_2" ); + textLabel1_2_2_2_2_2_2 = new TQLabel( this, "textLabel1_2_2_2_2_2_2" ); KasablancaUserInterfacePreferencesDialogLayout->addWidget( textLabel1_2_2_2_2_2_2, 3, 0 ); - spacer3 = new QSpacerItem( 140, 58, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer3 = new TQSpacerItem( 140, 58, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); KasablancaUserInterfacePreferencesDialogLayout->addMultiCell( spacer3, 0, 1, 2, 3 ); - spacer3_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer3_2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); KasablancaUserInterfacePreferencesDialogLayout->addItem( spacer3_2, 3, 1 ); languageChange(); - resize( QSize(448, 165).expandedTo(minimumSizeHint()) ); + resize( TQSize(448, 165).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -80,7 +80,7 @@ KasablancaUserInterfacePreferencesDialog::KasablancaUserInterfacePreferencesDial */ KasablancaUserInterfacePreferencesDialog::~KasablancaUserInterfacePreferencesDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/src/Q_userinterfacepreferencesdialog.ui b/src/Q_userinterfacepreferencesdialog.ui index 26f537c..267a4b9 100644 --- a/src/Q_userinterfacepreferencesdialog.ui +++ b/src/Q_userinterfacepreferencesdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KasablancaUserInterfacePreferencesDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KasablancaUserInterfacePreferencesDialog</cstring> </property> @@ -36,7 +36,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_2_2_2_2</cstring> </property> @@ -44,7 +44,7 @@ <string>Show system tray icon:</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_2_2_2_2_2</cstring> </property> @@ -52,7 +52,7 @@ <string>Show command lines:</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1_2_2_2_2_2_3</cstring> </property> @@ -60,7 +60,7 @@ <string>Hide hidden files from view:</string> </property> </widget> - <widget class="QCheckBox" row="0" column="4"> + <widget class="TQCheckBox" row="0" column="4"> <property name="name"> <cstring>kcfg_SystrayIsEnabled</cstring> </property> @@ -68,7 +68,7 @@ <string>Enabled</string> </property> </widget> - <widget class="QCheckBox" row="1" column="4"> + <widget class="TQCheckBox" row="1" column="4"> <property name="name"> <cstring>kcfg_CommandLineIsEnabled</cstring> </property> @@ -76,7 +76,7 @@ <string>Enabled</string> </property> </widget> - <widget class="QCheckBox" row="2" column="4"> + <widget class="TQCheckBox" row="2" column="4"> <property name="name"> <cstring>kcfg_HideHiddenFilesIsEnabled</cstring> </property> @@ -89,7 +89,7 @@ <cstring>kcfg_LogwindowFont</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2_2_2_2_2_2</cstring> </property> diff --git a/src/bookmarkdialog.cpp b/src/bookmarkdialog.cpp index 8bb610c..963f103 100644 --- a/src/bookmarkdialog.cpp +++ b/src/bookmarkdialog.cpp @@ -17,17 +17,17 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <qdom.h> -#include <qfile.h> -#include <qdir.h> -#include <qcheckbox.h> -#include <qheader.h> -#include <qtabwidget.h> -#include <qaction.h> +#include <ntqdom.h> +#include <ntqfile.h> +#include <ntqdir.h> +#include <ntqcheckbox.h> +#include <ntqheader.h> +#include <ntqtabwidget.h> +#include <ntqaction.h> #include <kcombobox.h> #include <kcompletion.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kmessagebox.h> #include <kpushbutton.h> @@ -36,7 +36,7 @@ #include "bookmarkdialog.h" #include "kbbookmarkitem.h" -BookmarkDialog::BookmarkDialog(QWidget *parent, const char *name) +BookmarkDialog::BookmarkDialog(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n( "Bookmarks" ), KDialogBase::Ok | KDialogBase::Help | @@ -59,13 +59,13 @@ BookmarkDialog::BookmarkDialog(QWidget *parent, const char *name) for (list<KbSiteInfo>::iterator i = m_bookmarklist.begin(); i != end_bookmarks; i++) after = new KbBookmarkItem(mp_dialog->BookmarkListView, after, &(*i)); - connect(mp_dialog->NameEdit, SIGNAL(textChanged(const QString&)), SLOT(SLOT_TextChanged(const QString&))); - connect(mp_dialog->InfoEdit, SIGNAL(textChanged(const QString&)), SLOT(SLOT_TextChanged(const QString&))); - connect(mp_dialog->UserEdit, SIGNAL(textChanged(const QString&)), SLOT(SLOT_TextChanged(const QString&))); - connect(mp_dialog->PassEdit, SIGNAL(textChanged(const QString&)), SLOT(SLOT_TextChanged(const QString&))); - connect(mp_dialog->DefaultDirectoryEdit, SIGNAL(textChanged(const QString&)), SLOT(SLOT_TextChanged(const QString&))); - connect(mp_dialog->EncryptionComboBox, SIGNAL(activated(const QString&)), SLOT(SLOT_TextChanged(const QString&))); - connect(mp_dialog->ModeComboBox, SIGNAL(activated(const QString&)), SLOT(SLOT_TextChanged(const QString&))); + connect(mp_dialog->NameEdit, SIGNAL(textChanged(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->InfoEdit, SIGNAL(textChanged(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->UserEdit, SIGNAL(textChanged(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->PassEdit, SIGNAL(textChanged(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->DefaultDirectoryEdit, SIGNAL(textChanged(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->EncryptionComboBox, SIGNAL(activated(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->ModeComboBox, SIGNAL(activated(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); connect(mp_dialog->AlternativeFxpCheckBox, SIGNAL(clicked()), SLOT(SLOT_StateChanged())); connect(mp_dialog->CorrectPasvCheckBox, SIGNAL(clicked()), SLOT(SLOT_StateChanged())); @@ -75,7 +75,7 @@ BookmarkDialog::BookmarkDialog(QWidget *parent, const char *name) enableButton(KDialogBase::User2, false); - QAction *deleteShortcut = new QAction( QPixmap(), "&Delete", + TQAction *deleteShortcut = new TQAction( TQPixmap(), "&Delete", Key_Delete, this, "delete" ); connect( deleteShortcut, SIGNAL( activated() ) , this, SLOT( slotUser2() ) ); @@ -125,7 +125,7 @@ void BookmarkDialog::slotOk() slotApply(); - QListViewItemIterator it(mp_dialog->BookmarkListView); + TQListViewItemIterator it(mp_dialog->BookmarkListView); while (it.current()) { newbookmarklist.push_back(*(static_cast<KbBookmarkItem*>(it.current())->GetSiteInfo())); @@ -182,7 +182,7 @@ void BookmarkDialog::SLOT_StateChanged() if (!m_newitemselected) ApplyChanges(); } -void BookmarkDialog::SLOT_TextChanged(const QString&) +void BookmarkDialog::SLOT_TextChanged(const TQString&) { if (!m_newitemselected) ApplyChanges(); } diff --git a/src/bookmarkdialog.h b/src/bookmarkdialog.h index 006201d..0621fcc 100644 --- a/src/bookmarkdialog.h +++ b/src/bookmarkdialog.h @@ -35,13 +35,13 @@ class BookmarkDialog : public KDialogBase { Q_OBJECT public: - BookmarkDialog(QWidget *parent = 0, const char *name = 0); + BookmarkDialog(TQWidget *parent = 0, const char *name = 0); ~BookmarkDialog(); public slots: void slotUser1(); void slotUser2(); void slotOk(); - void SLOT_TextChanged(const QString& s); + void SLOT_TextChanged(const TQString& s); void SLOT_StateChanged(); void SLOT_SelectionChanged(); private: diff --git a/src/customconnectdialog.cpp b/src/customconnectdialog.cpp index a445780..b27a8cf 100755 --- a/src/customconnectdialog.cpp +++ b/src/customconnectdialog.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> -#include <qstring.h> -#include <qlineedit.h> -#include <qradiobutton.h> -#include <qcombobox.h> -#include <qcheckbox.h> +#include <ntqstring.h> +#include <ntqlineedit.h> +#include <ntqradiobutton.h> +#include <ntqcombobox.h> +#include <ntqcheckbox.h> #include "kbsiteinfo.h" #include "customconnectdialog.h" -CustomConnectDialog::CustomConnectDialog(QWidget *parent, const char *name ) : KDialogBase(parent, name, +CustomConnectDialog::CustomConnectDialog(TQWidget *parent, const char *name ) : KDialogBase(parent, name, true, i18n( "Custom Site" ), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help, KDialogBase::Ok, true) { setHelp("ftphelp"); diff --git a/src/customconnectdialog.h b/src/customconnectdialog.h index 8468d6b..beff1e7 100755 --- a/src/customconnectdialog.h +++ b/src/customconnectdialog.h @@ -32,15 +32,15 @@ class CustomConnectDialog : public KDialogBase { Q_OBJECT public: - CustomConnectDialog(QWidget *parent=0, const char *name=0); + CustomConnectDialog(TQWidget *parent=0, const char *name=0); ~CustomConnectDialog(); KbSiteInfo *mp_site; public slots: void slotOk(); void SLOT_AnonymousToggled(bool on); private: - QString m_user; - QString m_pass; + TQString m_user; + TQString m_pass; KasablancaCustomConnectDialog *mp_dialog; }; diff --git a/src/eventhandler.cpp b/src/eventhandler.cpp index 7a848c4..242c05f 100644 --- a/src/eventhandler.cpp +++ b/src/eventhandler.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <qevent.h> +#include <ntqevent.h> #include "ftpthread.h" #include "eventhandler.h" @@ -32,8 +32,8 @@ are composed from the type of the arrived event and in certain cases an out_vari /* constructor */ -EventHandler::EventHandler(QObject *parent, const char *name) - : QObject(parent, name) +EventHandler::EventHandler(TQObject *parent, const char *name) + : TQObject(parent, name) { installEventFilter(this); @@ -56,7 +56,7 @@ void EventHandler::SetFtpThread(FtpThread* thread) /* the eventfilter method. when a certain event arrives a signal is emitted, composed from the events type and a possible out_ variable from the ftp thread object. */ -bool EventHandler::eventFilter(QObject*, QEvent *e ) +bool EventHandler::eventFilter(TQObject*, TQEvent *e ) { EventType type = (EventType)(e->type()); @@ -67,21 +67,21 @@ bool EventHandler::eventFilter(QObject*, QEvent *e ) } else if (type == outlog) { - QString *line = static_cast<QString*>(static_cast<QCustomEvent*>(e)->data()); + TQString *line = static_cast<TQString*>(static_cast<TQCustomEvent*>(e)->data()); emit ftp_log(*line, true); delete line; return TRUE; } else if (type == inlog) { - QString *line = static_cast<QString*>(static_cast<QCustomEvent*>(e)->data()); + TQString *line = static_cast<TQString*>(static_cast<TQCustomEvent*>(e)->data()); emit ftp_log(*line, false); delete line; return TRUE; } else if (type == xfered) { - xferpair* xp = static_cast<xferpair*>(static_cast<QCustomEvent*>(e)->data()); + xferpair* xp = static_cast<xferpair*>(static_cast<TQCustomEvent*>(e)->data()); emit ftp_xfered(xp->first, xp->second); delete xp; return TRUE; @@ -148,7 +148,7 @@ bool EventHandler::eventFilter(QObject*, QEvent *e ) } else if (type == pwd_success) { - QString *path = static_cast<QString*>(static_cast<QCustomEvent*>(e)->data()); + TQString *path = static_cast<TQString*>(static_cast<TQCustomEvent*>(e)->data()); emit ftp_pwd(true, *path); delete path; return TRUE; @@ -180,19 +180,19 @@ bool EventHandler::eventFilter(QObject*, QEvent *e ) } else if (type == dir_success) { - contentpair *content = static_cast<contentpair*>(static_cast<QCustomEvent*>(e)->data()); + contentpair *content = static_cast<contentpair*>(static_cast<TQCustomEvent*>(e)->data()); emit ftp_dir(true, content->first, content->second); return TRUE; } else if (type == dir_failure) { - contentpair *content = static_cast<contentpair*>(static_cast<QCustomEvent*>(e)->data()); + contentpair *content = static_cast<contentpair*>(static_cast<TQCustomEvent*>(e)->data()); emit ftp_dir(false, content->first, content->second); return TRUE; } else if (type == scandir_success) { - KbDirInfo *dir = static_cast<KbDirInfo*>(static_cast<QCustomEvent*>(e)->data()); + KbDirInfo *dir = static_cast<KbDirInfo*>(static_cast<TQCustomEvent*>(e)->data()); emit ftp_scandir(true, dir); return TRUE; } diff --git a/src/eventhandler.h b/src/eventhandler.h index 36ccf46..f4dd2fc 100644 --- a/src/eventhandler.h +++ b/src/eventhandler.h @@ -20,8 +20,8 @@ #ifndef EVENTHANDLER_H #define EVENTHANDLER_H -#include <qobject.h> -#include <qvaluelist.h> +#include <ntqobject.h> +#include <ntqvaluelist.h> #include <list> #include "kbfileinfo.h" @@ -37,11 +37,11 @@ class FtpThread; typedef list<KbFileInfo*> filist; typedef pair<filist, filist> contentpair; -class EventHandler : public QObject +class EventHandler : public TQObject { Q_OBJECT public: - EventHandler(QObject *parent = 0, const char *name = 0); + EventHandler(TQObject *parent = 0, const char *name = 0); ~EventHandler(); void SetFtpThread(FtpThread* thread); public: @@ -93,19 +93,19 @@ public: transfer_failure }; private: - bool eventFilter(QObject* o, QEvent *e); + bool eventFilter(TQObject* o, TQEvent *e); private: FtpThread* mp_thread; signals: - void ftp_error(QString error); - void ftp_log(QString log, bool out); + void ftp_error(TQString error); + void ftp_log(TQString log, bool out); void ftp_xfered(off64_t xfered, bool encrypted); void ftp_misc(bool success); void ftp_finished(); void ftp_connect(bool success); void ftp_login(bool success); void ftp_quit(bool success); - void ftp_pwd(bool success, QString path); + void ftp_pwd(bool success, TQString path); void ftp_chdir(bool success); void ftp_dir(bool success, list<KbFileInfo*> dirlist, list<KbFileInfo*> filelist); void ftp_scandir(bool success, KbDirInfo* dir); diff --git a/src/fileexistsdialog.cpp b/src/fileexistsdialog.cpp index 284f9b4..c1c6824 100644 --- a/src/fileexistsdialog.cpp +++ b/src/fileexistsdialog.cpp @@ -17,7 +17,7 @@ #include "fileexistsdialog.h" -FileExistsDialog::FileExistsDialog(QWidget *parent, const char *name ) : KasablancaFileExistsDialog(parent,name) +FileExistsDialog::FileExistsDialog(TQWidget *parent, const char *name ) : KasablancaFileExistsDialog(parent,name) { } FileExistsDialog::~FileExistsDialog(){ diff --git a/src/fileexistsdialog.h b/src/fileexistsdialog.h index 4c938ec..9da932d 100644 --- a/src/fileexistsdialog.h +++ b/src/fileexistsdialog.h @@ -18,7 +18,7 @@ #ifndef FILEEXISTSDIALOG_H #define FILEEXISTSDIALOG_H -#include <qwidget.h> +#include <ntqwidget.h> #include "Q_fileexistsdialog.h" /** @@ -28,7 +28,7 @@ class FileExistsDialog : public KasablancaFileExistsDialog { Q_OBJECT public: - FileExistsDialog(QWidget *parent=0, const char *name=0); + FileExistsDialog(TQWidget *parent=0, const char *name=0); ~FileExistsDialog(); enum retval { diff --git a/src/ftpsession.cpp b/src/ftpsession.cpp index 2287d7e..f77320d 100644 --- a/src/ftpsession.cpp +++ b/src/ftpsession.cpp @@ -15,27 +15,27 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kmessagebox.h> #include <kprocess.h> #include <kiconloader.h> #include <kinputdialog.h> #include <klineedit.h> -#include <qtextedit.h> -#include <qtoolbutton.h> -#include <qpopupmenu.h> -#include <qwidget.h> -#include <qlistview.h> -#include <qlabel.h> -#include <qpixmap.h> -#include <qheader.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qpushbutton.h> +#include <ntqtextedit.h> +#include <ntqtoolbutton.h> +#include <ntqpopupmenu.h> +#include <ntqwidget.h> +#include <ntqlistview.h> +#include <ntqlabel.h> +#include <ntqpixmap.h> +#include <ntqheader.h> +#include <ntqstringlist.h> +#include <ntqevent.h> +#include <ntqfile.h> +#include <ntqtextstream.h> +#include <ntqpushbutton.h> #include "fileexistsdialog.h" #include "customconnectdialog.h" @@ -51,8 +51,8 @@ #include "kbconfig.h" #include "ftplib.h" -FtpSession::FtpSession(QObject *parent, const char *name) - : QObject(parent, name) +FtpSession::FtpSession(TQObject *parent, const char *name) + : TQObject(parent, name) { installEventFilter(this); @@ -75,10 +75,10 @@ FtpSession::FtpSession(QObject *parent, const char *name) mp_eventhandler->SetFtpThread(mp_ftpthread); mp_ftpthread->SetEventReceiver(mp_eventhandler); - m_iconencrypted = KGlobal::iconLoader()->loadIconSet("encrypted",KIcon::Small).pixmap(QIconSet::Small,QIconSet::Normal); - m_iconunencrypted = KGlobal::iconLoader()->loadIconSet("encrypted",KIcon::Small).pixmap(QIconSet::Small,QIconSet::Disabled); + m_iconencrypted = TDEGlobal::iconLoader()->loadIconSet("encrypted",TDEIcon::Small).pixmap(TQIconSet::Small,TQIconSet::Normal); + m_iconunencrypted = TDEGlobal::iconLoader()->loadIconSet("encrypted",TDEIcon::Small).pixmap(TQIconSet::Small,TQIconSet::Disabled); - connect(mp_eventhandler, SIGNAL(ftp_log(QString, bool)), SLOT(SLOT_Log(QString, bool))); + connect(mp_eventhandler, SIGNAL(ftp_log(TQString, bool)), SLOT(SLOT_Log(TQString, bool))); connect(mp_eventhandler, SIGNAL(ftp_connect(bool)), SLOT(SLOT_Connect(bool))); connect(mp_eventhandler, SIGNAL(ftp_login(bool)), SLOT(SLOT_Login(bool))); connect(mp_eventhandler, SIGNAL(ftp_xfered(off64_t, bool)), SLOT(SLOT_Xfered(off64_t, bool))); @@ -93,7 +93,7 @@ FtpSession::FtpSession(QObject *parent, const char *name) connect(mp_eventhandler, SIGNAL(ftp_misc(bool)), SLOT(SLOT_Misc(bool))); connect(mp_eventhandler, SIGNAL(ftp_mkdir(bool)), SLOT(SLOT_Misc(bool))); connect(mp_eventhandler, SIGNAL(ftp_rename(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_pwd(bool, QString)), SLOT(SLOT_Pwd(bool, QString))); + connect(mp_eventhandler, SIGNAL(ftp_pwd(bool, TQString)), SLOT(SLOT_Pwd(bool, TQString))); connect(mp_eventhandler, SIGNAL(ftp_dir(bool, list<KbFileInfo*>, list<KbFileInfo*>)), SLOT(SLOT_Dir(bool, list<KbFileInfo*>, list<KbFileInfo*>))); connect(mp_eventhandler, SIGNAL(ftp_encryptdata(bool)), SLOT(SLOT_EncryptData(bool))); @@ -110,20 +110,20 @@ FtpSession::~FtpSession() void FtpSession::SetCmdLine(KLineEdit* cmdline) { KCompletion *comp = cmdline->completionObject(); - connect(cmdline, SIGNAL(returnPressed(const QString&)), comp, SLOT(addItem(const QString&))); - cmdline->setCompletionMode(KGlobalSettings::CompletionAuto); + connect(cmdline, SIGNAL(returnPressed(const TQString&)), comp, SLOT(addItem(const TQString&))); + cmdline->setCompletionMode(TDEGlobalSettings::CompletionAuto); mp_cmdline = cmdline; } void FtpSession::SetCwdLine(KLineEdit* cwdline) { KCompletion *comp = cwdline->completionObject(); - connect(cwdline, SIGNAL(returnPressed(const QString&)), comp, SLOT(addItem(const QString&))); - cwdline->setCompletionMode(KGlobalSettings::CompletionAuto); + connect(cwdline, SIGNAL(returnPressed(const TQString&)), comp, SLOT(addItem(const TQString&))); + cwdline->setCompletionMode(TDEGlobalSettings::CompletionAuto); mp_cwdline = cwdline; } -void FtpSession::SLOT_Log(QString log, bool out) +void FtpSession::SLOT_Log(TQString log, bool out) { if (out) m_loglist.push_back(make_pair(log, true)); else m_loglist.push_back(make_pair(log, false)); @@ -152,13 +152,13 @@ void FtpSession::SLOT_ActionMenu(int i) { if (Occupied()) { - qWarning("ERROR: triggered action while occupied"); + tqWarning("ERROR: triggered action while occupied"); return; } if (i == Kasablanca::Mkdir) { bool b; - QString name = KInputDialog::getText(i18n("Enter directory name"), i18n("Enter directory name:"), "", &b); + TQString name = KInputDialog::getText(i18n("Enter directory name"), i18n("Enter directory name:"), "", &b); if (!b) return; if (Connected()) { @@ -178,7 +178,7 @@ void FtpSession::SLOT_ActionMenu(int i) if (Connected()) { Occupy(); - QListViewItemIterator it(mp_browser); + TQListViewItemIterator it(mp_browser); while (it.current()) { if (it.current()->isSelected()) @@ -198,7 +198,7 @@ void FtpSession::SLOT_ActionMenu(int i) } else { - QListViewItemIterator it(mp_browser); + TQListViewItemIterator it(mp_browser); while (it.current()) { if (it.current()->isSelected()) @@ -209,14 +209,14 @@ void FtpSession::SLOT_ActionMenu(int i) { if (KbConfig::deleteMovesIntoTrashIsEnabled()) { - system(QString("mv " + m_localworkingdir.absPath() + "/" + item->File() + - + " " + KGlobalSettings::trashPath()).latin1()); + system(TQString("mv " + m_localworkingdir.absPath() + "/" + item->File() + + + " " + TDEGlobalSettings::trashPath()).latin1()); } else { if (item->rtti() == KbItem::dir) { - QString dir = "rm -rf " + m_localworkingdir.absFilePath(item->File()); + TQString dir = "rm -rf " + m_localworkingdir.absFilePath(item->File()); system(dir.latin1()); } //RmdirLocal(item->File()); @@ -233,14 +233,14 @@ void FtpSession::SLOT_ActionMenu(int i) { if (Connected()) { - QListViewItemIterator it(mp_browser); + TQListViewItemIterator it(mp_browser); while (it.current()) { if (it.current()->isSelected()) { bool b; KbItem* item = static_cast<KbItem*>(it.current()); - QString name = KInputDialog::getText(i18n("Enter new name"), i18n("Enter new name:"), item->File(), &b); + TQString name = KInputDialog::getText(i18n("Enter new name"), i18n("Enter new name:"), item->File(), &b); if (b) { Occupy(); @@ -255,14 +255,14 @@ void FtpSession::SLOT_ActionMenu(int i) } else { - QListViewItemIterator it(mp_browser); + TQListViewItemIterator it(mp_browser); while (it.current()) { if (it.current()->isSelected()) { bool b; KbItem* item = static_cast<KbItem*>(it.current()); - QString name = KInputDialog::getText(i18n("Enter new name"), i18n("Enter new name:"), item->File(), &b); + TQString name = KInputDialog::getText(i18n("Enter new name"), i18n("Enter new name:"), item->File(), &b); if (b) m_localworkingdir.rename(item->text(0), name); else return; } @@ -285,7 +285,7 @@ void FtpSession::SLOT_ActionMenu(int i) { KbSiteInfo newsite = *mp_siteinfo; bool b; - QString name = KInputDialog::getText(i18n("Enter bookmark name"), i18n("Enter bookmark name:"), "", &b); + TQString name = KInputDialog::getText(i18n("Enter bookmark name"), i18n("Enter bookmark name:"), "", &b); if (!b) return; if (name == "") name = "New site"; newsite.SetName(name); @@ -303,7 +303,7 @@ void FtpSession::SLOT_ConnectMenu(int i) CustomConnectDialog dlg; mp_siteinfo->Clear(); dlg.mp_site = mp_siteinfo; - if (dlg.exec() == QDialog::Rejected) return; + if (dlg.exec() == TQDialog::Rejected) return; else if (!mp_siteinfo->IsLegit()) { KMessageBox::error(0,i18n("That site information is not legit.")); @@ -315,7 +315,7 @@ void FtpSession::SLOT_ConnectMenu(int i) list<KbSiteInfo>::iterator it = static_cast<Kasablanca*>(parent())->m_bookmarks.begin(); for (int x = 0; x < i - 1; x++) it++; mp_siteinfo = &(*it); - qWarning("INFO: connecting to bookmark entry named: %s", mp_siteinfo->GetName().latin1()); + tqWarning("INFO: connecting to bookmark entry named: %s", mp_siteinfo->GetName().latin1()); } Connect(); Occupy(); @@ -327,24 +327,24 @@ void FtpSession::SLOT_ConnectMenu(int i) if (mp_siteinfo->GetCorrectPasv()) mp_ftpthread->Ftp()->SetCorrectPasv(true); else mp_ftpthread->Ftp()->SetCorrectPasv(false); mp_ftpthread->Login(mp_siteinfo->GetUser(), mp_siteinfo->GetPass()); - if (QString(mp_siteinfo->GetDefaultDirectory()) != "") mp_ftpthread->Chdir(mp_siteinfo->GetDefaultDirectory()); + if (TQString(mp_siteinfo->GetDefaultDirectory()) != "") mp_ftpthread->Chdir(mp_siteinfo->GetDefaultDirectory()); RefreshBrowser(); mp_ftpthread->start(); } void FtpSession::SLOT_Finish() { - while (!mp_ftpthread->wait(KB_THREAD_TIMEOUT)) qWarning("WARNING: thread timeout, should *not* happen."); + while (!mp_ftpthread->wait(KB_THREAD_TIMEOUT)) tqWarning("WARNING: thread timeout, should *not* happen."); if (mp_currenttransfer) Transfer(mp_currenttransfer); else Free(); } -void FtpSession::SLOT_ItemClicked(QListViewItem * item) +void FtpSession::SLOT_ItemClicked(TQListViewItem * item) { if (Occupied()) { - qWarning("ERROR: item clicked while occupied"); + tqWarning("ERROR: item clicked while occupied"); return; } if (item->rtti() == KbItem::file) return; @@ -361,7 +361,7 @@ void FtpSession::SLOT_ItemClicked(QListViewItem * item) else UpdateLocal(item->text(0)); } -void FtpSession::SLOT_ItemRClicked(QListViewItem *, const QPoint & point, int) +void FtpSession::SLOT_ItemRClicked(TQListViewItem *, const TQPoint & point, int) { mp_rclickmenu->exec(point); } @@ -370,7 +370,7 @@ void FtpSession::SLOT_CmdLine() { if (Occupied()) { - qWarning("ERROR: entered command while occupied"); + tqWarning("ERROR: entered command while occupied"); return; } else if (Connected()) @@ -382,10 +382,10 @@ void FtpSession::SLOT_CmdLine() } else { - KProcess* p = new KProcess(); + TDEProcess* p = new TDEProcess(); p->setWorkingDirectory(m_localworkingdir.absPath()); - *p << QStringList::split(" ", mp_cmdline->text()); - connect(p, SIGNAL(processExited(KProcess*)), SLOT(SLOT_LocalProcessExited(KProcess*))); + *p << TQStringList::split(" ", mp_cmdline->text()); + connect(p, SIGNAL(processExited(TDEProcess*)), SLOT(SLOT_LocalProcessExited(TDEProcess*))); if (p->start() == TRUE) mp_cmdline->setText(""); } } @@ -425,10 +425,10 @@ void FtpSession::SLOT_ConnectButton() /* when disconnected show connect menu */ - else if (!Connected()) mp_bookmarksmenu->exec(mp_connectbutton->mapToGlobal(QPoint(0,0))); + else if (!Connected()) mp_bookmarksmenu->exec(mp_connectbutton->mapToGlobal(TQPoint(0,0))); } -void FtpSession::SetColors(QColor local, QColor success, QColor failure, QColor background) +void FtpSession::SetColors(TQColor local, TQColor success, TQColor failure, TQColor background) { m_colorlocal = local; m_colorsuccess = success; @@ -436,7 +436,7 @@ void FtpSession::SetColors(QColor local, QColor success, QColor failure, QColor mp_logwindow->setPaletteBackgroundColor(background); } -void FtpSession::SetFont(QFont font) +void FtpSession::SetFont(TQFont font) { mp_logwindow->setFont(font); } @@ -455,7 +455,7 @@ void FtpSession::SLOT_CwdLine() { if (Occupied()) { - qWarning("ERROR: entered cwd while occupied"); + tqWarning("ERROR: entered cwd while occupied"); return; } if (Connected()) @@ -474,7 +474,7 @@ void FtpSession::SLOT_RefreshButton() { if (Occupied()) { - qWarning("ERROR: refresh button pressed while occupied"); + tqWarning("ERROR: refresh button pressed while occupied"); return; } if (Connected()) @@ -490,10 +490,10 @@ void FtpSession::QueueItems() { KbDirInfo *dir = new KbDirInfo(WorkingDir()); - QListViewItemIterator iit(mp_browser->lastItem());//, QListViewItemIterator::Selected); + TQListViewItemIterator iit(mp_browser->lastItem());//, TQListViewItemIterator::Selected); while (iit.current()) { - QListViewItem *item = iit.current(); + TQListViewItem *item = iit.current(); if (item->isSelected()) { if (item->rtti() == KbItem::dir) dir->AddDirectory( KbFileInfo(static_cast<KbFile*>(item), "/")); @@ -532,7 +532,7 @@ void FtpSession::SLOT_TransferButton() { if (Occupied()) { - qWarning("ERROR: transfer button pressed while occupied"); + tqWarning("ERROR: transfer button pressed while occupied"); return; } m_startqueue = true; @@ -553,7 +553,7 @@ void FtpSession::SLOT_Scandir(bool success, KbDirInfo* dir) emit gui_queueitems(dir, this, dst, m_startqueue); } - else qWarning("INFO: scandir error"); + else tqWarning("INFO: scandir error"); } void FtpSession::SLOT_Connect(bool success) @@ -603,9 +603,9 @@ void FtpSession::SLOT_Dir(bool success, list<KbFileInfo*> dirlist, list<KbFileIn PrintLog(success); if (success) { - while (QListViewItem* tmpviewitem = mp_browser->firstChild()) delete tmpviewitem; - QListViewItem* dirup = new QListViewItem(mp_browser, ".."); - dirup->setPixmap(0, KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + while (TQListViewItem* tmpviewitem = mp_browser->firstChild()) delete tmpviewitem; + TQListViewItem* dirup = new TQListViewItem(mp_browser, ".."); + dirup->setPixmap(0, TDEGlobal::iconLoader()->loadIcon("folder",TDEIcon::Small)); dirup->setSelectable(false); list<KbFileInfo*>::iterator end_dir = dirlist.end(); @@ -626,7 +626,7 @@ void FtpSession::SLOT_Dir(bool success, list<KbFileInfo*> dirlist, list<KbFileIn } } -void FtpSession::SLOT_Pwd(bool success, QString pwd) +void FtpSession::SLOT_Pwd(bool success, TQString pwd) { PrintLog(success); if (success) @@ -637,7 +637,7 @@ void FtpSession::SLOT_Pwd(bool success, QString pwd) if(pwd.endsWith("/") && pwd.length() > 1) { - qWarning("INFO: stripping trailing /"); + tqWarning("INFO: stripping trailing /"); m_remoteworkingdir.truncate(pwd.length() - 1); } mp_cwdline->setText(pwd); @@ -647,7 +647,7 @@ void FtpSession::SLOT_Pwd(bool success, QString pwd) void FtpSession::SortItems() { - QListViewItem* x = mp_browser->firstChild(); + TQListViewItem* x = mp_browser->firstChild(); mp_browser->takeItem(x); mp_browser->setSorting(m_sortpref, m_sortascending); @@ -662,7 +662,7 @@ void FtpSession::PrintLog(bool) list<logentries>::iterator i; for (i = m_loglist.begin(); i != m_loglist.end(); i++) { - QString line = (*i).first; + TQString line = (*i).first; if ((*i).second == true) { @@ -684,7 +684,7 @@ void FtpSession::Connect() { mp_rclickmenu->setItemEnabled(Kasablanca::Bookmark, true); mp_bookmarksmenu->setEnabled(false); - mp_connectbutton->setIconSet(KGlobal::iconLoader()->loadIconSet("connect_established",KIcon::Toolbar)); + mp_connectbutton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("connect_established",TDEIcon::Toolbar)); mp_statusline->setText(i18n("Occupied")); m_connected = true; emit gui_clearqueue(this); @@ -695,7 +695,7 @@ void FtpSession::Disconnect() UpdateLocal(); mp_rclickmenu->setItemEnabled(Kasablanca::Bookmark, false); mp_bookmarksmenu->setEnabled(true); - mp_connectbutton->setIconSet(KGlobal::iconLoader()->loadIconSet("connect_no",KIcon::Toolbar)); + mp_connectbutton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("connect_no",TDEIcon::Toolbar)); mp_statusline->setText(i18n("Disconnected")); m_connected = false; emit gui_clearqueue(this); @@ -703,7 +703,7 @@ void FtpSession::Disconnect() void FtpSession::Occupy() { - qWarning("INFO: %s gui blocked", name()); + tqWarning("INFO: %s gui blocked", name()); mp_rclickmenu->setEnabled(false); mp_browser->setEnabled(false); @@ -718,7 +718,7 @@ void FtpSession::Occupy() void FtpSession::Free() { - qWarning("INFO: %s gui freed", name()); + tqWarning("INFO: %s gui freed", name()); mp_rclickmenu->setEnabled(true); mp_browser->setEnabled(true); @@ -740,26 +740,26 @@ void FtpSession::RefreshBrowser() mp_ftpthread->Dir(true); } -void FtpSession::UpdateLocal(QString cwd) +void FtpSession::UpdateLocal(TQString cwd) { - QFileInfoList filelist, dirlist; + TQFileInfoList filelist, dirlist; if (cwd != "") if (!m_localworkingdir.cd(cwd)) return; if (!m_localworkingdir.exists()) return; mp_browser->sortColumn(); - m_localworkingdir.setSorting(QDir::Name); + m_localworkingdir.setSorting(TQDir::Name); - while (QListViewItem* tmpviewitem = mp_browser->firstChild()) delete tmpviewitem; + while (TQListViewItem* tmpviewitem = mp_browser->firstChild()) delete tmpviewitem; - QListViewItem* dirup = new QListViewItem(mp_browser, ".."); - dirup->setPixmap(0, KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + TQListViewItem* dirup = new TQListViewItem(mp_browser, ".."); + dirup->setPixmap(0, TDEGlobal::iconLoader()->loadIcon("folder",TDEIcon::Small)); dirup->setSelectable(false); - m_localworkingdir.setFilter(QDir::Dirs | QDir::Hidden); + m_localworkingdir.setFilter(TQDir::Dirs | TQDir::Hidden); dirlist = *m_localworkingdir.entryInfoList(); - QFileInfoListIterator dit(dirlist); + TQFileInfoListIterator dit(dirlist); dit.atFirst(); while (dit.current()) { @@ -767,10 +767,10 @@ void FtpSession::UpdateLocal(QString cwd) ++dit; } - m_localworkingdir.setFilter(QDir::Files | QDir::Hidden); + m_localworkingdir.setFilter(TQDir::Files | TQDir::Hidden); filelist = *m_localworkingdir.entryInfoList(); - QFileInfoListIterator fit(filelist); + TQFileInfoListIterator fit(filelist); fit.atFirst(); while (fit.current()) { @@ -784,22 +784,22 @@ void FtpSession::UpdateLocal(QString cwd) if (KbConfig::hideHiddenFilesIsEnabled()) FilterHiddenFiles(true); } -/*bool FtpSession::RmdirLocal(QString dir) +/*bool FtpSession::RmdirLocal(TQString dir) { - QStringList filelist, dirlist; - QString olddir; + TQStringList filelist, dirlist; + TQString olddir; olddir = m_localworkingdir.path(); if (!m_localworkingdir.cd(dir)) return false; - filelist = m_localworkingdir.entryList("*", QDir::Files | QDir::Hidden); - for (QStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it) + filelist = m_localworkingdir.entryList("*", TQDir::Files | TQDir::Hidden); + for (TQStringList::Iterator it = filelist.begin(); it != filelist.end(); ++it) { if (!m_localworkingdir.remove(*it)) return false; } - dirlist = m_localworkingdir.entryList("*", QDir::Dirs | QDir::Hidden); - for (QStringList::Iterator it = dirlist.begin(); it != dirlist.end(); ++it) + dirlist = m_localworkingdir.entryList("*", TQDir::Dirs | TQDir::Hidden); + for (TQStringList::Iterator it = dirlist.begin(); it != dirlist.end(); ++it) { if ((*it != ".") && (*it != "..")) { @@ -813,40 +813,40 @@ void FtpSession::UpdateLocal(QString cwd) return true; }*/ -bool FtpSession::ScandirLocal(KbDirInfo *dir, QString path) +bool FtpSession::ScandirLocal(KbDirInfo *dir, TQString path) { - QFileInfoList filelist, dirlist; - QString olddir; + TQFileInfoList filelist, dirlist; + TQString olddir; - qWarning("dir: path: %s file: %s", dir->dirPath(true).latin1(), dir->fileName().latin1()); + tqWarning("dir: path: %s file: %s", dir->dirPath(true).latin1(), dir->fileName().latin1()); olddir = WorkingDir(); if (!m_localworkingdir.cd(dir->fileName())) return false; - m_localworkingdir.setFilter(QDir::Files | QDir::Hidden); + m_localworkingdir.setFilter(TQDir::Files | TQDir::Hidden); filelist = *m_localworkingdir.entryInfoList(); - QFileInfoListIterator fit(filelist); + TQFileInfoListIterator fit(filelist); fit.atFirst(); while (fit.current()) { KbFileInfo *kfi = new KbFileInfo(*fit.current()); kfi->SetDirPath(path); dir->AddFile(kfi); - qWarning("file: path: %s file: %s", kfi->dirPath(true).latin1(), kfi->fileName().latin1()); + tqWarning("file: path: %s file: %s", kfi->dirPath(true).latin1(), kfi->fileName().latin1()); ++fit; } - m_localworkingdir.setFilter(QDir::Dirs | QDir::Hidden); + m_localworkingdir.setFilter(TQDir::Dirs | TQDir::Hidden); dirlist = *m_localworkingdir.entryInfoList(); list<KbFileInfo> kfilist; - QFileInfoListIterator dit(dirlist); + TQFileInfoListIterator dit(dirlist); dit.atFirst(); while (dit.current()) { - QFileInfo qfi = *dit.current(); + TQFileInfo qfi = *dit.current(); KbFileInfo kfi(qfi); kfi.SetDirPath(path); kfilist.push_back(kfi); @@ -866,17 +866,17 @@ bool FtpSession::ScandirLocal(KbDirInfo *dir, QString path) return true; } -QString FtpSession::WorkingDir() +TQString FtpSession::WorkingDir() { if (Connected()) return m_remoteworkingdir; else return m_localworkingdir.absPath(); } -bool FtpSession::CheckLocalDirectory(QString path) +bool FtpSession::CheckLocalDirectory(TQString path) { if (Connected()) { - qWarning("ERROR: CheckLocalDirectory on connected session called"); + tqWarning("ERROR: CheckLocalDirectory on connected session called"); return false; } @@ -890,11 +890,11 @@ bool FtpSession::CheckLocalDirectory(QString path) } } -bool FtpSession::MakeLocalDirectory(QString path) +bool FtpSession::MakeLocalDirectory(TQString path) { if (Connected()) { - qWarning("ERROR: MakeLocalDirectory on connected session called"); + tqWarning("ERROR: MakeLocalDirectory on connected session called"); return false; } @@ -904,28 +904,28 @@ bool FtpSession::MakeLocalDirectory(QString path) return result; } -void FtpSession::MakeDirectory(QString dir) +void FtpSession::MakeDirectory(TQString dir) { bool result = mp_ftpthread->Transfer_Mkdir(dir); if (result) mp_ftpthread->start(); - else qWarning("ERROR: thread error, thread was still busy."); + else tqWarning("ERROR: thread error, thread was still busy."); } bool FtpSession::CopyLocalFile(KbTransferItem* item) { - QTextStream srcstream; - QTextStream dststream; - QFile srcfile(item->SrcFileInfo()->filePath()); - QFile dstfile(item->DstFileInfo()->filePath()); + TQTextStream srcstream; + TQTextStream dststream; + TQFile srcfile(item->SrcFileInfo()->filePath()); + TQFile dstfile(item->DstFileInfo()->filePath()); if (!dstfile.open(IO_WriteOnly)) { - qWarning("ERROR: writing to local destination file not allowed"); + tqWarning("ERROR: writing to local destination file not allowed"); return false; } dststream.setDevice(&dstfile); if (!srcfile.open(IO_ReadOnly)) { - qWarning("ERROR: reading from local source file not allowed"); + tqWarning("ERROR: reading from local source file not allowed"); return false; } srcstream.setDevice(&srcfile); @@ -936,11 +936,11 @@ bool FtpSession::CopyLocalFile(KbTransferItem* item) return true; } -void FtpSession::ChangeDirectory(QString path) +void FtpSession::ChangeDirectory(TQString path) { bool result = mp_ftpthread->Transfer_Changedir(path, (mp_siteinfo->GetTls() > 1)); if (result) mp_ftpthread->start(); - else qWarning("ERROR: thread error, thread was still busy."); + else tqWarning("ERROR: thread error, thread was still busy."); } void FtpSession::SLOT_Transfer(bool success) @@ -952,7 +952,7 @@ void FtpSession::SLOT_Transfer(bool success) int FtpSession::CheckFile(KbTransferItem *item) { item->DstFileInfo()->SetSize(0); - QListViewItemIterator it(mp_browser); + TQListViewItemIterator it(mp_browser); while (it.current()) { @@ -960,7 +960,7 @@ int FtpSession::CheckFile(KbTransferItem *item) { FileExistsDialog dlg; KbItem* kbi; - QString newname; + TQString newname; bool b; int result; @@ -1070,7 +1070,7 @@ void FtpSession::Transfer(KbTransferItem *item) if (result == skip) { - qWarning("INFO: skipped transfer"); + tqWarning("INFO: skipped transfer"); item->IncrementStatus(); } else if (item->SrcSession()->Connected()) @@ -1108,7 +1108,7 @@ void FtpSession::FxpFile(KbTransferItem *item, filecheck fc) { bool result; int srctls, dsttls, alternativefxp; - QString localfile, remotefile; + TQString localfile, remotefile; off64_t offset; remotefile = item->SrcFileInfo()->fileName(); @@ -1124,14 +1124,14 @@ void FtpSession::FxpFile(KbTransferItem *item, filecheck fc) else result = mp_ftpthread->Transfer_Fxp(remotefile, localfile, dstftp, srctls, dsttls, 0, alternativefxp); if (result) mp_ftpthread->start(); - else qWarning("ERROR: thread error, thread was still busy."); + else tqWarning("ERROR: thread error, thread was still busy."); } void FtpSession::GetFile(KbTransferItem *item, filecheck fc) { bool result; int tls; - QString localfile, remotefile; + TQString localfile, remotefile; remotefile = item->SrcFileInfo()->fileName(); localfile = mp_currenttransfer->DstSession()->WorkingDir() + '/' + item->DstFileInfo()->fileName(); @@ -1141,14 +1141,14 @@ void FtpSession::GetFile(KbTransferItem *item, filecheck fc) else result = mp_ftpthread->Transfer_Get(remotefile, localfile, tls); if (result) mp_ftpthread->start(); - else qWarning("ERROR: thread error, thread was still busy."); + else tqWarning("ERROR: thread error, thread was still busy."); } void FtpSession::PutFile(KbTransferItem *item, filecheck fc) { bool result; int tls; - QString localfile, remotefile; + TQString localfile, remotefile; remotefile = item->SrcFileInfo()->fileName(); localfile = mp_currenttransfer->SrcSession()->WorkingDir() + '/' + item->DstFileInfo()->fileName(); @@ -1158,10 +1158,10 @@ void FtpSession::PutFile(KbTransferItem *item, filecheck fc) else result = mp_ftpthread->Transfer_Put(localfile, remotefile, tls); if (result) mp_ftpthread->start(); - else qWarning("ERROR: thread error, thread was still busy."); + else tqWarning("ERROR: thread error, thread was still busy."); } -void FtpSession::timerEvent(QTimerEvent*) +void FtpSession::timerEvent(TQTimerEvent*) { if (mp_currenttransfer) mp_currenttransfer->ShowProgress(static_cast<Kasablanca*>(parent())->statusTip()); } @@ -1174,7 +1174,7 @@ void FtpSession::EnableCmdLine(bool b) void FtpSession::FilterHiddenFiles(bool b) { - QListViewItemIterator it(mp_browser); + TQListViewItemIterator it(mp_browser); while (it.current()) { if ((it.current() != mp_browser->firstChild()) && (static_cast<KbItem*>(it.current())->File().startsWith("."))) diff --git a/src/ftpsession.h b/src/ftpsession.h index 37abcd8..ce4cf1b 100644 --- a/src/ftpsession.h +++ b/src/ftpsession.h @@ -13,11 +13,11 @@ #define FTPSESSION_H #include <kprocess.h> -#include <qstring.h> -#include <qdir.h> -#include <qpixmap.h> -#include <qobject.h> -#include <qcolor.h> +#include <ntqstring.h> +#include <ntqdir.h> +#include <ntqpixmap.h> +#include <ntqobject.h> +#include <ntqcolor.h> #include <list> #include "kbfileinfo.h" @@ -26,25 +26,25 @@ using namespace std; class FtpThread; class EventHandler; -class QMutex; -class QTextEdit; -class QToolButton; -class QListView; +class TQMutex; +class TQTextEdit; +class TQToolButton; +class TQListView; class KbSiteInfo; -class QPopupMenu; +class TQPopupMenu; class KLineEdit; -class QLabel; -class QPoint; +class TQLabel; +class TQPoint; class KbDirInfo; -class QHeader; +class TQHeader; class KbTransferItem; -typedef pair<QString, bool> logentries; +typedef pair<TQString, bool> logentries; /** @author Magnus Kulke */ -class FtpSession : public QObject +class FtpSession : public TQObject { Q_OBJECT public: @@ -56,17 +56,17 @@ public: resume }; public: - FtpSession(QObject *parent = 0, const char *name = 0); + FtpSession(TQObject *parent = 0, const char *name = 0); ~FtpSession(); - void SetLogWindow(QTextEdit* logwindow) { mp_logwindow = logwindow; }; - void SetRefreshButton(QToolButton* refreshbutton) { mp_refreshbutton = refreshbutton; }; - void SetConnectButton(QToolButton* connectbutton) { mp_connectbutton = connectbutton; }; - void SetTransferButton(QToolButton* transferbutton) { mp_transferbutton = transferbutton; } - void SetBrowser(QListView* browser) { mp_browser = browser; }; - void SetStatusLine(QLabel* statusline) { mp_statusline = statusline; }; - void SetEncryptionIcon(QLabel* encryptionicon) { mp_encryptionicon = encryptionicon; }; - void SetBookmarksMenu(QPopupMenu *bookmarksmenu) { mp_bookmarksmenu = bookmarksmenu; }; - void SetRclickMenu(QPopupMenu *rclickmenu) { mp_rclickmenu = rclickmenu; }; + void SetLogWindow(TQTextEdit* logwindow) { mp_logwindow = logwindow; }; + void SetRefreshButton(TQToolButton* refreshbutton) { mp_refreshbutton = refreshbutton; }; + void SetConnectButton(TQToolButton* connectbutton) { mp_connectbutton = connectbutton; }; + void SetTransferButton(TQToolButton* transferbutton) { mp_transferbutton = transferbutton; } + void SetBrowser(TQListView* browser) { mp_browser = browser; }; + void SetStatusLine(TQLabel* statusline) { mp_statusline = statusline; }; + void SetEncryptionIcon(TQLabel* encryptionicon) { mp_encryptionicon = encryptionicon; }; + void SetBookmarksMenu(TQPopupMenu *bookmarksmenu) { mp_bookmarksmenu = bookmarksmenu; }; + void SetRclickMenu(TQPopupMenu *rclickmenu) { mp_rclickmenu = rclickmenu; }; void SetSessionList(list<FtpSession*> *sessionlist) { mp_sessionlist = sessionlist; }; void SetCurrentTransfer(KbTransferItem* currenttransfer) { mp_currenttransfer = currenttransfer; }; bool Connected() { return m_connected; }; @@ -75,14 +75,14 @@ public: bool Occupied() { return m_occupied; }; void Occupy(); void Free(); - QString WorkingDir(); + TQString WorkingDir(); void Transfer(KbTransferItem *item); int CheckFile(KbTransferItem *item); void Abort(); FtpThread* Ftp() { return mp_ftpthread; }; KbSiteInfo* SiteInfo() { return mp_siteinfo; }; - void SetColors(QColor local, QColor success, QColor failure, QColor background); - void SetFont(QFont font); + void SetColors(TQColor local, TQColor success, TQColor failure, TQColor background); + void SetFont(TQFont font); void SetOnFileExistsDefault(filecheck onfileexistsdefault) {m_onfileexistsdefault = onfileexistsdefault; }; void EnableCmdLine(bool b); void FilterHiddenFiles(bool b); @@ -92,38 +92,38 @@ private: FtpThread *mp_ftpthread; EventHandler *mp_eventhandler; KbSiteInfo *mp_siteinfo; - QTextEdit *mp_logwindow; - QToolButton *mp_connectbutton, *mp_refreshbutton, *mp_transferbutton; + TQTextEdit *mp_logwindow; + TQToolButton *mp_connectbutton, *mp_refreshbutton, *mp_transferbutton; KLineEdit *mp_cwdline, *mp_cmdline; - QPopupMenu* mp_bookmarksmenu, *mp_rclickmenu; - QListView *mp_browser; - QLabel *mp_statusline, *mp_encryptionicon; - QString m_remoteworkingdir; - QDir m_localworkingdir; - QColor m_colorsuccess, m_colorfailure, m_colorlocal; - QFont m_logwindowfont; + TQPopupMenu* mp_bookmarksmenu, *mp_rclickmenu; + TQListView *mp_browser; + TQLabel *mp_statusline, *mp_encryptionicon; + TQString m_remoteworkingdir; + TQDir m_localworkingdir; + TQColor m_colorsuccess, m_colorfailure, m_colorlocal; + TQFont m_logwindowfont; int m_sortpref; bool m_connected, m_occupied, m_sortascending, m_startqueue; list<logentries> m_loglist; - QPixmap m_iconencrypted, m_iconunencrypted; - QHeader *mp_header; + TQPixmap m_iconencrypted, m_iconunencrypted; + TQHeader *mp_header; list<FtpSession*> *mp_sessionlist; KbTransferItem *mp_currenttransfer; filecheck m_onfileexistsdefault; bool m_encrypted; public slots: - void SLOT_Log(QString log, bool out); + void SLOT_Log(TQString log, bool out); void SLOT_Xfered(off64_t xfered, bool encrypted); void SLOT_ActionMenu(int i); void SLOT_ConnectMenu(int i); void SLOT_HeaderClicked(int section); - void SLOT_LocalProcessExited(KProcess* proc) { delete proc; }; - void SLOT_ItemClicked(QListViewItem*); - void SLOT_ItemRClicked(QListViewItem * item, const QPoint & point, int col); + void SLOT_LocalProcessExited(TDEProcess* proc) { delete proc; }; + void SLOT_ItemClicked(TQListViewItem*); + void SLOT_ItemRClicked(TQListViewItem * item, const TQPoint & point, int col); void SLOT_Connect(bool success); void SLOT_Login(bool success); - void SLOT_Pwd(bool success, QString pwd); + void SLOT_Pwd(bool success, TQString pwd); void SLOT_Misc(bool success); void SLOT_AuthTls(bool success); void SLOT_EncryptData(bool success); @@ -142,23 +142,23 @@ private: void PrintLog(bool success); void QueueItems(); void RefreshBrowser(); - void UpdateLocal(QString cwd = ""); - //bool RmdirLocal(QString dir); + void UpdateLocal(TQString cwd = ""); + //bool RmdirLocal(TQString dir); void GetFile(KbTransferItem *item, filecheck fc); void PutFile(KbTransferItem *item, filecheck fc); void FxpFile(KbTransferItem *item, filecheck fc); - void ChangeDirectory(QString path); - bool CheckLocalDirectory(QString path); - bool MakeLocalDirectory(QString path); + void ChangeDirectory(TQString path); + bool CheckLocalDirectory(TQString path); + bool MakeLocalDirectory(TQString path); bool CopyLocalFile(KbTransferItem* item); - bool ScandirLocal(KbDirInfo *dir, QString path); + bool ScandirLocal(KbDirInfo *dir, TQString path); void SortItems(); - void MakeDirectory(QString dir); - void timerEvent(QTimerEvent*); + void MakeDirectory(TQString dir); + void timerEvent(TQTimerEvent*); signals: void gui_update(); void gui_queueitems(KbDirInfo* dir, FtpSession* src, FtpSession* dst, bool startqueue); - void gui_succeedtransfer(QListViewItem* item); + void gui_succeedtransfer(TQListViewItem* item); void gui_clearqueue(FtpSession* session); }; diff --git a/src/ftpthread.cpp b/src/ftpthread.cpp index 842fecc..dda0463 100644 --- a/src/ftpthread.cpp +++ b/src/ftpthread.cpp @@ -25,9 +25,9 @@ #include <kstandarddirs.h> -#include <qapplication.h> -#include <qevent.h> -#include <qdir.h> +#include <ntqapplication.h> +#include <ntqevent.h> +#include <ntqdir.h> #include <iostream> #include <list> @@ -52,7 +52,7 @@ there is a value to be returned, it's named out_. */ -FtpThread::FtpThread() : QThread() +FtpThread::FtpThread() : TQThread() { mp_eventreceiver = NULL; mp_ftp = new ftplib(); @@ -106,27 +106,27 @@ void FtpThread::CallbackLog(char *log, void *arg, bool out) if (out) { int pos; - QString buffer = ftp->m_linebuffer + log; + TQString buffer = ftp->m_linebuffer + log; while ((pos = buffer.find('\n')) != -1) { - ftp->Event(EventHandler::outlog, new QString(buffer.left(pos + 1))); + ftp->Event(EventHandler::outlog, new TQString(buffer.left(pos + 1))); buffer.remove(0, pos + 1); } ftp->m_linebuffer = buffer; } - else ftp->Event(EventHandler::inlog, new QString(log)); + else ftp->Event(EventHandler::inlog, new TQString(log)); } /* set the receiver for the events the thread posts when a certain ftp operation is done */ -void FtpThread::SetEventReceiver(QObject* eventreceiver) +void FtpThread::SetEventReceiver(TQObject* eventreceiver) { mp_eventreceiver = eventreceiver; } /* connect to host */ -bool FtpThread::Connect(QString host) +bool FtpThread::Connect(TQString host) { InitInternals(); @@ -141,7 +141,7 @@ bool FtpThread::Connect(QString host) /* login with user and pass */ -bool FtpThread::Login(QString user, QString pass) +bool FtpThread::Login(TQString user, TQString pass) { if (running()) return false; else @@ -167,7 +167,7 @@ bool FtpThread::Quit() /* get file */ -bool FtpThread::Transfer_Get(QString src, QString dst, int tls, off64_t resume) +bool FtpThread::Transfer_Get(TQString src, TQString dst, int tls, off64_t resume) { if (running()) return false; else @@ -183,7 +183,7 @@ bool FtpThread::Transfer_Get(QString src, QString dst, int tls, off64_t resume) /* fxp file */ -bool FtpThread::Transfer_Fxp(QString src, QString dst, FtpThread *dstftp, int srctls, int dsttls, off64_t resume, int alt) +bool FtpThread::Transfer_Fxp(TQString src, TQString dst, FtpThread *dstftp, int srctls, int dsttls, off64_t resume, int alt) { if (running()) return false; else @@ -202,7 +202,7 @@ bool FtpThread::Transfer_Fxp(QString src, QString dst, FtpThread *dstftp, int sr /* put file */ -bool FtpThread::Transfer_Put(QString src, QString dst, int tls, off64_t resume) +bool FtpThread::Transfer_Put(TQString src, TQString dst, int tls, off64_t resume) { if (running()) return false; else @@ -218,7 +218,7 @@ bool FtpThread::Transfer_Put(QString src, QString dst, int tls, off64_t resume) /* transfer mkdir */ -bool FtpThread::Transfer_Mkdir(QString dir) +bool FtpThread::Transfer_Mkdir(TQString dir) { if (running()) return false; else @@ -231,7 +231,7 @@ bool FtpThread::Transfer_Mkdir(QString dir) /* rename file */ -bool FtpThread::Rename(QString src, QString dst) +bool FtpThread::Rename(TQString src, TQString dst) { if (running()) return false; else @@ -284,7 +284,7 @@ bool FtpThread::Pwd() /* change working dir to the given path */ -bool FtpThread::Chdir(QString path) +bool FtpThread::Chdir(TQString path) { if (running()) return false; else @@ -297,7 +297,7 @@ bool FtpThread::Chdir(QString path) /* change working dir to the given path, used by transfers */ -bool FtpThread::Transfer_Changedir(QString dir, int tls) +bool FtpThread::Transfer_Changedir(TQString dir, int tls) { if (running()) return false; else @@ -311,7 +311,7 @@ bool FtpThread::Transfer_Changedir(QString dir, int tls) /* creates a directory */ -bool FtpThread::Mkdir(QString path) +bool FtpThread::Mkdir(TQString path) { if (running()) return false; else @@ -361,7 +361,7 @@ bool FtpThread::Authtls() /* delete a file */ -bool FtpThread::Rm(QString name) +bool FtpThread::Rm(TQString name) { wait(KB_THREAD_TIMEOUT); if (running()) return false; @@ -375,7 +375,7 @@ bool FtpThread::Rm(QString name) /* delete a directory */ -bool FtpThread::Rmdir(QString name) +bool FtpThread::Rmdir(TQString name) { if (running()) return false; else @@ -388,7 +388,7 @@ bool FtpThread::Rmdir(QString name) /* issue raw command */ -bool FtpThread::Raw(QString cmd) +bool FtpThread::Raw(TQString cmd) { if (running()) return false; else @@ -416,14 +416,14 @@ bool FtpThread::Scandir(KbDirInfo* dir) void FtpThread::Connect_thread() { int result; - QString host = m_stringlist.front(); + TQString host = m_stringlist.front(); m_stringlist.pop_front(); result = mp_ftp->Connect(host.latin1()); //unsigned long int xxx = mp_ftp->mp_netbuf->ipappr; - //qWarning("INFO %lu.%lu.%lu.%lu", xxx & 0xff, (xxx >> 8) & 0xff, (xxx >> 16) & 0xff, (xxx >> 24) & 0xff); - //qWarning("INFO: ip:%lu", mp_ftp->mp_netbuf->ipappr); + //tqWarning("INFO %lu.%lu.%lu.%lu", xxx & 0xff, (xxx >> 8) & 0xff, (xxx >> 16) & 0xff, (xxx >> 24) & 0xff); + //tqWarning("INFO: ip:%lu", mp_ftp->mp_netbuf->ipappr); if (result) Event(EventHandler::connect_success); else @@ -450,9 +450,9 @@ void FtpThread::Authtls_thread() void FtpThread::Login_thread() { int result; - QString user = m_stringlist.front(); + TQString user = m_stringlist.front(); m_stringlist.pop_front(); - QString pass = m_stringlist.front(); + TQString pass = m_stringlist.front(); m_stringlist.pop_front(); result = mp_ftp->Login(user.latin1(), pass.latin1()); @@ -506,11 +506,11 @@ void FtpThread::Transfer_Changedir_thread() { int result; char buffer[1024]; - QString dirname; + TQString dirname; - dirname = locateLocal("appdata", QString::number(rand()) + ".dir"); + dirname = locateLocal("appdata", TQString::number(rand()) + ".dir"); - QString path = m_stringlist.front(); + TQString path = m_stringlist.front(); m_stringlist.pop_front(); int tls = m_intlist.front(); m_intlist.pop_front(); @@ -534,7 +534,7 @@ void FtpThread::Transfer_Changedir_thread() result = mp_ftp->Pwd(buffer, 1024); if (result) { - Event(EventHandler::pwd_success, new QString(buffer)); + Event(EventHandler::pwd_success, new TQString(buffer)); m_pwd = buffer; } else @@ -581,13 +581,13 @@ void FtpThread::Transfer_Changedir_thread() if (!result) Event(EventHandler::transfer_failure); else Event(EventHandler::transfer_success); - QFile::remove(dirname); + TQFile::remove(dirname); } void FtpThread::Transfer_Mkdir_thread() { int result; - QString dir = m_stringlist.front(); + TQString dir = m_stringlist.front(); m_stringlist.pop_front(); result = mp_ftp->Mkdir(dir.latin1()); @@ -607,9 +607,9 @@ void FtpThread::Transfer_Get_thread() { int result; - QString src = m_stringlist.front(); + TQString src = m_stringlist.front(); m_stringlist.pop_front(); - QString dst = m_stringlist.front(); + TQString dst = m_stringlist.front(); m_stringlist.pop_front(); int tls = m_intlist.front(); m_intlist.pop_front(); @@ -653,9 +653,9 @@ void FtpThread::Transfer_Put_thread() { int result; - QString src = m_stringlist.front(); + TQString src = m_stringlist.front(); m_stringlist.pop_front(); - QString dst = m_stringlist.front(); + TQString dst = m_stringlist.front(); m_stringlist.pop_front(); int tls = m_intlist.front(); m_intlist.pop_front(); @@ -714,9 +714,9 @@ void FtpThread::Transfer_Fxp_thread() int result = 0; ftplib::ftp method; - QString src = m_stringlist.front(); + TQString src = m_stringlist.front(); m_stringlist.pop_front(); - QString dst = m_stringlist.front(); + TQString dst = m_stringlist.front(); m_stringlist.pop_front(); FtpThread* dstftp = m_ftplist.front(); m_ftplist.pop_front(); @@ -750,9 +750,9 @@ void FtpThread::Transfer_Fxp_thread() if (alt) method = ftplib::alternativefxp; else method = ftplib::defaultfxp; - qWarning("bla_thread: %d", alt); + tqWarning("bla_thread: %d", alt); - if (resume) qWarning("WARNING: fxp resume isn't supported. overwriting file instead"); + if (resume) tqWarning("WARNING: fxp resume isn't supported. overwriting file instead"); result == ftplib::Fxp(mp_ftp, dstftp->Ftp(), src, dst, ftplib::image, method); FxpReportResult(result); @@ -798,7 +798,7 @@ void FtpThread::Pwd_thread() if (result) { - Event(EventHandler::pwd_success, new QString(buffer)); + Event(EventHandler::pwd_success, new TQString(buffer)); m_pwd = buffer; } else @@ -812,7 +812,7 @@ void FtpThread::Chdir_thread() { int result; - QString path = m_stringlist.front(); + TQString path = m_stringlist.front(); m_stringlist.pop_front(); result = mp_ftp->Chdir(path.latin1()); @@ -829,7 +829,7 @@ void FtpThread::Mkdir_thread() { int result; - QString path = m_stringlist.front(); + TQString path = m_stringlist.front(); m_stringlist.pop_front(); result = mp_ftp->Mkdir(path.latin1()); @@ -860,7 +860,7 @@ void FtpThread::Rm_thread() { int result; - QString name = m_stringlist.front(); + TQString name = m_stringlist.front(); m_stringlist.pop_front(); result = mp_ftp->Delete(name.latin1()); @@ -877,9 +877,9 @@ void FtpThread::Rename_thread() { int result; - QString src = m_stringlist.front(); + TQString src = m_stringlist.front(); m_stringlist.pop_front(); - QString dst = m_stringlist.front(); + TQString dst = m_stringlist.front(); m_stringlist.pop_front(); result = mp_ftp->Rename(src.latin1(),dst.latin1()); @@ -895,13 +895,13 @@ void FtpThread::Rename_thread() void FtpThread::Dir_thread() { int result; - QString dirname; + TQString dirname; int cacheindex = -1; int force = m_intlist.front(); m_intlist.pop_front(); - dirname = locateLocal("appdata", QString::number(rand()) + ".dir"); + dirname = locateLocal("appdata", TQString::number(rand()) + ".dir"); if (KbConfig::dirCachingIsEnabled()) { @@ -944,7 +944,7 @@ void FtpThread::Dir_thread() else Event(EventHandler::dir_failure, &m_dircontent); } - QFile::remove(dirname); + TQFile::remove(dirname); } void FtpThread::Scandir_thread() @@ -969,7 +969,7 @@ void FtpThread::Rmdir_thread() { bool result; - QString name = m_stringlist.front(); + TQString name = m_stringlist.front(); m_stringlist.pop_front(); result = Delete_recurse(name.latin1()); @@ -986,7 +986,7 @@ void FtpThread::Raw_thread() { bool result; - QString cmd = m_stringlist.front(); + TQString cmd = m_stringlist.front(); m_stringlist.pop_front(); result = mp_ftp->Raw(cmd.latin1()); @@ -1081,18 +1081,18 @@ void FtpThread::run() void FtpThread::Event(EventHandler::EventType type, void *data) { - if (mp_eventreceiver == NULL) qWarning("WARNING: mp_eventreceiver is NULL"); + if (mp_eventreceiver == NULL) tqWarning("WARNING: mp_eventreceiver is NULL"); else { - QCustomEvent* e = new QCustomEvent(type); + TQCustomEvent* e = new TQCustomEvent(type); if (data != NULL) e->setData(data); - qApp->postEvent(mp_eventreceiver, e); + tqApp->postEvent(mp_eventreceiver, e); } } /* parses the dir file */ -bool FtpThread::FormatFilelist(const char *filename, QString current, filist *dirtable, filist *filetable) +bool FtpThread::FormatFilelist(const char *filename, TQString current, filist *dirtable, filist *filetable) { int i, blocks, space, month_int = 1; unsigned int loc, fileloc, datebegin, sizebegin = 0; @@ -1110,7 +1110,7 @@ bool FtpThread::FormatFilelist(const char *filename, QString current, filist *di dirfile = fopen(filename, "r"); if (dirfile == NULL) { - qWarning("ERROR: failed open dirfile"); + tqWarning("ERROR: failed open dirfile"); return false; } @@ -1130,7 +1130,7 @@ bool FtpThread::FormatFilelist(const char *filename, QString current, filist *di } if( loc == string::npos ) { - qWarning("INFO: no month entry found"); + tqWarning("INFO: no month entry found"); loc = buffer.length(); } @@ -1167,11 +1167,11 @@ bool FtpThread::FormatFilelist(const char *filename, QString current, filist *di } if (blocks != 3) { - qWarning("INFO: ignoring invalid line in dirlist"); + tqWarning("INFO: ignoring invalid line in dirlist"); } else { - QString date(buffer.substr( datebegin, loc - datebegin - 1).c_str()); + TQString date(buffer.substr( datebegin, loc - datebegin - 1).c_str()); int day_int = date.section( ' ', 1, 1 ).toInt(); int year_int = date.section( ' ', -1, -1 ).toInt(); @@ -1182,9 +1182,9 @@ bool FtpThread::FormatFilelist(const char *filename, QString current, filist *di if (year_int == 0) { - year_int = QDate::currentDate().year(); - if (month_int > QDate::currentDate().month()) year_int--; - QTime mytime = QTime::fromString(date.section( ' ', -1, -1 )); + year_int = TQDate::currentDate().year(); + if (month_int > TQDate::currentDate().month()) year_int--; + TQTime mytime = TQTime::fromString(date.section( ' ', -1, -1 )); hour_int = mytime.hour(); minute_int = mytime.minute(); } @@ -1239,7 +1239,7 @@ bool FtpThread::FormatFilelist(const char *filename, QString current, filist *di } else if ((*file == 'l') || (*file == 'L')) { - qWarning("INFO: links to files not supported yet"); + tqWarning("INFO: links to files not supported yet"); } else { @@ -1255,13 +1255,13 @@ bool FtpThread::FormatFilelist(const char *filename, QString current, filist *di /* recursive method to check content of a directory */ -bool FtpThread::Scandir_recurse(KbDirInfo *dir, QString path) +bool FtpThread::Scandir_recurse(KbDirInfo *dir, TQString path) { char currentpath[1024]; int result; filist dirlist; filist filelist; - QString dirname; + TQString dirname; result = mp_ftp->Pwd(currentpath, 1024); @@ -1281,7 +1281,7 @@ bool FtpThread::Scandir_recurse(KbDirInfo *dir, QString path) } else Event(EventHandler::misc_success); - dirname = locateLocal("appdata", QString::number(rand()) + ".dir"); + dirname = locateLocal("appdata", TQString::number(rand()) + ".dir"); result = mp_ftp->Dir(dirname.latin1(), ""); @@ -1294,7 +1294,7 @@ bool FtpThread::Scandir_recurse(KbDirInfo *dir, QString path) if(!FormatFilelist(dirname.latin1(), path, &dirlist, &filelist)) return false; - QFile::remove(dirname); + TQFile::remove(dirname); filist::iterator end_file = filelist.end(); for(filist::iterator fiIterator = filelist.begin(); fiIterator != end_file; fiIterator++) @@ -1323,13 +1323,13 @@ bool FtpThread::Scandir_recurse(KbDirInfo *dir, QString path) /* recursive method to delete directories */ -bool FtpThread::Delete_recurse(QString name) +bool FtpThread::Delete_recurse(TQString name) { char currentdir[1024]; int result; filist dirlist; filist filelist; - QString dirname; + TQString dirname; result = mp_ftp->Pwd(currentdir, 1024); @@ -1349,11 +1349,11 @@ bool FtpThread::Delete_recurse(QString name) } else Event(EventHandler::misc_success); - //dirname = QDir::homeDirPath() + + //dirname = TQDir::homeDirPath() + //"/.kasablanca/" + - //QString::number((int) time(NULL) & 0xffff) + + //TQString::number((int) time(NULL) & 0xffff) + //".dir"; - dirname = locateLocal("appdata", QString::number(rand()) + ".dir"); + dirname = locateLocal("appdata", TQString::number(rand()) + ".dir"); result = mp_ftp->Dir(dirname.latin1(), ""); @@ -1366,7 +1366,7 @@ bool FtpThread::Delete_recurse(QString name) if(!FormatFilelist(dirname.latin1(), "", &dirlist, &filelist)) return false; - QFile::remove(dirname); + TQFile::remove(dirname); filist::iterator end_file = filelist.end(); for(filist::iterator fiIterator = filelist.begin(); fiIterator != end_file; fiIterator++) @@ -1411,7 +1411,7 @@ bool FtpThread::Delete_recurse(QString name) bool FtpThread::ConnectionLost() { - QString response; + TQString response; response = mp_ftp->LastResponse(); diff --git a/src/ftpthread.h b/src/ftpthread.h index 4372e82..04609b5 100644 --- a/src/ftpthread.h +++ b/src/ftpthread.h @@ -23,17 +23,17 @@ #define KB_THREAD_TIMEOUT 1000 #include <list> -#include <qthread.h> -#include <qstringlist.h> -#include <qvaluelist.h> -#include <qvaluevector.h> +#include <ntqthread.h> +#include <ntqstringlist.h> +#include <ntqvaluelist.h> +#include <ntqvaluevector.h> #include "eventhandler.h" #include "kbfileinfo.h" using namespace std; class ftplib; -class QObject; +class TQObject; class KbDirInfo; typedef list<KbFileInfo*> filist; @@ -43,36 +43,36 @@ typedef pair<filist, filist> dirpair; /** @author Magnus Kulke */ -class FtpThread : public QThread +class FtpThread : public TQThread { public: FtpThread(); ~FtpThread(); static void CallbackLog(char *log, void *arg, bool out); static int CallbackXfer(off64_t xfered, void *arg); - void SetEventReceiver(QObject* eventreceiver); + void SetEventReceiver(TQObject* eventreceiver); void ClearQueue(); - bool Connect(QString host); - bool Login(QString user, QString pass); + bool Connect(TQString host); + bool Login(TQString user, TQString pass); bool Quit(); bool Pwd(); - bool Chdir(QString path); + bool Chdir(TQString path); bool Cdup(); bool Dir(bool force = false); bool Scandir(KbDirInfo* dir); - bool Rm(QString name); - bool Rmdir(QString name); + bool Rm(TQString name); + bool Rmdir(TQString name); bool Authtls(); bool Pasv(bool flag); bool EncryptData(bool flag, bool force = false); - bool Transfer_Fxp(QString src, QString dst, FtpThread* dstftp, int srctls, int dsttls, off64_t resume = 0, int alt = 0); - bool Mkdir(QString path); - bool Rename(QString src, QString dst); - bool Raw(QString cmd); - bool Transfer_Get(QString src, QString dst, int tls, off64_t resume = 0); - bool Transfer_Put(QString src, QString dst, int tls, off64_t resume = 0); - bool Transfer_Changedir(QString dir, int tls); - bool Transfer_Mkdir(QString dir); + bool Transfer_Fxp(TQString src, TQString dst, FtpThread* dstftp, int srctls, int dsttls, off64_t resume = 0, int alt = 0); + bool Mkdir(TQString path); + bool Rename(TQString src, TQString dst); + bool Raw(TQString cmd); + bool Transfer_Get(TQString src, TQString dst, int tls, off64_t resume = 0); + bool Transfer_Put(TQString src, TQString dst, int tls, off64_t resume = 0); + bool Transfer_Changedir(TQString dir, int tls); + bool Transfer_Mkdir(TQString dir); void Event(EventHandler::EventType type, void *data = NULL); ftplib* Ftp() { return mp_ftp; }; void FxpReportResult(bool result); @@ -104,7 +104,7 @@ private: }; void run(); bool FormatFilelist(const char *filename, - QString current, + TQString current, filist *filetable, filist *dirtable ); @@ -130,27 +130,27 @@ private: void Transfer_Put_thread(); void Transfer_Fxp_thread(); void Transfer_Mkdir_thread(); - bool Scandir_recurse(KbDirInfo *dir, QString path); - bool Delete_recurse(QString name); + bool Scandir_recurse(KbDirInfo *dir, TQString path); + bool Delete_recurse(TQString name); bool ConnectionLost(); private: - QMutex* mp_mutex; - QObject* mp_eventreceiver; + TQMutex* mp_mutex; + TQObject* mp_eventreceiver; ftplib* mp_ftp; - QString m_pwd; + TQString m_pwd; bool m_dataencrypted; KbDirInfo* mp_scandir; filist m_dirlist, m_filelist; dirpair m_dircontent; - QValueList<task> m_tasklist; - QStringList m_stringlist; - QValueList<int> m_intlist; - QValueList<off64_t> m_ulonglist; - QValueList<FtpThread*> m_ftplist; - QValueVector<dirpair> m_cache_vector; - QStringList m_cache_list; + TQValueList<task> m_tasklist; + TQStringList m_stringlist; + TQValueList<int> m_intlist; + TQValueList<off64_t> m_ulonglist; + TQValueList<FtpThread*> m_ftplist; + TQValueVector<dirpair> m_cache_vector; + TQStringList m_cache_list; public: - QString m_linebuffer; + TQString m_linebuffer; }; #endif diff --git a/src/importdialog.cpp b/src/importdialog.cpp index 53d7f8f..be684c3 100644 --- a/src/importdialog.cpp +++ b/src/importdialog.cpp @@ -12,13 +12,13 @@ // // -#include <qradiobutton.h> -#include <qdir.h> -#include <qfile.h> -#include <qprogressdialog.h> +#include <ntqradiobutton.h> +#include <ntqdir.h> +#include <ntqfile.h> +#include <ntqprogressdialog.h> -#include <klocale.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kdebug.h> @@ -27,7 +27,7 @@ using namespace std; -ImportDialog::ImportDialog(QWidget *parent, const char *name ) : KDialogBase(parent, name, true, i18n( "Import Bookmarks" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true) +ImportDialog::ImportDialog(TQWidget *parent, const char *name ) : KDialogBase(parent, name, true, i18n( "Import Bookmarks" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true) { mp_dialog = new KasablancaImportDialog(this); setMainWidget(mp_dialog); @@ -41,11 +41,11 @@ ImportDialog::~ImportDialog() void ImportDialog::slotOk() { if (mp_dialog->GftpRadioButton->isChecked()) - importGftpBookmarks ( QDir::homeDirPath() + "/.gftp/bookmarks" ); + importGftpBookmarks ( TQDir::homeDirPath() + "/.gftp/bookmarks" ); accept(); } -void ImportDialog::importGftpBookmarks( QString fileName ) { +void ImportDialog::importGftpBookmarks( TQString fileName ) { // kdDebug() << "import start" << endl; if ( fileName.isEmpty() || fileName.isNull() ) { @@ -55,7 +55,7 @@ void ImportDialog::importGftpBookmarks( QString fileName ) { return ; } - QFile f(fileName); + TQFile f(fileName); if ( !f.exists() ) { KMessageBox::information( 0, i18n( "No gftp bookmarks to import found." ), i18n( "No file" ) ); @@ -65,11 +65,11 @@ void ImportDialog::importGftpBookmarks( QString fileName ) { // First we fetch some global settings - KConfig tmpConfig( fileName, true, false, "HOME" ); - QString email = tmpConfig.readEntry( "email", "anonymous@" ); + TDEConfig tmpConfig( fileName, true, false, "HOME" ); + TQString email = tmpConfig.readEntry( "email", "anonymous@" ); - KConfig config( fileName, true, false, "HOME" ); - QStringList groupList = config.groupList(); + TDEConfig config( fileName, true, false, "HOME" ); + TQStringList groupList = config.groupList(); float size = ( float ) groupList.count(); if ( size == 0 ) { @@ -81,18 +81,18 @@ void ImportDialog::importGftpBookmarks( QString fileName ) { m_lines = groupList.count(); - QProgressDialog progress( 0, "progressdialog", true ); + TQProgressDialog progress( 0, "progressdialog", true ); progress.setLabelText( i18n( "Importing bookmarks..." ) ); progress.setCancelButton( 0 ); progress.setTotalSteps( m_lines ); - for ( QStringList::Iterator it = groupList.begin(); it != groupList.end(); ++it ) { - QString groupName = *it; // found groupname from gFTP, can have subgroups ( group1/group2/group3 ) - QStringList groupNames = QStringList::split( "/", groupName ); //split group name into subgroups if any + for ( TQStringList::Iterator it = groupList.begin(); it != groupList.end(); ++it ) { + TQString groupName = *it; // found groupname from gFTP, can have subgroups ( group1/group2/group3 ) + TQStringList groupNames = TQStringList::split( "/", groupName ); //split group name into subgroups if any config.setGroup( groupName ); - QString tmp = config.readEntry( "hostname" ); // we ignore the site if it hasn't any host + TQString tmp = config.readEntry( "hostname" ); // we ignore the site if it hasn't any host // first check so the site has a host, if not ignore it if ( ! tmp.isNull() ) { // had host @@ -116,11 +116,11 @@ void ImportDialog::importGftpBookmarks( QString fileName ) { // kdDebug() << "port: " << p << endl; - // QString HostPort = tmp; /* host:port */ + // TQString HostPort = tmp; /* host:port */ // HostPort += ":"; - // HostPort += QString().setNum( p ); + // HostPort += TQString().setNum( p ); - newsite.SetInfo(tmp + ":" + QString::number(p)); + newsite.SetInfo(tmp + ":" + TQString::number(p)); //newsite.SetPort( p ); //newsite.SetHostname(tmp); @@ -135,7 +135,7 @@ void ImportDialog::importGftpBookmarks( QString fileName ) { newsite.SetDefaultDirectory( tmp ); // set local directory - //tmp = config.readEntry( "local directory", QDir::homeDirPath() ); + //tmp = config.readEntry( "local directory", TQDir::homeDirPath() ); //kdDebug() << "local directory: " << tmp << endl; // set username @@ -164,7 +164,7 @@ void ImportDialog::importGftpBookmarks( QString fileName ) { counter++; progress.setProgress( counter ); } // for - KMessageBox::information( 0, i18n( "%1 bookmarks from gftp successful imported." ).arg(QString().setNum(counter-1)), i18n( "Successful import" ) ); + KMessageBox::information( 0, i18n( "%1 bookmarks from gftp successful imported." ).arg(TQString().setNum(counter-1)), i18n( "Successful import" ) ); /* int cnt = 0; list<KbSiteInfo>::iterator end_session = bookmarks.end(); diff --git a/src/importdialog.h b/src/importdialog.h index dfe2716..c22a48b 100644 --- a/src/importdialog.h +++ b/src/importdialog.h @@ -26,7 +26,7 @@ class ImportDialog : public KDialogBase { public: - ImportDialog(QWidget *parent=0, const char *name=0); + ImportDialog(TQWidget *parent=0, const char *name=0); ~ImportDialog(); list<KbSiteInfo>* Bookmarks() { return &m_bookmarks; }; private: @@ -34,7 +34,7 @@ private: int m_lines; KasablancaImportDialog *mp_dialog; void slotOk(); - void importGftpBookmarks(QString fileName); + void importGftpBookmarks(TQString fileName); }; #endif diff --git a/src/kasablanca.cpp b/src/kasablanca.cpp index ecaf77c..8895be4 100644 --- a/src/kasablanca.cpp +++ b/src/kasablanca.cpp @@ -20,12 +20,12 @@ #include <kapplication.h> #include <kdeversion.h> #include <kedittoolbar.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kicontheme.h> #include <kkeydialog.h> -#include <klocale.h> -#include <kmainwindow.h> +#include <tdelocale.h> +#include <tdemainwindow.h> #include <kmenubar.h> #include <kmessagebox.h> #include <kstandarddirs.h> @@ -36,13 +36,13 @@ #include <kpassivepopup.h> #include <klineedit.h> -#include <qtextedit.h> -#include <qcolor.h> -#include <qlistview.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qtoolbutton.h> -#include <qaction.h> +#include <ntqtextedit.h> +#include <ntqcolor.h> +#include <ntqlistview.h> +#include <ntqpushbutton.h> +#include <ntqheader.h> +#include <ntqtoolbutton.h> +#include <ntqaction.h> #include "Q_colorspreferencesdialog.h" #include "Q_generalpreferencesdialog.h" @@ -62,7 +62,7 @@ using namespace std; -Kasablanca::Kasablanca() : KMainWindow( 0, "Kasablanca" ), mp_view(new KasablancaMainWindow(this)) +Kasablanca::Kasablanca() : TDEMainWindow( 0, "Kasablanca" ), mp_view(new KasablancaMainWindow(this)) { //first, load the system tray icon mp_systemtray = new KSystemTray(this); @@ -145,12 +145,12 @@ Kasablanca::Kasablanca() : KMainWindow( 0, "Kasablanca" ), mp_view(new Kasablanc SLOT(SLOT_QueueItems(KbDirInfo*, FtpSession*, FtpSession*, bool))); connect(mp_session_b, SIGNAL(gui_queueitems(KbDirInfo*, FtpSession*, FtpSession*, bool)), SLOT(SLOT_QueueItems(KbDirInfo*, FtpSession*, FtpSession*, bool))); - connect(mp_session_a, SIGNAL(gui_succeedtransfer(QListViewItem*)), SLOT(SLOT_NextTransfer(QListViewItem*))); - connect(mp_session_b, SIGNAL(gui_succeedtransfer(QListViewItem*)), SLOT(SLOT_NextTransfer(QListViewItem*))); + connect(mp_session_a, SIGNAL(gui_succeedtransfer(TQListViewItem*)), SLOT(SLOT_NextTransfer(TQListViewItem*))); + connect(mp_session_b, SIGNAL(gui_succeedtransfer(TQListViewItem*)), SLOT(SLOT_NextTransfer(TQListViewItem*))); connect(mp_session_a, SIGNAL(gui_clearqueue(FtpSession*)), SLOT(SLOT_ClearQueue(FtpSession*))); connect(mp_session_b, SIGNAL(gui_clearqueue(FtpSession*)), SLOT(SLOT_ClearQueue(FtpSession*))); - QAction *deleteShortcut = new QAction( QPixmap(), "&Delete", + TQAction *deleteShortcut = new TQAction( TQPixmap(), "&Delete", Key_Delete, this, "delete" ); connect(deleteShortcut, SIGNAL(activated()), this, SLOT(SLOT_SkipTasks())); @@ -167,12 +167,12 @@ void Kasablanca::setupGUI() mp_view->BrowserA->setSorting(-1); mp_view->BrowserB->setSorting(-1); - mp_view->TransferButtonA->setIconSet(KGlobal::iconLoader()->loadIconSet("forward",KIcon::Toolbar)); - mp_view->TransferButtonB->setIconSet(KGlobal::iconLoader()->loadIconSet("back",KIcon::Toolbar)); - mp_view->RefreshButtonA->setIconSet(KGlobal::iconLoader()->loadIconSet("reload",KIcon::Toolbar)); - mp_view->RefreshButtonB->setIconSet(KGlobal::iconLoader()->loadIconSet("reload",KIcon::Toolbar)); - mp_view->ConnectButtonA->setIconSet(KGlobal::iconLoader()->loadIconSet("connect_no",KIcon::Toolbar)); - mp_view->ConnectButtonB->setIconSet(KGlobal::iconLoader()->loadIconSet("connect_no",KIcon::Toolbar)); + mp_view->TransferButtonA->setIconSet(TDEGlobal::iconLoader()->loadIconSet("forward",TDEIcon::Toolbar)); + mp_view->TransferButtonB->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back",TDEIcon::Toolbar)); + mp_view->RefreshButtonA->setIconSet(TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Toolbar)); + mp_view->RefreshButtonB->setIconSet(TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Toolbar)); + mp_view->ConnectButtonA->setIconSet(TDEGlobal::iconLoader()->loadIconSet("connect_no",TDEIcon::Toolbar)); + mp_view->ConnectButtonB->setIconSet(TDEGlobal::iconLoader()->loadIconSet("connect_no",TDEIcon::Toolbar)); } void Kasablanca::applyConfig() @@ -260,20 +260,20 @@ void Kasablanca::optionsConfigureToolbars() // use the standard toolbar editor #if defined(KDE_MAKE_VERSION) # if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); # endif #else - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); #endif } void Kasablanca::optionsPreferences() { - if (KConfigDialog::showDialog("settings")) return; + if (TDEConfigDialog::showDialog("settings")) return; - KConfigDialog* dialog = new KConfigDialog(0, "settings", KbConfig::self(), KDialogBase::IconList, + TDEConfigDialog* dialog = new TDEConfigDialog(0, "settings", KbConfig::self(), KDialogBase::IconList, KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Help); dialog->setHelp("globalhelp"); @@ -296,31 +296,31 @@ void Kasablanca::newToolbarConfig() #if defined(KDE_MAKE_VERSION) # if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); # endif #else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); #endif } void Kasablanca::setupMenu() { - QWidget *w; + TQWidget *w; w = factory()->container("connect menu", this); - if (w == NULL) qWarning("ERROR: 'connect menu' not found in .ui file"); + if (w == NULL) tqWarning("ERROR: 'connect menu' not found in .ui file"); else { - QPopupMenu *menu = static_cast<QPopupMenu *>(w); + TQPopupMenu *menu = static_cast<TQPopupMenu *>(w); menu->insertItem(i18n("Session A"), &m_bookmarksmenu_a); menu->insertItem(i18n("Session B"), &m_bookmarksmenu_b); } w = factory()->container("action menu", this); - if (w == NULL) qWarning("ERROR: 'action menu' not found in .ui file"); + if (w == NULL) tqWarning("ERROR: 'action menu' not found in .ui file"); else { - QPopupMenu *menu = static_cast<QPopupMenu *>(w); + TQPopupMenu *menu = static_cast<TQPopupMenu *>(w); menu->insertItem(i18n("Session A"), &m_rclickmenu_a); menu->insertItem(i18n("Session B"), &m_rclickmenu_b); menu->insertItem(i18n("Queue"), &m_rclickmenu_t); @@ -350,20 +350,20 @@ void Kasablanca::setupMenu() connect(&m_rclickmenu_a, SIGNAL(activated(int)), mp_session_a, SLOT(SLOT_ActionMenu(int))); connect(&m_bookmarksmenu_a, SIGNAL(activated(int)), mp_session_a, SLOT(SLOT_ConnectMenu(int))); - connect(mp_view->BrowserA, SIGNAL(doubleClicked(QListViewItem*)), mp_session_a, SLOT(SLOT_ItemClicked(QListViewItem*))); - connect(mp_view->BrowserA, SIGNAL(rightButtonPressed(QListViewItem *, const QPoint &, int)), - mp_session_a, SLOT(SLOT_ItemRClicked(QListViewItem *, const QPoint &, int))); + connect(mp_view->BrowserA, SIGNAL(doubleClicked(TQListViewItem*)), mp_session_a, SLOT(SLOT_ItemClicked(TQListViewItem*))); + connect(mp_view->BrowserA, SIGNAL(rightButtonPressed(TQListViewItem *, const TQPoint &, int)), + mp_session_a, SLOT(SLOT_ItemRClicked(TQListViewItem *, const TQPoint &, int))); connect(mp_view->BrowserA->header(), SIGNAL (clicked(int)), mp_session_a, SLOT (SLOT_HeaderClicked(int))); connect(&m_rclickmenu_b, SIGNAL(activated(int)), mp_session_b, SLOT(SLOT_ActionMenu(int))); connect(&m_bookmarksmenu_b, SIGNAL(activated(int)), mp_session_b, SLOT(SLOT_ConnectMenu(int))); - connect(mp_view->BrowserB, SIGNAL(doubleClicked(QListViewItem*)), mp_session_b, SLOT(SLOT_ItemClicked(QListViewItem*))); - connect(mp_view->BrowserB, SIGNAL(rightButtonPressed(QListViewItem *, const QPoint &, int)), - mp_session_b, SLOT(SLOT_ItemRClicked(QListViewItem *, const QPoint &, int))); + connect(mp_view->BrowserB, SIGNAL(doubleClicked(TQListViewItem*)), mp_session_b, SLOT(SLOT_ItemClicked(TQListViewItem*))); + connect(mp_view->BrowserB, SIGNAL(rightButtonPressed(TQListViewItem *, const TQPoint &, int)), + mp_session_b, SLOT(SLOT_ItemRClicked(TQListViewItem *, const TQPoint &, int))); connect(mp_view->BrowserB->header(), SIGNAL(clicked(int)), mp_session_b, SLOT(SLOT_HeaderClicked(int))); - connect( mp_view->TaskView, SIGNAL (rightButtonPressed( QListViewItem *, const QPoint &, int )), this, - SLOT (SLOT_ItemRightClickedT(QListViewItem *, const QPoint &, int ))); + connect( mp_view->TaskView, SIGNAL (rightButtonPressed( TQListViewItem *, const TQPoint &, int )), this, + SLOT (SLOT_ItemRightClickedT(TQListViewItem *, const TQPoint &, int ))); m_rclickmenu_t.connectItem(Start, this, SLOT(SLOT_ProcessQueue())); m_rclickmenu_t.connectItem(Skip, this, SLOT(SLOT_SkipTasks())); @@ -371,15 +371,15 @@ void Kasablanca::setupMenu() void Kasablanca::setupStatusBar() { - m_iconencrypted = KGlobal::iconLoader()->loadIconSet("encrypted",KIcon::Small).pixmap(QIconSet::Small,QIconSet::Normal); - m_iconunencrypted = KGlobal::iconLoader()->loadIconSet("encrypted",KIcon::Small).pixmap(QIconSet::Small,QIconSet::Disabled); + m_iconencrypted = TDEGlobal::iconLoader()->loadIconSet("encrypted",TDEIcon::Small).pixmap(TQIconSet::Small,TQIconSet::Normal); + m_iconunencrypted = TDEGlobal::iconLoader()->loadIconSet("encrypted",TDEIcon::Small).pixmap(TQIconSet::Small,TQIconSet::Disabled); - mp_statusline_a = new QLabel("", statusBar()); - mp_encryptionicon_a = new QLabel(statusBar()); + mp_statusline_a = new TQLabel("", statusBar()); + mp_encryptionicon_a = new TQLabel(statusBar()); mp_encryptionicon_a->setPixmap(m_iconunencrypted); - mp_statusline_b = new QLabel("", statusBar()); - mp_encryptionicon_b = new QLabel(statusBar()); + mp_statusline_b = new TQLabel("", statusBar()); + mp_encryptionicon_b = new TQLabel(statusBar()); mp_encryptionicon_b->setPixmap(m_iconunencrypted); statusBar()->addWidget(mp_statusline_a, 1); @@ -427,11 +427,11 @@ void Kasablanca::SLOT_QueueItems(KbDirInfo *dir, FtpSession* src, FtpSession* ds } } -void Kasablanca::QueueItemsRecurse(KbDirInfo *dir, FtpSession* src, FtpSession* dst, QListViewItem* parent) +void Kasablanca::QueueItemsRecurse(KbDirInfo *dir, FtpSession* src, FtpSession* dst, TQListViewItem* parent) { list<KbFileInfo*>* filelist; list<KbDirInfo*>* dirlist; - QListViewItem *after, *lastchild; + TQListViewItem *after, *lastchild; filelist = dir->Filelist(); dirlist = dir->Dirlist(); @@ -457,7 +457,7 @@ void Kasablanca::QueueItemsRecurse(KbDirInfo *dir, FtpSession* src, FtpSession* if (parent) after = new KbTransferFile(parent, after, src, dst, srcfi, dstfi); else new KbTransferFile(mp_view->TaskView, lastchild /*mp_view->TaskView->lastItem()*/, src, dst, srcfi, dstfi); } - else qWarning("INFO: entry ignored due to matched skiplist regexp"); + else tqWarning("INFO: entry ignored due to matched skiplist regexp"); } after = NULL; @@ -474,7 +474,7 @@ void Kasablanca::QueueItemsRecurse(KbDirInfo *dir, FtpSession* src, FtpSession* else after = new KbTransferDir(mp_view->TaskView, lastchild /*mp_view->TaskView->lastItem()*/, src, dst, srcfi, dstfi); QueueItemsRecurse(*dirIterator, src, dst, after); } - else qWarning("INFO: entry ignored due to matched skiplist regexp"); + else tqWarning("INFO: entry ignored due to matched skiplist regexp"); } delete dir; } @@ -483,7 +483,7 @@ void Kasablanca::SLOT_EditBookmarks() { BookmarkDialog dlg; - if (dlg.exec() == QDialog::Accepted) + if (dlg.exec() == TQDialog::Accepted) { InitBookmarks(); } @@ -511,14 +511,14 @@ void Kasablanca::SLOT_ClearQueue(FtpSession*) mp_view->TaskView->clear(); } -void Kasablanca::SLOT_ItemRightClickedT(QListViewItem *, const QPoint & point, int) +void Kasablanca::SLOT_ItemRightClickedT(TQListViewItem *, const TQPoint & point, int) { m_rclickmenu_t.exec(point); } void Kasablanca::SLOT_SkipTasks() { - QListViewItemIterator it(mp_view->TaskView); + TQListViewItemIterator it(mp_view->TaskView); while ( it.current() ) { if (it.current()->isSelected()) delete it.current(); @@ -532,7 +532,7 @@ void Kasablanca::SLOT_SelectionChanged() int counter_b = 0; bool flag; - QListViewItemIterator ita(mp_view->BrowserA); + TQListViewItemIterator ita(mp_view->BrowserA); while ( ita.current() ) { if (ita.current()->isSelected()) counter_a++; @@ -551,7 +551,7 @@ void Kasablanca::SLOT_SelectionChanged() m_rclickmenu_a.setItemEnabled(Rename, (counter_a >= 1)); m_rclickmenu_a.setItemEnabled(Delete, (counter_a >= 1)); - QListViewItemIterator itb(mp_view->BrowserB); + TQListViewItemIterator itb(mp_view->BrowserB); while ( itb.current() ) { if (itb.current()->isSelected()) counter_b++; @@ -571,9 +571,9 @@ void Kasablanca::SLOT_SelectionChanged() m_rclickmenu_b.setItemEnabled(Delete, (counter_b >= 1)); } -void Kasablanca::SLOT_NextTransfer(QListViewItem* item) +void Kasablanca::SLOT_NextTransfer(TQListViewItem* item) { - QListViewItem *next; + TQListViewItem *next; next = NextTransfer(item); if (next) ProcessQueue(static_cast<KbTransferItem*>(next)); else QueueFinished(); @@ -583,19 +583,19 @@ void Kasablanca::QueueFinished() { if (m_onqueuefinishedenabled) { - KProcess* p = new KProcess(); - *p << QStringList::split(" ", m_onqueuefinished); - connect(p, SIGNAL(processExited(KProcess*)), SLOT(SLOT_LocalProcessExited(KProcess*))); + TDEProcess* p = new TDEProcess(); + *p << TQStringList::split(" ", m_onqueuefinished); + connect(p, SIGNAL(processExited(TDEProcess*)), SLOT(SLOT_LocalProcessExited(TDEProcess*))); p->start(); } if (KbConfig::systrayIsEnabled()) KPassivePopup::message("Transfer is finished.", mp_systemtray); - //QToolTip::remove(mp_systemtray); + //TQToolTip::remove(mp_systemtray); } -QListViewItem* Kasablanca::NextTransfer(QListViewItem* item) +TQListViewItem* Kasablanca::NextTransfer(TQListViewItem* item) { FtpSession *src, *dst; - QListViewItem *parent, *next, *retval; + TQListViewItem *parent, *next, *retval; src = static_cast<KbTransferItem*>(item)->SrcSession(); dst = static_cast<KbTransferItem*>(item)->DstSession(); next = item->nextSibling(); diff --git a/src/kasablanca.h b/src/kasablanca.h index 3d297d3..7d221a5 100644 --- a/src/kasablanca.h +++ b/src/kasablanca.h @@ -26,22 +26,22 @@ class KbDir; class KbFile; class KToggleAction; class KSystemTray; -class QWidget; -class QCloseEvent; -class QLabel; -class QPixmap; +class TQWidget; +class TQCloseEvent; +class TQLabel; +class TQPixmap; class FtpSession; class KbStatusTip; #include <kapplication.h> #include <klistview.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kprocess.h> -#include <qdir.h> -#include <qlistview.h> -#include <qmenubar.h> -#include <qregexp.h> +#include <ntqdir.h> +#include <ntqlistview.h> +#include <ntqmenubar.h> +#include <ntqregexp.h> #include <list> @@ -53,7 +53,7 @@ using namespace std; /** Kasablanca is the base class of the project */ -class Kasablanca : public KMainWindow +class Kasablanca : public TDEMainWindow { Q_OBJECT public: @@ -72,8 +72,8 @@ public: Kasablanca(); ~Kasablanca(); - QString m_tempdirname; - QString m_version; + TQString m_tempdirname; + TQString m_version; list<KbSiteInfo> m_bookmarks; KSystemTray* systemTray() const { return mp_systemtray; } KbStatusTip* statusTip() const { return mp_statustip; } @@ -82,14 +82,14 @@ public: public slots: void SLOT_EditBookmarks(); void SLOT_ImportBookmarks(); - void SLOT_ItemRightClickedT(QListViewItem * item, const QPoint & point, int col ); + void SLOT_ItemRightClickedT(TQListViewItem * item, const TQPoint & point, int col ); void SLOT_SelectionChanged(); void SLOT_SkipTasks(); void SLOT_ProcessQueue(); void SLOT_QueueItems(KbDirInfo *dir, FtpSession* src, FtpSession* dst, bool startqueue); - void SLOT_NextTransfer(QListViewItem* item); + void SLOT_NextTransfer(TQListViewItem* item); void SLOT_ClearQueue(FtpSession* session); - void SLOT_LocalProcessExited(KProcess* proc) { delete proc; }; + void SLOT_LocalProcessExited(TDEProcess* proc) { delete proc; }; private slots: void optionsShowToolbar(); @@ -101,28 +101,28 @@ private slots: void applyConfig(); private: - void QueueItemsRecurse(KbDirInfo *dir, FtpSession* src, FtpSession* dst, QListViewItem* parent = NULL); + void QueueItemsRecurse(KbDirInfo *dir, FtpSession* src, FtpSession* dst, TQListViewItem* parent = NULL); void setupStatusBar(); void setupMenu(); void setupGUI(); void setupActions(); void saveSettings(); void ProcessQueue(KbTransferItem* item); - QListViewItem* NextTransfer(QListViewItem* item); + TQListViewItem* NextTransfer(TQListViewItem* item); void QueueFinished(); KasablancaMainWindow *mp_view; - QPopupMenu m_bookmarksmenu_a, m_bookmarksmenu_b; - QRegExp m_skiplist; - QPopupMenu m_rclickmenu_a, m_rclickmenu_b, m_rclickmenu_t; - QLabel *mp_statusline_a, *mp_statusline_b, *mp_encryptionicon_a, *mp_encryptionicon_b; - QPixmap m_iconencrypted, m_iconunencrypted; + TQPopupMenu m_bookmarksmenu_a, m_bookmarksmenu_b; + TQRegExp m_skiplist; + TQPopupMenu m_rclickmenu_a, m_rclickmenu_b, m_rclickmenu_t; + TQLabel *mp_statusline_a, *mp_statusline_b, *mp_encryptionicon_a, *mp_encryptionicon_b; + TQPixmap m_iconencrypted, m_iconunencrypted; KToggleAction *m_toolbarAction; KToggleAction *m_statusbarAction; FtpSession *mp_session_a, *mp_session_b; list<FtpSession*> *mp_sessionlist; bool m_skiplistenabled, m_onqueuefinishedenabled; - QString m_onqueuefinished; + TQString m_onqueuefinished; KSystemTray* mp_systemtray; KbStatusTip *mp_statustip; }; diff --git a/src/kbbookmarkitem.cpp b/src/kbbookmarkitem.cpp index 4181b39..735ad9c 100644 --- a/src/kbbookmarkitem.cpp +++ b/src/kbbookmarkitem.cpp @@ -12,7 +12,7 @@ #include "kbbookmarkitem.h" #include "kbsiteinfo.h" -KbBookmarkItem::KbBookmarkItem(QListView *view, QListViewItem *after, KbSiteInfo *site) : QListViewItem(view, after) +KbBookmarkItem::KbBookmarkItem(TQListView *view, TQListViewItem *after, KbSiteInfo *site) : TQListViewItem(view, after) { mp_siteinfo = site; setText(0, mp_siteinfo->GetName()); diff --git a/src/kbbookmarkitem.h b/src/kbbookmarkitem.h index 491c6d7..a98db32 100644 --- a/src/kbbookmarkitem.h +++ b/src/kbbookmarkitem.h @@ -12,17 +12,17 @@ #ifndef KBBOOKMARKITEM_H #define KBBOOKMARKITEM_H -#include <qlistview.h> +#include <ntqlistview.h> class KbSiteInfo; /** @author Magnus Kulke */ -class KbBookmarkItem : public QListViewItem +class KbBookmarkItem : public TQListViewItem { public: - KbBookmarkItem(QListView *view, QListViewItem *after, KbSiteInfo *site); + KbBookmarkItem(TQListView *view, TQListViewItem *after, KbSiteInfo *site); ~KbBookmarkItem(); KbSiteInfo* GetSiteInfo() { return mp_siteinfo; }; private: diff --git a/src/kbconfig.cpp b/src/kbconfig.cpp index f945d40..820a4c4 100644 --- a/src/kbconfig.cpp +++ b/src/kbconfig.cpp @@ -19,77 +19,77 @@ KbConfig *KbConfig::self() } KbConfig::KbConfig( ) - : KConfigSkeleton( QString::fromLatin1( "kasablancarc" ) ) + : TDEConfigSkeleton( TQString::fromLatin1( "kasablancarc" ) ) { mSelf = this; - setCurrentGroup( QString::fromLatin1( "general" ) ); + setCurrentGroup( TQString::fromLatin1( "general" ) ); - KConfigSkeleton::ItemString *itemSkiplist; - itemSkiplist = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "Skiplist" ), mSkiplist ); - addItem( itemSkiplist, QString::fromLatin1( "Skiplist" ) ); - KConfigSkeleton::ItemString *itemPrioritylist; - itemPrioritylist = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "Prioritylist" ), mPrioritylist ); - addItem( itemPrioritylist, QString::fromLatin1( "Prioritylist" ) ); - KConfigSkeleton::ItemBool *itemDirCachingIsEnabled; - itemDirCachingIsEnabled = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "DirCachingIsEnabled" ), mDirCachingIsEnabled, false ); - addItem( itemDirCachingIsEnabled, QString::fromLatin1( "DirCachingIsEnabled" ) ); - KConfigSkeleton::ItemBool *itemDeleteMovesIntoTrashIsEnabled; - itemDeleteMovesIntoTrashIsEnabled = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "DeleteMovesIntoTrashIsEnabled" ), mDeleteMovesIntoTrashIsEnabled, false ); - addItem( itemDeleteMovesIntoTrashIsEnabled, QString::fromLatin1( "DeleteMovesIntoTrashIsEnabled" ) ); - KConfigSkeleton::ItemBool *itemSkiplistIsEnabled; - itemSkiplistIsEnabled = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "SkiplistIsEnabled" ), mSkiplistIsEnabled, false ); - addItem( itemSkiplistIsEnabled, QString::fromLatin1( "SkiplistIsEnabled" ) ); - KConfigSkeleton::ItemBool *itemPrioritylistIsEnabled; - itemPrioritylistIsEnabled = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "PrioritylistIsEnabled" ), mPrioritylistIsEnabled, false ); - addItem( itemPrioritylistIsEnabled, QString::fromLatin1( "PrioritylistIsEnabled" ) ); - KConfigSkeleton::ItemString *itemOnQueueFinished; - itemOnQueueFinished = new KConfigSkeleton::ItemString( currentGroup(), QString::fromLatin1( "OnQueueFinished" ), mOnQueueFinished ); - addItem( itemOnQueueFinished, QString::fromLatin1( "OnQueueFinished" ) ); - KConfigSkeleton::ItemBool *itemOnQueueFinishedIsEnabled; - itemOnQueueFinishedIsEnabled = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "OnQueueFinishedIsEnabled" ), mOnQueueFinishedIsEnabled, false ); - addItem( itemOnQueueFinishedIsEnabled, QString::fromLatin1( "OnQueueFinishedIsEnabled" ) ); - KConfigSkeleton::ItemBool *itemOnFileExistsOverwrite; - itemOnFileExistsOverwrite = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "OnFileExistsOverwrite" ), mOnFileExistsOverwrite, false ); - addItem( itemOnFileExistsOverwrite, QString::fromLatin1( "OnFileExistsOverwrite" ) ); - KConfigSkeleton::ItemBool *itemOnFileExistsResume; - itemOnFileExistsResume = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "OnFileExistsResume" ), mOnFileExistsResume, true ); - addItem( itemOnFileExistsResume, QString::fromLatin1( "OnFileExistsResume" ) ); - KConfigSkeleton::ItemBool *itemOnFileExistsSkip; - itemOnFileExistsSkip = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "OnFileExistsSkip" ), mOnFileExistsSkip, false ); - addItem( itemOnFileExistsSkip, QString::fromLatin1( "OnFileExistsSkip" ) ); - KConfigSkeleton::ItemBool *itemOnFileExistsIsEnabled; - itemOnFileExistsIsEnabled = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "OnFileExistsIsEnabled" ), mOnFileExistsIsEnabled, false ); - addItem( itemOnFileExistsIsEnabled, QString::fromLatin1( "OnFileExistsIsEnabled" ) ); + TDEConfigSkeleton::ItemString *itemSkiplist; + itemSkiplist = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Skiplist" ), mSkiplist ); + addItem( itemSkiplist, TQString::fromLatin1( "Skiplist" ) ); + TDEConfigSkeleton::ItemString *itemPrioritylist; + itemPrioritylist = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Prioritylist" ), mPrioritylist ); + addItem( itemPrioritylist, TQString::fromLatin1( "Prioritylist" ) ); + TDEConfigSkeleton::ItemBool *itemDirCachingIsEnabled; + itemDirCachingIsEnabled = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "DirCachingIsEnabled" ), mDirCachingIsEnabled, false ); + addItem( itemDirCachingIsEnabled, TQString::fromLatin1( "DirCachingIsEnabled" ) ); + TDEConfigSkeleton::ItemBool *itemDeleteMovesIntoTrashIsEnabled; + itemDeleteMovesIntoTrashIsEnabled = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "DeleteMovesIntoTrashIsEnabled" ), mDeleteMovesIntoTrashIsEnabled, false ); + addItem( itemDeleteMovesIntoTrashIsEnabled, TQString::fromLatin1( "DeleteMovesIntoTrashIsEnabled" ) ); + TDEConfigSkeleton::ItemBool *itemSkiplistIsEnabled; + itemSkiplistIsEnabled = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SkiplistIsEnabled" ), mSkiplistIsEnabled, false ); + addItem( itemSkiplistIsEnabled, TQString::fromLatin1( "SkiplistIsEnabled" ) ); + TDEConfigSkeleton::ItemBool *itemPrioritylistIsEnabled; + itemPrioritylistIsEnabled = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "PrioritylistIsEnabled" ), mPrioritylistIsEnabled, false ); + addItem( itemPrioritylistIsEnabled, TQString::fromLatin1( "PrioritylistIsEnabled" ) ); + TDEConfigSkeleton::ItemString *itemOnQueueFinished; + itemOnQueueFinished = new TDEConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "OnQueueFinished" ), mOnQueueFinished ); + addItem( itemOnQueueFinished, TQString::fromLatin1( "OnQueueFinished" ) ); + TDEConfigSkeleton::ItemBool *itemOnQueueFinishedIsEnabled; + itemOnQueueFinishedIsEnabled = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OnQueueFinishedIsEnabled" ), mOnQueueFinishedIsEnabled, false ); + addItem( itemOnQueueFinishedIsEnabled, TQString::fromLatin1( "OnQueueFinishedIsEnabled" ) ); + TDEConfigSkeleton::ItemBool *itemOnFileExistsOverwrite; + itemOnFileExistsOverwrite = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OnFileExistsOverwrite" ), mOnFileExistsOverwrite, false ); + addItem( itemOnFileExistsOverwrite, TQString::fromLatin1( "OnFileExistsOverwrite" ) ); + TDEConfigSkeleton::ItemBool *itemOnFileExistsResume; + itemOnFileExistsResume = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OnFileExistsResume" ), mOnFileExistsResume, true ); + addItem( itemOnFileExistsResume, TQString::fromLatin1( "OnFileExistsResume" ) ); + TDEConfigSkeleton::ItemBool *itemOnFileExistsSkip; + itemOnFileExistsSkip = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OnFileExistsSkip" ), mOnFileExistsSkip, false ); + addItem( itemOnFileExistsSkip, TQString::fromLatin1( "OnFileExistsSkip" ) ); + TDEConfigSkeleton::ItemBool *itemOnFileExistsIsEnabled; + itemOnFileExistsIsEnabled = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OnFileExistsIsEnabled" ), mOnFileExistsIsEnabled, false ); + addItem( itemOnFileExistsIsEnabled, TQString::fromLatin1( "OnFileExistsIsEnabled" ) ); - setCurrentGroup( QString::fromLatin1( "ui" ) ); + setCurrentGroup( TQString::fromLatin1( "ui" ) ); - KConfigSkeleton::ItemBool *itemSystrayIsEnabled; - itemSystrayIsEnabled = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "SystrayIsEnabled" ), mSystrayIsEnabled, false ); - addItem( itemSystrayIsEnabled, QString::fromLatin1( "SystrayIsEnabled" ) ); - KConfigSkeleton::ItemBool *itemCommandLineIsEnabled; - itemCommandLineIsEnabled = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "CommandLineIsEnabled" ), mCommandLineIsEnabled, true ); - addItem( itemCommandLineIsEnabled, QString::fromLatin1( "CommandLineIsEnabled" ) ); - KConfigSkeleton::ItemBool *itemHideHiddenFilesIsEnabled; - itemHideHiddenFilesIsEnabled = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "HideHiddenFilesIsEnabled" ), mHideHiddenFilesIsEnabled, false ); - addItem( itemHideHiddenFilesIsEnabled, QString::fromLatin1( "HideHiddenFilesIsEnabled" ) ); - KConfigSkeleton::ItemFont *itemLogwindowFont; - itemLogwindowFont = new KConfigSkeleton::ItemFont( currentGroup(), QString::fromLatin1( "LogwindowFont" ), mLogwindowFont, QFont( "DEC Terminal" ) ); - addItem( itemLogwindowFont, QString::fromLatin1( "LogwindowFont" ) ); + TDEConfigSkeleton::ItemBool *itemSystrayIsEnabled; + itemSystrayIsEnabled = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SystrayIsEnabled" ), mSystrayIsEnabled, false ); + addItem( itemSystrayIsEnabled, TQString::fromLatin1( "SystrayIsEnabled" ) ); + TDEConfigSkeleton::ItemBool *itemCommandLineIsEnabled; + itemCommandLineIsEnabled = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "CommandLineIsEnabled" ), mCommandLineIsEnabled, true ); + addItem( itemCommandLineIsEnabled, TQString::fromLatin1( "CommandLineIsEnabled" ) ); + TDEConfigSkeleton::ItemBool *itemHideHiddenFilesIsEnabled; + itemHideHiddenFilesIsEnabled = new TDEConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "HideHiddenFilesIsEnabled" ), mHideHiddenFilesIsEnabled, false ); + addItem( itemHideHiddenFilesIsEnabled, TQString::fromLatin1( "HideHiddenFilesIsEnabled" ) ); + TDEConfigSkeleton::ItemFont *itemLogwindowFont; + itemLogwindowFont = new TDEConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "LogwindowFont" ), mLogwindowFont, TQFont( "DEC Terminal" ) ); + addItem( itemLogwindowFont, TQString::fromLatin1( "LogwindowFont" ) ); - setCurrentGroup( QString::fromLatin1( "colors" ) ); + setCurrentGroup( TQString::fromLatin1( "colors" ) ); - KConfigSkeleton::ItemColor *itemLocalColor; - itemLocalColor = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "LocalColor" ), mLocalColor, QColor( 244,247,66 ) ); - addItem( itemLocalColor, QString::fromLatin1( "LocalColor" ) ); - KConfigSkeleton::ItemColor *itemSuccessColor; - itemSuccessColor = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "SuccessColor" ), mSuccessColor, QColor( 0,188,53 ) ); - addItem( itemSuccessColor, QString::fromLatin1( "SuccessColor" ) ); - KConfigSkeleton::ItemColor *itemBackgroundColor; - itemBackgroundColor = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "BackgroundColor" ), mBackgroundColor, QColor( 0,90,128 ) ); - addItem( itemBackgroundColor, QString::fromLatin1( "BackgroundColor" ) ); - KConfigSkeleton::ItemColor *itemFailureColor; - itemFailureColor = new KConfigSkeleton::ItemColor( currentGroup(), QString::fromLatin1( "FailureColor" ), mFailureColor, QColor( 222,9,48 ) ); - addItem( itemFailureColor, QString::fromLatin1( "FailureColor" ) ); + TDEConfigSkeleton::ItemColor *itemLocalColor; + itemLocalColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "LocalColor" ), mLocalColor, TQColor( 244,247,66 ) ); + addItem( itemLocalColor, TQString::fromLatin1( "LocalColor" ) ); + TDEConfigSkeleton::ItemColor *itemSuccessColor; + itemSuccessColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "SuccessColor" ), mSuccessColor, TQColor( 0,188,53 ) ); + addItem( itemSuccessColor, TQString::fromLatin1( "SuccessColor" ) ); + TDEConfigSkeleton::ItemColor *itemBackgroundColor; + itemBackgroundColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "BackgroundColor" ), mBackgroundColor, TQColor( 0,90,128 ) ); + addItem( itemBackgroundColor, TQString::fromLatin1( "BackgroundColor" ) ); + TDEConfigSkeleton::ItemColor *itemFailureColor; + itemFailureColor = new TDEConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "FailureColor" ), mFailureColor, TQColor( 222,9,48 ) ); + addItem( itemFailureColor, TQString::fromLatin1( "FailureColor" ) ); } KbConfig::~KbConfig() diff --git a/src/kbdir.cpp b/src/kbdir.cpp index bbb9716..f220d14 100755 --- a/src/kbdir.cpp +++ b/src/kbdir.cpp @@ -20,24 +20,24 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include "kbfileinfo.h" #include "kbdir.h" -KbDir::KbDir(KbFileInfo kfi, QListView * parent, QListViewItem * after) : KbItem(kfi, parent, after) +KbDir::KbDir(KbFileInfo kfi, TQListView * parent, TQListViewItem * after) : KbItem(kfi, parent, after) { - setPixmap(0, KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("folder",TDEIcon::Small)); if ((kfi.fileName() == ".") || (kfi.fileName() == "..")) delete this; } -KbDir::KbDir(QListView * parent, QListViewItem * after, QString file, QString path, QString date, off64_t size, unsigned int date_int) : KbItem(parent, after) +KbDir::KbDir(TQListView * parent, TQListViewItem * after, TQString file, TQString path, TQString date, off64_t size, unsigned int date_int) : KbItem(parent, after) { setText(0,file); - QString s; + TQString s; s.setNum(size); setText(1, s); diff --git a/src/kbdir.h b/src/kbdir.h index 17fc3b1..8329bd1 100755 --- a/src/kbdir.h +++ b/src/kbdir.h @@ -19,7 +19,7 @@ #define DIRITEM_H #include "kbitem.h" -#include <qlistview.h> +#include <ntqlistview.h> /** *@author mkulke @@ -27,8 +27,8 @@ class KbDir : public KbItem { public: - KbDir(KbFileInfo kfi, QListView * parent, QListViewItem * after); - KbDir(QListView * parent, QListViewItem * after, QString file, QString path, QString date, off64_t size, unsigned int date_int); + KbDir(KbFileInfo kfi, TQListView * parent, TQListViewItem * after); + KbDir(TQListView * parent, TQListViewItem * after, TQString file, TQString path, TQString date, off64_t size, unsigned int date_int); ~KbDir(); int rtti() const; }; diff --git a/src/kbdirinfo.cpp b/src/kbdirinfo.cpp index 8f913d2..220427f 100644 --- a/src/kbdirinfo.cpp +++ b/src/kbdirinfo.cpp @@ -10,7 +10,7 @@ // // -#include <qregexp.h> +#include <ntqregexp.h> #include <list> @@ -23,7 +23,7 @@ KbDirInfo::KbDirInfo(KbFileInfo info) : KbFileInfo(info) { } -KbDirInfo::KbDirInfo(QString path) : KbFileInfo(path) +KbDirInfo::KbDirInfo(TQString path) : KbFileInfo(path) { } @@ -33,7 +33,7 @@ KbDirInfo::~KbDirInfo() bool KbDirInfo::PrioritySort(const KbDirInfo *f1, const KbDirInfo *f2) { - QRegExp m_prioritylist(KbConfig::prioritylist()); + TQRegExp m_prioritylist(KbConfig::prioritylist()); if ((m_prioritylist.search(f1->fileName()) >= 0) > (m_prioritylist.search(f2->fileName()) >= 0)) return true; else return false; diff --git a/src/kbdirinfo.h b/src/kbdirinfo.h index 0c97e40..6a92606 100644 --- a/src/kbdirinfo.h +++ b/src/kbdirinfo.h @@ -24,7 +24,7 @@ using namespace std; class KbDirInfo : public KbFileInfo { public: - KbDirInfo(QString path); + KbDirInfo(TQString path); KbDirInfo(KbFileInfo info); ~KbDirInfo(); KbDirInfo* AddDirectory(KbFileInfo info); diff --git a/src/kbfile.cpp b/src/kbfile.cpp index 39d4095..bb12819 100755 --- a/src/kbfile.cpp +++ b/src/kbfile.cpp @@ -20,22 +20,22 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include "kbfileinfo.h" #include "kbfile.h" -KbFile::KbFile(KbFileInfo kfi, QListView * parent, QListViewItem * after) : KbItem(kfi, parent, after) +KbFile::KbFile(KbFileInfo kfi, TQListView * parent, TQListViewItem * after) : KbItem(kfi, parent, after) { - setPixmap(0, KGlobal::iconLoader()->loadIcon("files",KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("files",TDEIcon::Small)); } -KbFile::KbFile(QListView * parent, QListViewItem * after, QString file, QString path, QString date, off64_t size, unsigned int date_int) : KbItem(parent, after) +KbFile::KbFile(TQListView * parent, TQListViewItem * after, TQString file, TQString path, TQString date, off64_t size, unsigned int date_int) : KbItem(parent, after) { setText(0,file); - QString s; + TQString s; s.setNum(size); setText(1, s); diff --git a/src/kbfile.h b/src/kbfile.h index 2c53ab3..c388245 100755 --- a/src/kbfile.h +++ b/src/kbfile.h @@ -18,7 +18,7 @@ #ifndef FILEITEM_H #define FILEITEM_H -#include <qlistview.h> +#include <ntqlistview.h> #include "kbitem.h" class KbFileInfo; @@ -29,8 +29,8 @@ class KbFileInfo; class KbFile : public KbItem { public: - KbFile(KbFileInfo kfi, QListView * parent, QListViewItem * after); - KbFile(QListView * parent, QListViewItem * after, QString file, QString path, QString date, off64_t size, unsigned int date_int); + KbFile(KbFileInfo kfi, TQListView * parent, TQListViewItem * after); + KbFile(TQListView * parent, TQListViewItem * after, TQString file, TQString path, TQString date, off64_t size, unsigned int date_int); ~KbFile(); int rtti() const; }; diff --git a/src/kbfileinfo.cpp b/src/kbfileinfo.cpp index 46fe553..6b74173 100644 --- a/src/kbfileinfo.cpp +++ b/src/kbfileinfo.cpp @@ -15,20 +15,20 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE -#include <qregexp.h> -#include <qdir.h> +#include <ntqregexp.h> +#include <ntqdir.h> #include "kbconfig.h" #include "kbitem.h" #include "kbfileinfo.h" -/*KbFileInfo::KbFileInfo() : QFileInfo() +/*KbFileInfo::KbFileInfo() : TQFileInfo() { }*/ -KbFileInfo::KbFileInfo(QString workingdir) : QFileInfo(QDir(workingdir), ".") +KbFileInfo::KbFileInfo(TQString workingdir) : TQFileInfo(TQDir(workingdir), ".") { } @@ -36,13 +36,13 @@ KbFileInfo::KbFileInfo(QString workingdir) : QFileInfo(QDir(workingdir), ".") bool KbFileInfo::PrioritySort(KbFileInfo *f1, KbFileInfo *f2) //bool KbFileInfo::PrioritySort(const KbFileInfo &f1, const KbFileInfo &f2) { - QRegExp m_prioritylist(KbConfig::prioritylist()); + TQRegExp m_prioritylist(KbConfig::prioritylist()); if ((m_prioritylist.search(f1->fileName()) >= 0) > (m_prioritylist.search(f2->fileName()) >= 0)) return true; else return false; }; -KbFileInfo::KbFileInfo(QFileInfo qfi) : QFileInfo(qfi) +KbFileInfo::KbFileInfo(TQFileInfo qfi) : TQFileInfo(qfi) { m_date_int = qfi.lastModified().date().year() * 10000 + @@ -52,22 +52,22 @@ KbFileInfo::KbFileInfo(QFileInfo qfi) : QFileInfo(qfi) m_size = qfi.size(); } -KbFileInfo::KbFileInfo(const KbFileInfo& kfi) : QFileInfo(kfi) +KbFileInfo::KbFileInfo(const KbFileInfo& kfi) : TQFileInfo(kfi) { m_date_int = kfi.m_date_int; m_date = kfi.m_date; m_size = kfi.m_size; } -KbFileInfo::KbFileInfo(KbItem* item, QString workingdir) : QFileInfo(QDir(workingdir), item->File()) +KbFileInfo::KbFileInfo(KbItem* item, TQString workingdir) : TQFileInfo(TQDir(workingdir), item->File()) { m_date_int = item->DateInt(); m_date = item->Date(); m_size = item->Size(); } -KbFileInfo::KbFileInfo(const QString & d, const QString & fileName, off64_t size, QString date, unsigned int date_int) - : QFileInfo(QDir(d), fileName) +KbFileInfo::KbFileInfo(const TQString & d, const TQString & fileName, off64_t size, TQString date, unsigned int date_int) + : TQFileInfo(TQDir(d), fileName) { m_date_int = date_int; m_date = date; @@ -78,8 +78,8 @@ KbFileInfo::~KbFileInfo() { } -void KbFileInfo::SetDirPath(QString path) +void KbFileInfo::SetDirPath(TQString path) { - setFile(QDir(path), fileName()); + setFile(TQDir(path), fileName()); } diff --git a/src/kbfileinfo.h b/src/kbfileinfo.h index 79b60c4..6f0bd4a 100644 --- a/src/kbfileinfo.h +++ b/src/kbfileinfo.h @@ -12,35 +12,35 @@ #ifndef KBFILEINFO_H #define KBFILEINFO_H -#include <qfileinfo.h> +#include <ntqfileinfo.h> class KbItem; /** @author Magnus Kulke */ -class KbFileInfo : public QFileInfo +class KbFileInfo : public TQFileInfo { public: //KbFileInfo(); - KbFileInfo(QFileInfo qfi); + KbFileInfo(TQFileInfo qfi); KbFileInfo(const KbFileInfo& kfi); - KbFileInfo(QString workingdir); - KbFileInfo(KbItem* item, QString workingdir); - KbFileInfo(const QString & d, const QString & fileName, off64_t size, QString date, unsigned int date_int); + KbFileInfo(TQString workingdir); + KbFileInfo(KbItem* item, TQString workingdir); + KbFileInfo(const TQString & d, const TQString & fileName, off64_t size, TQString date, unsigned int date_int); ~KbFileInfo(); off64_t Size() { return m_size; }; - QString Date() { return m_date; }; + TQString Date() { return m_date; }; unsigned int DateInt() { return m_date_int; }; - void SetDirPath(QString path); + void SetDirPath(TQString path); void SetSize(off64_t size) { m_size = size; }; static bool PrioritySort(KbFileInfo *f1, KbFileInfo *f2); //static bool PrioritySort(const KbFileInfo &f1, const KbFileInfo &f2); private: off64_t m_size; unsigned int m_date_int; - QString m_date; + TQString m_date; }; #endif diff --git a/src/kbitem.cpp b/src/kbitem.cpp index 5978496..5082e0f 100644 --- a/src/kbitem.cpp +++ b/src/kbitem.cpp @@ -15,13 +15,13 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE -#include <qdatetime.h> +#include <ntqdatetime.h> #include "kbfileinfo.h" #include "kbitem.h" -KbItem::KbItem(KbFileInfo kfi, QListView* parent, QListViewItem* after) : QListViewItem(parent, after) +KbItem::KbItem(KbFileInfo kfi, TQListView* parent, TQListViewItem* after) : TQListViewItem(parent, after) { m_file = kfi.fileName(); m_path = kfi.dirPath(), @@ -30,11 +30,11 @@ KbItem::KbItem(KbFileInfo kfi, QListView* parent, QListViewItem* after) : QListV m_date_int = kfi.DateInt(); setText(0, m_file); - setText(1, QString::number(m_size)); + setText(1, TQString::number(m_size)); setText(2, m_date); } -KbItem::KbItem(QListView* parent, QListViewItem* after) : QListViewItem(parent, after) +KbItem::KbItem(TQListView* parent, TQListViewItem* after) : TQListViewItem(parent, after) { } @@ -42,7 +42,7 @@ KbItem::~KbItem() { } -int KbItem::compare(QListViewItem * i, int col, bool ascending) const +int KbItem::compare(TQListViewItem * i, int col, bool ascending) const { if ((this->rtti() == 1001) && (i->rtti() == 1002)) { @@ -71,6 +71,6 @@ int KbItem::compare(QListViewItem * i, int col, bool ascending) const if (x < y) return -1; if (x > y) return 1; } - return QListViewItem::compare(i, col, ascending); + return TQListViewItem::compare(i, col, ascending); } diff --git a/src/kbitem.h b/src/kbitem.h index ee390be..f4ff79f 100644 --- a/src/kbitem.h +++ b/src/kbitem.h @@ -12,14 +12,14 @@ #ifndef KBITEM_H #define KBITEM_H -#include <qlistview.h> +#include <ntqlistview.h> class KbFileInfo; /** @author mkulke */ -class KbItem : public QListViewItem +class KbItem : public TQListViewItem { public: enum entrytype @@ -27,23 +27,23 @@ public: dir = 1001, file }; - KbItem(KbFileInfo kfi, QListView* parent, QListViewItem* after); - KbItem(QListView* parent, QListViewItem* after); - int compare (QListViewItem * i, int col, bool ascending) const; + KbItem(KbFileInfo kfi, TQListView* parent, TQListViewItem* after); + KbItem(TQListView* parent, TQListViewItem* after); + int compare (TQListViewItem * i, int col, bool ascending) const; ~KbItem(); - QString File() { return m_file; }; - QString Path() { return m_path; }; - QString Date() { return m_date; }; + TQString File() { return m_file; }; + TQString Path() { return m_path; }; + TQString Date() { return m_date; }; unsigned int DateInt() { return m_date_int; }; off64_t Size() { return m_size; }; protected: - QString m_path; - QString m_date; + TQString m_path; + TQString m_date; off64_t m_size; unsigned int m_date_int; - QString m_file; + TQString m_file; }; diff --git a/src/kbsiteinfo.cpp b/src/kbsiteinfo.cpp index 63ba875..353f9a4 100644 --- a/src/kbsiteinfo.cpp +++ b/src/kbsiteinfo.cpp @@ -13,10 +13,10 @@ #include <kstandarddirs.h> -#include <qdom.h> -#include <qfile.h> -#include <qdir.h> -#include <qtextstream.h> +#include <ntqdom.h> +#include <ntqfile.h> +#include <ntqdir.h> +#include <ntqtextstream.h> #include "kbsiteinfo.h" @@ -54,9 +54,9 @@ list<KbSiteInfo> KbSiteInfo::ParseBookmarks() list<KbSiteInfo> bookmarks; bookmarks.clear(); - QDomDocument doc( "KasablancaBookmarks" ); + TQDomDocument doc( "KasablancaBookmarks" ); - QFile filein(locateLocal("appdata", "bookmarks.xml")); + TQFile filein(locateLocal("appdata", "bookmarks.xml")); if( !filein.open( IO_ReadOnly ) ) return bookmarks; @@ -68,15 +68,15 @@ list<KbSiteInfo> KbSiteInfo::ParseBookmarks() filein.close(); - QDomElement root = doc.documentElement(); + TQDomElement root = doc.documentElement(); if( root.tagName() != "kasablanca" ) return bookmarks; - QDomNode curNode = root.firstChild(); + TQDomNode curNode = root.firstChild(); while( !curNode.isNull() ) { - QDomElement siteElement = curNode.toElement(); + TQDomElement siteElement = curNode.toElement(); if( !siteElement.isNull() ) { @@ -90,11 +90,11 @@ list<KbSiteInfo> KbSiteInfo::ParseBookmarks() entry.SetDefaultDirectory(""); entry.SetName(siteElement.attribute( "name", "" )); - QDomNode siteNode = siteElement.firstChild(); + TQDomNode siteNode = siteElement.firstChild(); while( !siteNode.isNull() ) { - QDomElement curElement = siteNode.toElement(); + TQDomElement curElement = siteNode.toElement(); if( !curElement.isNull() ) { @@ -123,8 +123,8 @@ list<KbSiteInfo> KbSiteInfo::ParseBookmarks() bool KbSiteInfo::WriteBookmarks(list<KbSiteInfo> bookmarks) { - QDomDocument doc( "KasablancaBookmarks" ); - QDomElement root = doc.createElement( "kasablanca" ); + TQDomDocument doc( "KasablancaBookmarks" ); + TQDomElement root = doc.createElement( "kasablanca" ); doc.appendChild( root ); list<KbSiteInfo>::iterator end_bookmarks = bookmarks.end(); @@ -132,12 +132,12 @@ bool KbSiteInfo::WriteBookmarks(list<KbSiteInfo> bookmarks) { if ((*i).IsLegit()) { - QDomElement siteElement = doc.createElement("site"); + TQDomElement siteElement = doc.createElement("site"); siteElement.setAttribute("name", (*i).GetName()); root.appendChild( siteElement ); - QDomText text; - QDomElement curElement; + TQDomText text; + TQDomElement curElement; curElement = doc.createElement( "user" ); siteElement.appendChild( curElement ); @@ -156,22 +156,22 @@ bool KbSiteInfo::WriteBookmarks(list<KbSiteInfo> bookmarks) curElement = doc.createElement( "pasv" ); siteElement.appendChild( curElement ); - text = doc.createTextNode(QString::number((*i).GetPasv())); + text = doc.createTextNode(TQString::number((*i).GetPasv())); curElement.appendChild(text); curElement = doc.createElement( "tls" ); siteElement.appendChild( curElement ); - text = doc.createTextNode(QString::number((*i).GetTls())); + text = doc.createTextNode(TQString::number((*i).GetTls())); curElement.appendChild(text); curElement = doc.createElement( "alternativefxp" ); siteElement.appendChild( curElement ); - text = doc.createTextNode(QString::number((*i).GetAlternativeFxp())); + text = doc.createTextNode(TQString::number((*i).GetAlternativeFxp())); curElement.appendChild(text); curElement = doc.createElement( "correctpasv" ); siteElement.appendChild( curElement ); - text = doc.createTextNode(QString::number((*i).GetCorrectPasv())); + text = doc.createTextNode(TQString::number((*i).GetCorrectPasv())); curElement.appendChild(text); curElement = doc.createElement( "defaultdirectory" ); @@ -181,11 +181,11 @@ bool KbSiteInfo::WriteBookmarks(list<KbSiteInfo> bookmarks) } } - QFile fileout(locateLocal("appdata", "bookmarks.xml")); + TQFile fileout(locateLocal("appdata", "bookmarks.xml")); if( !fileout.open( IO_WriteOnly ) ) return false; - QTextStream ts( &fileout ); + TQTextStream ts( &fileout ); ts << doc.toString(); fileout.close(); diff --git a/src/kbsiteinfo.h b/src/kbsiteinfo.h index 573ae89..a49a22a 100644 --- a/src/kbsiteinfo.h +++ b/src/kbsiteinfo.h @@ -12,7 +12,7 @@ #ifndef KBSITEINFO_H #define KBSITEINFO_H -#include <qstring.h> +#include <ntqstring.h> #include <list> @@ -27,35 +27,35 @@ class KbSiteInfo public: KbSiteInfo(); ~KbSiteInfo(); - QString GetInfo() { return m_info; }; - QString GetUser() { return m_user; }; - QString GetPass() { return m_pass; }; - QString GetName() { return m_name; }; - QString GetDefaultDirectory() { return m_defaultdir; }; + TQString GetInfo() { return m_info; }; + TQString GetUser() { return m_user; }; + TQString GetPass() { return m_pass; }; + TQString GetName() { return m_name; }; + TQString GetDefaultDirectory() { return m_defaultdir; }; int GetAlternativeFxp() { return m_altfxp; }; int GetCorrectPasv() { return m_correctpasv; }; int GetPasv() { return m_pasv; }; int GetTls() { return m_tls; }; void SetPasv(int pasv) { m_pasv = pasv; }; void SetTls(int tls) { m_tls = tls; }; - void SetDefaultDirectory(QString path) { m_defaultdir = path; }; + void SetDefaultDirectory(TQString path) { m_defaultdir = path; }; void SetAlternativeFxp(int i) { m_altfxp = i; }; void SetCorrectPasv(int i) { m_correctpasv = i; }; - void SetUser(QString user) { m_user = user; }; - void SetInfo(QString info) { m_info = info; }; - void SetPass(QString pass) { m_pass = pass; }; - void SetName(QString name) { m_name = name; }; + void SetUser(TQString user) { m_user = user; }; + void SetInfo(TQString info) { m_info = info; }; + void SetPass(TQString pass) { m_pass = pass; }; + void SetName(TQString name) { m_name = name; }; bool IsLegit(); static list<KbSiteInfo> ParseBookmarks(); static bool WriteBookmarks(const list<KbSiteInfo> bookmarks); void Clear(); private: list<KbSiteInfo> goo; - QString m_user; - QString m_info; - QString m_name; - QString m_pass; - QString m_defaultdir; + TQString m_user; + TQString m_info; + TQString m_name; + TQString m_pass; + TQString m_defaultdir; int m_altfxp; int m_correctpasv; int m_pasv; diff --git a/src/kbstatustip.cpp b/src/kbstatustip.cpp index cb50edf..5cc99f6 100644 --- a/src/kbstatustip.cpp +++ b/src/kbstatustip.cpp @@ -10,25 +10,25 @@ // // -#include <qcursor.h> +#include <ntqcursor.h> #include "kbstatustip.h" -KbStatusTip::KbStatusTip(QWidget * widget) : QToolTip(widget) +KbStatusTip::KbStatusTip(TQWidget * widget) : TQToolTip(widget) { } -void KbStatusTip::maybeTip(const QPoint &) +void KbStatusTip::maybeTip(const TQPoint &) { tip(parentWidget()->rect(), "kasablanca"); } -void KbStatusTip::ShowStatus(QString msg) +void KbStatusTip::ShowStatus(TQString msg) { - if ((QCursor::pos().x() > parentWidget()->mapToGlobal(parentWidget()->pos()).x()) - && (QCursor::pos().y() > parentWidget()->mapToGlobal(parentWidget()->pos()).y()) - && (QCursor::pos().x() < (parentWidget()->mapToGlobal(parentWidget()->pos()).x() + parentWidget()->width())) - && (QCursor::pos().y() < (parentWidget()->mapToGlobal(parentWidget()->pos()).y() + parentWidget()->height()))) + if ((TQCursor::pos().x() > parentWidget()->mapToGlobal(parentWidget()->pos()).x()) + && (TQCursor::pos().y() > parentWidget()->mapToGlobal(parentWidget()->pos()).y()) + && (TQCursor::pos().x() < (parentWidget()->mapToGlobal(parentWidget()->pos()).x() + parentWidget()->width())) + && (TQCursor::pos().y() < (parentWidget()->mapToGlobal(parentWidget()->pos()).y() + parentWidget()->height()))) { tip(parentWidget()->rect(), msg); } diff --git a/src/kbstatustip.h b/src/kbstatustip.h index 1fec765..26a3c01 100644 --- a/src/kbstatustip.h +++ b/src/kbstatustip.h @@ -12,17 +12,17 @@ #ifndef KBSTATUSTIP_H #define KBSTATUSTIP_H -#include <qtooltip.h> +#include <ntqtooltip.h> /** @author Magnus Kulke */ -class KbStatusTip : public QToolTip +class KbStatusTip : public TQToolTip { public: - KbStatusTip(QWidget * widget); - void maybeTip(const QPoint &pos); - void ShowStatus(QString msg); + KbStatusTip(TQWidget * widget); + void maybeTip(const TQPoint &pos); + void ShowStatus(TQString msg); }; #endif diff --git a/src/kbtaskview.cpp b/src/kbtaskview.cpp index d1f6cc1..83f62bb 100644 --- a/src/kbtaskview.cpp +++ b/src/kbtaskview.cpp @@ -11,16 +11,16 @@ // -#include <klocale.h> +#include <tdelocale.h> -#include <qptrlist.h> -#include <qevent.h> +#include <ntqptrlist.h> +#include <ntqevent.h> #include "kbtaskview.h" #include "kbfileinfo.h" #include "kbtransferitem.h" -KbTaskView::KbTaskView(QWidget *parent, const char *name) +KbTaskView::KbTaskView(TQWidget *parent, const char *name) : KListView(parent, name) { addColumn(i18n("Task")); @@ -30,22 +30,22 @@ KbTaskView::KbTaskView(QWidget *parent, const char *name) addColumn(i18n("Remaining")); setRootIsDecorated(true); - setSelectionMode(QListView::Extended); + setSelectionMode(TQListView::Extended); setDragEnabled(true); setAcceptDrops(true); - //connect(this, SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int)), - // this, SLOT(SLOT_DoubleClicked(QListViewItem*, const QPoint&, int))); + //connect(this, SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + // this, SLOT(SLOT_DoubleClicked(TQListViewItem*, const TQPoint&, int))); } KbTaskView::~KbTaskView() { } -QListViewItem* KbTaskView::LastChild() +TQListViewItem* KbTaskView::LastChild() { - QListViewItem* last = NULL; - QListViewItem* it = lastItem(); + TQListViewItem* last = NULL; + TQListViewItem* it = lastItem(); while (it) { last = it; @@ -54,11 +54,11 @@ QListViewItem* KbTaskView::LastChild() return last; } -void KbTaskView::SLOT_DoubleClicked(QListViewItem* item, const QPoint&, int) +void KbTaskView::SLOT_DoubleClicked(TQListViewItem* item, const TQPoint&, int) { KbTransferItem *kti = static_cast<KbTransferItem*>(item); - qWarning("src: %s|%s", kti->SrcFileInfo()->filePath().latin1(), kti->SrcFileInfo()->fileName().latin1()); - qWarning("dst: %s|%s", kti->DstFileInfo()->filePath().latin1(), kti->DstFileInfo()->fileName().latin1()); + tqWarning("src: %s|%s", kti->SrcFileInfo()->filePath().latin1(), kti->SrcFileInfo()->fileName().latin1()); + tqWarning("dst: %s|%s", kti->DstFileInfo()->filePath().latin1(), kti->DstFileInfo()->fileName().latin1()); } #include "kbtaskview.moc" diff --git a/src/kbtaskview.h b/src/kbtaskview.h index 79d1ec9..71e47b7 100644 --- a/src/kbtaskview.h +++ b/src/kbtaskview.h @@ -21,13 +21,13 @@ class KbTaskView : public KListView { Q_OBJECT public: - KbTaskView(QWidget *parent = 0, const char *name = 0); + KbTaskView(TQWidget *parent = 0, const char *name = 0); ~KbTaskView(); - QListViewItem* LastChild(); + TQListViewItem* LastChild(); public slots: - void SLOT_DoubleClicked(QListViewItem* item, const QPoint& p, int c); - //virtual bool acceptDrag(QDropEvent* event) const; - //virtual QDragObject* dragObject(); + void SLOT_DoubleClicked(TQListViewItem* item, const TQPoint& p, int c); + //virtual bool acceptDrag(TQDropEvent* event) const; + //virtual TQDragObject* dragObject(); }; #endif diff --git a/src/kbtransferdir.cpp b/src/kbtransferdir.cpp index 7104715..27316e8 100644 --- a/src/kbtransferdir.cpp +++ b/src/kbtransferdir.cpp @@ -20,14 +20,14 @@ #include "kbtransferdir.h" -KbTransferDir::KbTransferDir(QListView *taskview, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : KbTransferItem(taskview, after, srcsession, dstsession, src, dst) +KbTransferDir::KbTransferDir(TQListView *taskview, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : KbTransferItem(taskview, after, srcsession, dstsession, src, dst) { - setPixmap(0, KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("folder",TDEIcon::Small)); } -KbTransferDir::KbTransferDir(QListViewItem *root, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : KbTransferItem(root, after, srcsession, dstsession, src, dst) +KbTransferDir::KbTransferDir(TQListViewItem *root, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : KbTransferItem(root, after, srcsession, dstsession, src, dst) { - setPixmap(0, KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("folder",TDEIcon::Small)); } KbTransferDir::~KbTransferDir() @@ -41,11 +41,11 @@ int KbTransferDir::rtti() const void KbTransferDir::Info() { - qWarning("INFO: transfer dir from %s to %s", mp_srcsession->name(), mp_dstsession->name()); - qWarning("INFO: mp_src->fileName() = %s", mp_src->fileName().latin1()); - qWarning("INFO: mp_dst->fileName() = %s", mp_dst->fileName().latin1()); - qWarning("INFO: mp_src->dirPath() = %s", mp_src->dirPath(true).latin1()); - qWarning("INFO: mp_dst->dirPath() = %s", mp_dst->dirPath(true).latin1()); + tqWarning("INFO: transfer dir from %s to %s", mp_srcsession->name(), mp_dstsession->name()); + tqWarning("INFO: mp_src->fileName() = %s", mp_src->fileName().latin1()); + tqWarning("INFO: mp_dst->fileName() = %s", mp_dst->fileName().latin1()); + tqWarning("INFO: mp_src->dirPath() = %s", mp_src->dirPath(true).latin1()); + tqWarning("INFO: mp_dst->dirPath() = %s", mp_dst->dirPath(true).latin1()); } diff --git a/src/kbtransferdir.h b/src/kbtransferdir.h index 643cccd..121f0da 100644 --- a/src/kbtransferdir.h +++ b/src/kbtransferdir.h @@ -28,8 +28,8 @@ class KbTransferDir : public KbTransferItem { public: - KbTransferDir(QListView *taskview, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst); - KbTransferDir(QListViewItem *root, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst); + KbTransferDir(TQListView *taskview, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst); + KbTransferDir(TQListViewItem *root, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst); ~KbTransferDir(); int rtti() const; void Info(); diff --git a/src/kbtransferfile.cpp b/src/kbtransferfile.cpp index d8e158e..b55ba1b 100644 --- a/src/kbtransferfile.cpp +++ b/src/kbtransferfile.cpp @@ -23,25 +23,25 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE -#include <qpainter.h> -#include <qcolor.h> +#include <ntqpainter.h> +#include <ntqcolor.h> #include "kbstatustip.h" #include "kbsiteinfo.h" #include "kbtransferfile.h" -KbTransferFile::KbTransferFile(QListView *taskview, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : KbTransferItem(taskview, after, srcsession, dstsession, src, dst) +KbTransferFile::KbTransferFile(TQListView *taskview, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : KbTransferItem(taskview, after, srcsession, dstsession, src, dst) { - setPixmap(0, KGlobal::iconLoader()->loadIcon("files",KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("files",TDEIcon::Small)); m_time_old = -1; m_xfered_old = 0; m_percentage = 0; } -KbTransferFile::KbTransferFile(QListViewItem *root, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : KbTransferItem(root, after, srcsession, dstsession, src, dst) +KbTransferFile::KbTransferFile(TQListViewItem *root, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : KbTransferItem(root, after, srcsession, dstsession, src, dst) { - setPixmap(0, KGlobal::iconLoader()->loadIcon("files",KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("files",TDEIcon::Small)); m_time_old = -1; m_xfered_old = 0; } @@ -57,11 +57,11 @@ int KbTransferFile::rtti() const void KbTransferFile::Info() { - qWarning("INFO: transfer file from %s to %s", mp_srcsession->name(), mp_dstsession->name()); - qWarning("INFO: mp_src->fileName() = %s", mp_src->fileName().latin1()); - qWarning("INFO: mp_dst->fileName() = %s", mp_dst->fileName().latin1()); - qWarning("INFO: mp_src->dirPath() = %s", mp_src->dirPath(true).latin1()); - qWarning("INFO: mp_dst->dirPath() = %s", mp_dst->dirPath(true).latin1()); + tqWarning("INFO: transfer file from %s to %s", mp_srcsession->name(), mp_dstsession->name()); + tqWarning("INFO: mp_src->fileName() = %s", mp_src->fileName().latin1()); + tqWarning("INFO: mp_dst->fileName() = %s", mp_dst->fileName().latin1()); + tqWarning("INFO: mp_src->dirPath() = %s", mp_src->dirPath(true).latin1()); + tqWarning("INFO: mp_dst->dirPath() = %s", mp_dst->dirPath(true).latin1()); } void KbTransferFile::ShowProgress(KbStatusTip *statustip) @@ -80,41 +80,41 @@ void KbTransferFile::ShowProgress(KbStatusTip *statustip) if ((mp_srcsession->Connected()) && (mp_dstsession->Connected())) { - setText(1, "unknown kb of " + QString::number(wholesize) + "kb"); + setText(1, "unknown kb of " + TQString::number(wholesize) + "kb"); setText(2, "unknown kb/s"); setText(4, "unknown"); } else { - setText(1, QString::number(currentsize) + "kb of " + QString::number(wholesize) + "kb"); - setText(2, QString::number(speed) + "kb/s"); - setText(4, QString::number(remaining / 3600) + "h" + QString::number(remaining / 60) + "m" + QString::number(remaining % 60) + "s"); + setText(1, TQString::number(currentsize) + "kb of " + TQString::number(wholesize) + "kb"); + setText(2, TQString::number(speed) + "kb/s"); + setText(4, TQString::number(remaining / 3600) + "h" + TQString::number(remaining / 60) + "m" + TQString::number(remaining % 60) + "s"); } m_time_old = time; m_xfered_old = m_xfered; statustip->ShowStatus(mp_src->fileName() - + "," + QString::number(m_percentage) + "%," + QString::number(speed) + "kb/s"); + + "," + TQString::number(m_percentage) + "%," + TQString::number(speed) + "kb/s"); - //QToolTip::add(systemtray, mp_src->fileName() - //+ "," + QString::number(percentage) + "%," + QString::number(speed) + "kb/s"); + //TQToolTip::add(systemtray, mp_src->fileName() + //+ "," + TQString::number(percentage) + "%," + TQString::number(speed) + "kb/s"); } -void KbTransferFile::paintCell( QPainter *painter, const QColorGroup &colorGroup, int column, +void KbTransferFile::paintCell( TQPainter *painter, const TQColorGroup &colorGroup, int column, int width, int alignment ) { if ((column == 3) && (m_xfered_old != 0) && ((!mp_srcsession->Connected()) || (!mp_dstsession->Connected()))) PaintPercentageBar (painter, width); - else QListViewItem::paintCell(painter, colorGroup, column, width, alignment); + else TQListViewItem::paintCell(painter, colorGroup, column, width, alignment); } -void KbTransferFile::PaintPercentageBar(QPainter * painter, int width) +void KbTransferFile::PaintPercentageBar(TQPainter * painter, int width) { int len = width * m_percentage / 100; - painter->fillRect(0, 0, width, height(), Qt::lightGray); - painter->fillRect(0, 0, len, height(), Qt::gray); - painter->drawText((width / 2) - 10, height() - 5, QString::number(m_percentage) + "%"); + painter->fillRect(0, 0, width, height(), TQt::lightGray); + painter->fillRect(0, 0, len, height(), TQt::gray); + painter->drawText((width / 2) - 10, height() - 5, TQString::number(m_percentage) + "%"); } diff --git a/src/kbtransferfile.h b/src/kbtransferfile.h index 5b2030a..a345428 100644 --- a/src/kbtransferfile.h +++ b/src/kbtransferfile.h @@ -30,8 +30,8 @@ class KbStatusTip; class KbTransferFile : public KbTransferItem { public: - KbTransferFile(QListView *taskview, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst); - KbTransferFile(QListViewItem *root, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst); + KbTransferFile(TQListView *taskview, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst); + KbTransferFile(TQListViewItem *root, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst); ~KbTransferFile(); int rtti() const; void Info(); @@ -40,9 +40,9 @@ private: int m_time_old; off64_t m_xfered_old; int m_percentage; - virtual void paintCell( QPainter *painter, const QColorGroup &colorGroup, int column, + virtual void paintCell( TQPainter *painter, const TQColorGroup &colorGroup, int column, int width, int alignment ); - void PaintPercentageBar(QPainter *painter, int width); + void PaintPercentageBar(TQPainter *painter, int width); }; #endif diff --git a/src/kbtransferitem.cpp b/src/kbtransferitem.cpp index cb4c254..d656390 100644 --- a/src/kbtransferitem.cpp +++ b/src/kbtransferitem.cpp @@ -22,7 +22,7 @@ #include "kbtransferitem.h" -KbTransferItem::KbTransferItem(QListView *taskview, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : QListViewItem(taskview, after) +KbTransferItem::KbTransferItem(TQListView *taskview, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : TQListViewItem(taskview, after) { mp_srcsession = srcsession; mp_dstsession = dstsession; @@ -35,7 +35,7 @@ KbTransferItem::KbTransferItem(QListView *taskview, QListViewItem *after, FtpSes setText(0, src->fileName()); } -KbTransferItem::KbTransferItem(QListViewItem *root, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : QListViewItem(root, after) +KbTransferItem::KbTransferItem(TQListViewItem *root, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo *src, KbFileInfo *dst) : TQListViewItem(root, after) { mp_srcsession = srcsession; mp_dstsession = dstsession; diff --git a/src/kbtransferitem.h b/src/kbtransferitem.h index 4744ff4..00f3fb9 100644 --- a/src/kbtransferitem.h +++ b/src/kbtransferitem.h @@ -21,9 +21,9 @@ #define TRANSFERITEM_H #include <kiconloader.h> -#include <kglobal.h> -#include <qlistview.h> -#include <qfileinfo.h> +#include <tdeglobal.h> +#include <ntqlistview.h> +#include <ntqfileinfo.h> #include "ftpsession.h" #include "kbfileinfo.h" @@ -34,7 +34,7 @@ class KbStatusTip; /** @author Magnus Kulke */ -class KbTransferItem : public QListViewItem +class KbTransferItem : public TQListViewItem { public: enum type @@ -42,8 +42,8 @@ public: file = 1001, dir }; - KbTransferItem(QListViewItem *root, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo* src, KbFileInfo* dst); - KbTransferItem(QListView *taskview, QListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo* src, KbFileInfo* dst); + KbTransferItem(TQListViewItem *root, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo* src, KbFileInfo* dst); + KbTransferItem(TQListView *taskview, TQListViewItem *after, FtpSession *srcsession, FtpSession *dstsession, KbFileInfo* src, KbFileInfo* dst); ~KbTransferItem(); virtual void Info(); @@ -73,7 +73,7 @@ protected: int m_status; bool m_transfererror; off64_t m_xfered; - QTime m_time; + TQTime m_time; }; #endif diff --git a/src/main.cpp b/src/main.cpp index 834d499..1f12140 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,16 +5,16 @@ #include "kasablanca.h" #include <kapplication.h> #include <dcopclient.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> -#include <klocale.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("A KDE Ftp Client"); static const char version[] = "0.4.0.2"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { // { "+[URL]", I18N_NOOP( "Document to open." ), 0 }, KCmdLineLastOption @@ -24,16 +24,16 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("kasablanca"); - KAboutData about("kasablanca", I18N_NOOP("kasablanca"), version, description, - KAboutData::License_GPL, "(C) 2004 Magnus Kulke", 0, 0, + TDEAboutData about("kasablanca", I18N_NOOP("kasablanca"), version, description, + TDEAboutData::License_GPL, "(C) 2004 Magnus Kulke", 0, 0, "sikor_sxe@radicalapproach.de"); about.addAuthor( "Magnus Kulke", 0, "sikor_sxe@radicalapproach.de" ); about.addAuthor( "Big Biff", 0, "bigbiff@chunkyfilms.org" ); about.addCredit( "Stefan Bogner", 0, "bochi@online.ms" ); about.addCredit( "Christoph Thielecke", 0, "u15119@hs-harz.de" ); about.addCredit( "Richard Stellingwerf", 0, "justremenic@hotmail.com" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; // register ourselves as a dcop client @@ -47,7 +47,7 @@ int main(int argc, char **argv) else { // no session.. just start up normally - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() == 0) { Kasablanca *widget = new Kasablanca; |