diff options
Diffstat (limited to 'kget')
52 files changed, 464 insertions, 432 deletions
diff --git a/kget/dlgAdvanced.cpp b/kget/dlgAdvanced.cpp index e4dee980..1fb2ebaa 100644 --- a/kget/dlgAdvanced.cpp +++ b/kget/dlgAdvanced.cpp @@ -38,8 +38,8 @@ -DlgAdvanced::DlgAdvanced(TQWidget * parent) - : DlgAdvancedBase(parent) +DlgAdvanced::DlgAdvanced(TQWidget * tqparent) + : DlgAdvancedBase(tqparent) { cb_partial->hide(); } diff --git a/kget/dlgAdvanced.h b/kget/dlgAdvanced.h index 19c2e3f5..c7fdb797 100644 --- a/kget/dlgAdvanced.h +++ b/kget/dlgAdvanced.h @@ -31,11 +31,12 @@ class DlgAdvanced : public DlgAdvancedBase { -Q_OBJECT + Q_OBJECT + TQ_OBJECT public: - DlgAdvanced(TQWidget * parent); + DlgAdvanced(TQWidget * tqparent); ~DlgAdvanced() {} void applyData(); diff --git a/kget/dlgAutomation.cpp b/kget/dlgAutomation.cpp index 779cacf3..01762aa1 100644 --- a/kget/dlgAutomation.cpp +++ b/kget/dlgAutomation.cpp @@ -42,8 +42,8 @@ #include "dlgAutomation.h" -DlgAutomation::DlgAutomation(TQWidget * parent) - : DlgAutomationBase(parent) +DlgAutomation::DlgAutomation(TQWidget * tqparent) + : DlgAutomationBase(tqparent) { } diff --git a/kget/dlgAutomation.h b/kget/dlgAutomation.h index 2a236094..ada27c45 100644 --- a/kget/dlgAutomation.h +++ b/kget/dlgAutomation.h @@ -36,9 +36,12 @@ class DlgAutomation:public DlgAutomationBase { -Q_OBJECT public: + Q_OBJECT + TQ_OBJECT - DlgAutomation(TQWidget * parent); +public: + + DlgAutomation(TQWidget * tqparent); ~DlgAutomation() {} void applyData(); void setData(); diff --git a/kget/dlgConnection.cpp b/kget/dlgConnection.cpp index 5530953b..0fa68b09 100644 --- a/kget/dlgConnection.cpp +++ b/kget/dlgConnection.cpp @@ -42,8 +42,8 @@ #include "dlgConnection.h" -DlgConnection::DlgConnection(TQWidget * parent) - :DlgConnectionBase(parent, "", 0) +DlgConnection::DlgConnection(TQWidget * tqparent) + :DlgConnectionBase(tqparent, "", 0) { // TODO: these are not supported yet, so hide them gb_timeout->hide(); diff --git a/kget/dlgConnection.h b/kget/dlgConnection.h index d4fa58a1..73229d61 100644 --- a/kget/dlgConnection.h +++ b/kget/dlgConnection.h @@ -35,9 +35,12 @@ class DlgConnection : public DlgConnectionBase { -Q_OBJECT public: + Q_OBJECT + TQ_OBJECT - DlgConnection(TQWidget * parent); +public: + + DlgConnection(TQWidget * tqparent); ~DlgConnection() {} void applyData(); void setData(); diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp index a373cc67..7d429757 100644 --- a/kget/dlgDirectories.cpp +++ b/kget/dlgDirectories.cpp @@ -42,8 +42,8 @@ #include "dlgDirectories.h" #include <kapplication.h> -DlgDirectories::DlgDirectories(TQWidget * parent) - : DlgDirectoriesBase(parent) +DlgDirectories::DlgDirectories(TQWidget * tqparent) + : DlgDirectoriesBase(tqparent) { connect( le_ext, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotDirectoryChanged( ) ) ); connect( le_dir, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotDirectoryChanged( ) ) ); @@ -86,7 +86,7 @@ void DlgDirectories::addEntry() TQString ext = le_ext->text(); TQString dir = le_dir->url(); - if (ext.contains(",") || dir.contains(",") || ext.isEmpty() || dir.isEmpty()) { + if (ext.tqcontains(",") || dir.tqcontains(",") || ext.isEmpty() || dir.isEmpty()) { KMessageBox::error(this, i18n("Each row consists of exactly one\nextension type and one folder."), i18n("Error")); return; } @@ -94,7 +94,7 @@ void DlgDirectories::addEntry() TQDir f(dir); if (!f.exists()) { - KMessageBox::error(this, i18n("Folder does not exist:\n%1").arg(dir), i18n("Error")); + KMessageBox::error(this, i18n("Folder does not exist:\n%1").tqarg(dir), i18n("Error")); return; } @@ -122,7 +122,7 @@ void DlgDirectories::changeEntry() TQString ext = le_ext->text(); TQString dir = le_dir->url(); - if (ext.contains(",") || dir.contains(",") || ext.isEmpty() || dir.isEmpty()) { + if (ext.tqcontains(",") || dir.tqcontains(",") || ext.isEmpty() || dir.isEmpty()) { KMessageBox::error(this, i18n("Each row consists of exactly one\nextension type and one folder."), i18n("Error")); return; } @@ -130,7 +130,7 @@ void DlgDirectories::changeEntry() TQDir f(dir); if (!f.exists()) { - KMessageBox::error(this, i18n("Folder does not exist:\n%1").arg(dir), i18n("Error")); + KMessageBox::error(this, i18n("Folder does not exist:\n%1").tqarg(dir), i18n("Error")); return; } diff --git a/kget/dlgDirectories.h b/kget/dlgDirectories.h index 8d3c1cf5..77e19a55 100644 --- a/kget/dlgDirectories.h +++ b/kget/dlgDirectories.h @@ -33,11 +33,12 @@ class DlgDirectories : public DlgDirectoriesBase { -Q_OBJECT + Q_OBJECT + TQ_OBJECT public: - DlgDirectories(TQWidget * parent); + DlgDirectories(TQWidget * tqparent); ~DlgDirectories() {} void applyData(); void setData(); diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp index 9cb9690c..b61f7c72 100644 --- a/kget/dlgIndividual.cpp +++ b/kget/dlgIndividual.cpp @@ -63,7 +63,7 @@ DlgIndividual::DlgIndividual(Transfer * _item) // Actions - m_paDock = new KToggleAction(i18n("&Dock"),"tool_dock.png", 0, this, TQT_SLOT(slotToggleDock()), this, "dockIndividual"); + m_paDock = new KToggleAction(i18n("&Dock"),"tool_dock.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDock()), TQT_TQOBJECT(this), "dockIndividual"); TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),KDialog::spacingHint() ); @@ -162,9 +162,9 @@ DlgIndividual::DlgIndividual(Transfer * _item) // otherwise set it to the current time TQDateTime dt; - if (item->getStartTime() < TQDateTime::currentDateTime() && item->getMode() != Transfer::MD_SCHEDULED) + if (item->getStartTime() < TQDateTime::tqcurrentDateTime() && item->getMode() != Transfer::MD_SCHEDULED) { - dt = TQDateTime::currentDateTime(); + dt = TQDateTime::tqcurrentDateTime(); } else { @@ -182,14 +182,14 @@ DlgIndividual::DlgIndividual(Transfer * _item) ml_log = new TQTextEdit(panelAdvanced); ml_log->setTextFormat(LogText); ml_log->setReadOnly(true); - // ml_log->setFixedSize(sizeHint()); + // ml_log->setFixedSize(tqsizeHint()); ml_log->setVScrollBarMode(TQScrollView::Auto); ml_log->setWordWrap(TQTextEdit::NoWrap); - // ml_log->setSizePolicy(policy); + // ml_log->tqsetSizePolicy(policy); panelAdvanced->addTab(ml_log, i18n("Log")); - // panelAdvanced->setFixedSize(sizeHint()); + // panelAdvanced->setFixedSize(tqsizeHint()); @@ -197,7 +197,7 @@ DlgIndividual::DlgIndividual(Transfer * _item) advanced = ksettings.b_advancedIndividual; slotToggleAdvanced(); - resize( minimumSizeHint() ); + resize( tqminimumSizeHint() ); setMaximumHeight( height() ); //bool keepOpenChecked = false; @@ -218,13 +218,13 @@ void DlgIndividual::setPercent(unsigned long percent) { m_pProgressBar->setValue(percent); m_pDockIndividual->setValue(percent); - setCaption(i18n("%1% of %2 - %3").arg(percent).arg(KIO::convertSize(m_iTotalSize)).arg(m_location.fileName())); + setCaption(i18n("%1% of %2 - %3").tqarg(percent).tqarg(KIO::convertSize(m_iTotalSize)).tqarg(m_location.fileName())); } void DlgIndividual::setProcessedSize(KIO::filesize_t bytes) { - sizeLabel->setText(i18n("%1 of %2").arg(KIO::convertSize(bytes)).arg(KIO::convertSize(m_iTotalSize))); + sizeLabel->setText(i18n("%1 of %2").tqarg(KIO::convertSize(bytes)).tqarg(KIO::convertSize(m_iTotalSize))); } @@ -315,7 +315,7 @@ void DlgIndividual::slotKeepOpenToggled(bool bToggled) bKeepDlgOpen=bToggled; - if (!bKeepDlgOpen && item->getStatus()==Transfer::ST_FINISHED) + if (!bKeepDlgOpen && item->gettqStatus()==Transfer::ST_FINISHED) { hide(); m_pDockIndividual->hide(); diff --git a/kget/dlgIndividual.h b/kget/dlgIndividual.h index 49ee3038..c619ad0e 100644 --- a/kget/dlgIndividual.h +++ b/kget/dlgIndividual.h @@ -47,9 +47,10 @@ class KDateTimeWidget; class DockIndividual; -class DlgIndividual:public QWidget +class DlgIndividual:public TQWidget { -Q_OBJECT + Q_OBJECT + TQ_OBJECT public: DlgIndividual(Transfer * _item); ~DlgIndividual() diff --git a/kget/dlgLimits.cpp b/kget/dlgLimits.cpp index 8c6ded6d..c37c0023 100644 --- a/kget/dlgLimits.cpp +++ b/kget/dlgLimits.cpp @@ -37,8 +37,8 @@ #include "dlgLimits.h" -DlgLimits::DlgLimits(TQWidget * parent) - : DlgLimitsBase(parent) +DlgLimits::DlgLimits(TQWidget * tqparent) + : DlgLimitsBase(tqparent) { // TODO: these are not supported yet, so hide them lb_maxband->hide(); diff --git a/kget/dlgLimits.h b/kget/dlgLimits.h index 0c4aaa6f..b8a25a79 100644 --- a/kget/dlgLimits.h +++ b/kget/dlgLimits.h @@ -33,9 +33,12 @@ class DlgLimits : public DlgLimitsBase { -Q_OBJECT public: + Q_OBJECT + TQ_OBJECT - DlgLimits(TQWidget * parent); +public: + + DlgLimits(TQWidget * tqparent); ~DlgLimits() {} void applyData(); void setData(); diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp index cc5ebb43..40ba314d 100644 --- a/kget/dlgPreferences.cpp +++ b/kget/dlgPreferences.cpp @@ -49,8 +49,8 @@ #include "dlgPreferences.h" -DlgPreferences::DlgPreferences(TQWidget * parent): - KDialogBase(Tabbed, i18n("Configure"), Ok|Apply|Help|Cancel, Ok, parent, "DlgPreferences", true) +DlgPreferences::DlgPreferences(TQWidget * tqparent): + KDialogBase(Tabbed, i18n("Configure"), Ok|Apply|Help|Cancel, Ok, tqparent, "DlgPreferences", true) { // add pages TQFrame *page = addPage(i18n("Connection")); diff --git a/kget/dlgPreferences.h b/kget/dlgPreferences.h index b7881079..aa6596f5 100644 --- a/kget/dlgPreferences.h +++ b/kget/dlgPreferences.h @@ -44,9 +44,12 @@ class DlgSystem; class DlgPreferences:public KDialogBase { -Q_OBJECT public: + Q_OBJECT + TQ_OBJECT - DlgPreferences(TQWidget * parent); +public: + + DlgPreferences(TQWidget * tqparent); ~DlgPreferences() {} diff --git a/kget/dlgSystem.cpp b/kget/dlgSystem.cpp index af33f966..293b6c7a 100644 --- a/kget/dlgSystem.cpp +++ b/kget/dlgSystem.cpp @@ -42,8 +42,8 @@ #include <tqlabel.h> -DlgSystem::DlgSystem(TQWidget * parent) - : DlgSystemBase(parent) +DlgSystem::DlgSystem(TQWidget * tqparent) + : DlgSystemBase(tqparent) { bg_window->hide(); textLabel4->hide(); diff --git a/kget/dlgSystem.h b/kget/dlgSystem.h index db740596..b72d479a 100644 --- a/kget/dlgSystem.h +++ b/kget/dlgSystem.h @@ -34,8 +34,11 @@ class DlgSystem : public DlgSystemBase { -Q_OBJECT public: - DlgSystem(TQWidget * parent); + Q_OBJECT + TQ_OBJECT + +public: + DlgSystem(TQWidget * tqparent); ~DlgSystem() {} void applyData(); diff --git a/kget/dlgadvancedbase.ui b/kget/dlgadvancedbase.ui index dd9b5c59..d16bb227 100644 --- a/kget/dlgadvancedbase.ui +++ b/kget/dlgadvancedbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgAdvancedBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgAdvancedBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gb_advanced</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <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>lb_adding</cstring> </property> @@ -48,14 +48,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>cb_iconify</cstring> </property> @@ -63,7 +63,7 @@ <string>Iconified</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cb_advanced</cstring> </property> @@ -71,7 +71,7 @@ <string>Advanced individual windows</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cb_partial</cstring> </property> @@ -79,7 +79,7 @@ <string>Mark partial downloads</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cb_remove</cstring> </property> @@ -87,7 +87,7 @@ <string>Remove files from a list after success</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cb_getsizes</cstring> </property> @@ -95,7 +95,7 @@ <string>Get file sizes</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>cb_expertmode</cstring> </property> @@ -103,7 +103,7 @@ <string>Expert mode (do not prompt for Cancel or Delete)</string> </property> </widget> - <widget class="QCheckBox" row="8" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cb_konqiIntegration</cstring> </property> @@ -111,7 +111,7 @@ <string>Use KGet as Download Manager for Konqueror</string> </property> </widget> - <widget class="QCheckBox" row="9" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="9" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cb_ShowMain</cstring> </property> @@ -119,7 +119,7 @@ <string>Show main window at startup</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cb_individual</cstring> </property> @@ -127,7 +127,7 @@ <string>Show individual windows</string> </property> </widget> - <widget class="QButtonGroup" row="0" column="2"> + <widget class="TQButtonGroup" row="0" column="2"> <property name="name"> <cstring>bg_adding</cstring> </property> @@ -150,7 +150,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rb_queued</cstring> </property> @@ -158,7 +158,7 @@ <string>Queued</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rb_delayed</cstring> </property> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>35</width> <height>20</height> @@ -266,9 +266,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected" specifier="pure virtual">slotChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kget/dlgautomationbase.ui b/kget/dlgautomationbase.ui index 071a089b..8808d900 100644 --- a/kget/dlgautomationbase.ui +++ b/kget/dlgautomationbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgAutomationBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgAutomationBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gb_automation</cstring> </property> @@ -44,7 +44,7 @@ <number>1</number> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>cb_autoDisconnect</cstring> </property> @@ -52,7 +52,7 @@ <string>Auto disconnect after completing downloads</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cb_autoSave</cstring> </property> @@ -60,7 +60,7 @@ <string>Autosave file list every:</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cb_timedDisconnect</cstring> </property> @@ -68,7 +68,7 @@ <string>Timed disconnect</string> </property> </widget> - <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lb_autoDisconnect</cstring> </property> @@ -86,7 +86,7 @@ <cstring>spins</cstring> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>cb_autoPaste</cstring> </property> @@ -94,7 +94,7 @@ <string>Auto paste from clipboard</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>cb_autoShutdown</cstring> </property> @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> @@ -242,12 +242,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected" specifier="pure virtual">slotChanged()</slot> <slot access="protected" specifier="pure virtual">disconnectToggled(bool b)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kdatetimewidget.h</includehint> <includehint>kdatewidget.h</includehint> diff --git a/kget/dlgconnectionbase.ui b/kget/dlgconnectionbase.ui index fa9bc377..1dfd4831 100644 --- a/kget/dlgconnectionbase.ui +++ b/kget/dlgconnectionbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgConnectionBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgConnectionBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gb_reconnect</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cb_onerror</cstring> </property> @@ -38,7 +38,7 @@ <string>On login or timeout error</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>lb_after</cstring> </property> @@ -46,7 +46,7 @@ <string>Reconnect after:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lb_retries</cstring> </property> @@ -76,7 +76,7 @@ <number>1</number> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cb_onbroken</cstring> </property> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -120,7 +120,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gb_timeout</cstring> </property> @@ -141,14 +141,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lb_nodata</cstring> </property> @@ -156,7 +156,7 @@ <string>If no data arrives in:</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>lb_cannot</cstring> </property> @@ -174,7 +174,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -195,7 +195,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>lb_or</cstring> </property> @@ -219,7 +219,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gb_type</cstring> </property> @@ -265,7 +265,7 @@ <cstring>cmb_type</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>cb_offlinemode</cstring> </property> @@ -283,14 +283,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>lb_linknum</cstring> </property> @@ -392,10 +392,10 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected" specifier="pure virtual">slotChanged()</slot> <slot access="protected" specifier="pure virtual">comboActivated(int)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kget/dlgdirectoriesbase.ui b/kget/dlgdirectoriesbase.ui index ccad9d15..5b1f99e7 100644 --- a/kget/dlgdirectoriesbase.ui +++ b/kget/dlgdirectoriesbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgDirectoriesBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgDirectoriesBase</cstring> </property> @@ -19,15 +19,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QToolButton" row="2" column="1"> + <widget class="TQToolButton" row="2" column="1"> <property name="name"> <cstring>pb_down</cstring> </property> @@ -51,14 +51,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QToolButton" row="0" column="1"> + <widget class="TQToolButton" row="0" column="1"> <property name="name"> <cstring>pb_up</cstring> </property> @@ -72,7 +72,7 @@ <iconset>"up"</iconset> </property> </widget> - <widget class="QListView" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQListView" row="0" column="0" rowspan="3" colspan="1"> <column> <property name="text"> <string>Extension</string> @@ -104,15 +104,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pb_add</cstring> </property> @@ -131,7 +131,7 @@ <string>Add</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pb_delete</cstring> </property> @@ -147,7 +147,7 @@ <string>Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pb_change</cstring> </property> @@ -178,7 +178,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lb_ext</cstring> </property> @@ -191,7 +191,7 @@ <cstring>le_dir</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lb_dir</cstring> </property> @@ -218,9 +218,9 @@ </connection> <connection> <sender>lv_entries</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>DlgDirectoriesBase</receiver> - <slot>selectEntry(QListViewItem*)</slot> + <slot>selectEntry(TQListViewItem*)</slot> </connection> <connection> <sender>pb_add</sender> @@ -245,17 +245,17 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include> </includes> -<slots> - <slot access="protected" specifier="pure virtual">selectEntry(QListViewItem *)</slot> +<Q_SLOTS> + <slot access="protected" specifier="pure virtual">selectEntry(TQListViewItem *)</slot> <slot specifier="pure virtual">upEntry()</slot> <slot>downEntry()</slot> <slot>addEntry()</slot> <slot>deleteEntry()</slot> <slot>changeEntry()</slot> -</slots> +</Q_SLOTS> <pixmapfunction>BarIconSet</pixmapfunction> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/kget/dlglimitsbase.ui b/kget/dlglimitsbase.ui index faf2309f..5206e72d 100644 --- a/kget/dlglimitsbase.ui +++ b/kget/dlglimitsbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgLimitsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgLimitsBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gb_limits</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>lbl_maxnum</cstring> </property> @@ -38,7 +38,7 @@ <string>Maximum open connections:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lb_minband</cstring> </property> @@ -46,7 +46,7 @@ <string>Minimum network bandwidth:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lb_maxband</cstring> </property> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -176,11 +176,11 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected" specifier="pure virtual">slotChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kget/dlgsystembase.ui b/kget/dlgsystembase.ui index beee27eb..006307a3 100644 --- a/kget/dlgsystembase.ui +++ b/kget/dlgsystembase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DlgSystemBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DlgSystemBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>cb_useAnimation</cstring> </property> @@ -27,7 +27,7 @@ <string>Use animation</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>textLabel4</cstring> </property> @@ -38,7 +38,7 @@ <string>Window style:</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>textLabel5</cstring> </property> @@ -51,7 +51,7 @@ <cstring>le_font</cstring> </property> </widget> - <widget class="QButtonGroup" row="1" column="2" rowspan="1" colspan="4"> + <widget class="TQButtonGroup" row="1" column="2" rowspan="1" colspan="4"> <property name="name"> <cstring>bg_window</cstring> </property> @@ -71,7 +71,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rb_normal</cstring> </property> @@ -79,7 +79,7 @@ <string>Normal</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rb_docked</cstring> </property> @@ -87,7 +87,7 @@ <string>Docked</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rb_droptarget</cstring> </property> @@ -107,7 +107,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>10</height> @@ -158,11 +158,11 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="protected" specifier="pure virtual">slotChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kfontrequester.h</includehint> </includehints> diff --git a/kget/dockindividual.cpp b/kget/dockindividual.cpp index e8f02645..9aecd6ea 100644 --- a/kget/dockindividual.cpp +++ b/kget/dockindividual.cpp @@ -29,7 +29,7 @@ #include <kpopupmenu.h> #include "dockindividual.h" -DockIndividual::DockIndividual(TQWidget *parent, const char *name ) : KSystemTray(parent,name) +DockIndividual::DockIndividual(TQWidget *tqparent, const char *name ) : KSystemTray(tqparent,name) { nPic=0; setPixmap( loadIcon("bar0") ); diff --git a/kget/dockindividual.h b/kget/dockindividual.h index 32dd26cf..ff65e46d 100644 --- a/kget/dockindividual.h +++ b/kget/dockindividual.h @@ -35,8 +35,9 @@ class KPopupMenu; class DockIndividual : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - DockIndividual(TQWidget *parent=0, const char *name=0); + DockIndividual(TQWidget *tqparent=0, const char *name=0); ~DockIndividual(); int nPic; void setTip(const TQString &); diff --git a/kget/docking.cpp b/kget/docking.cpp index eba2e8ad..1f4187a6 100644 --- a/kget/docking.cpp +++ b/kget/docking.cpp @@ -40,23 +40,23 @@ DockWidget::DockWidget(KMainWidget * _parent):KSystemTray(_parent) { - parent = _parent; + tqparent = _parent; setPixmap( loadIcon( "kget_dock" )); // popup menu for right mouse button KPopupMenu *popupMenu = contextMenu(); - parent->action("paste_transfer")->plug(popupMenu); - parent->action("drop_target")->plug(popupMenu); - parent->action("konqueror_integration")->plug(popupMenu); + tqparent->action("paste_transfer")->plug(popupMenu); + tqparent->action("drop_target")->plug(popupMenu); + tqparent->action("konqueror_integration")->plug(popupMenu); popupMenu->insertSeparator(); - parent->m_paPreferences->plug(popupMenu); + tqparent->m_paPreferences->plug(popupMenu); // Enable dropping setAcceptDrops(true); dtip = new DynamicTip( this ); - dtip->setStatus( kapp->aboutData()->shortDescription() ); + dtip->settqStatus( kapp->aboutData()->shortDescription() ); } @@ -81,17 +81,17 @@ void DockWidget::dropEvent(TQDropEvent * event) TQString str; if (KURLDrag::decode(event, list)) { - parent->addTransfers(list); + tqparent->addTransfers(list); } else if (TQTextDrag::decode(event, str)) { - parent->addTransfer(str); + tqparent->addTransfer(str); } } void DockWidget::mousePressEvent(TQMouseEvent * e) { - if (e->button() == MidButton) { - parent->slotPasteTransfer(); + if (e->button() == Qt::MidButton) { + tqparent->slotPasteTransfer(); } else { KSystemTray::mousePressEvent(e); } @@ -100,7 +100,7 @@ void DockWidget::mousePressEvent(TQMouseEvent * e) void DockWidget::updateToolTip( const TQString& _status ) { - dtip->setStatus( _status ); + dtip->settqStatus( _status ); } @@ -110,21 +110,21 @@ void DockWidget::changeIcon( const TQString& icon ) } -DynamicTip::DynamicTip( TQWidget * parent ) - : TQToolTip( parent ) +DynamicTip::DynamicTip( TQWidget * tqparent ) + : TQToolTip( tqparent ) { // no explicit initialization needed } -void DynamicTip::setStatus( const TQString & _status ) +void DynamicTip::settqStatus( const TQString & _status ) { status = _status; } void DynamicTip::maybeTip( const TQPoint & _pos ) { - TQRect r( parentWidget()->rect() ); + TQRect r( tqparentWidget()->rect() ); tip( r, status ); } diff --git a/kget/docking.h b/kget/docking.h index ba9a88c1..a18f0eb6 100644 --- a/kget/docking.h +++ b/kget/docking.h @@ -38,12 +38,12 @@ class KPopupMenu; class KMainWidget; -class DynamicTip : public QToolTip +class DynamicTip : public TQToolTip { public: - DynamicTip( TQWidget * parent ); + DynamicTip( TQWidget * tqparent ); virtual ~DynamicTip() {}//TODO workaround for qt-bug, can be removed after 4.0 - void setStatus( const TQString & _status ); + void settqStatus( const TQString & _status ); protected: void maybeTip( const TQPoint & ); @@ -54,9 +54,11 @@ class DynamicTip : public QToolTip class DockWidget:public KSystemTray { + Q_OBJECT + TQ_OBJECT -Q_OBJECT public: - DockWidget(KMainWidget * parent); +public: + DockWidget(KMainWidget * tqparent); ~DockWidget(); /** No descriptions */ void updateToolTip( const TQString& ); @@ -73,7 +75,7 @@ protected: void dropEvent(TQDropEvent *); private: - KMainWidget *parent; + KMainWidget *tqparent; DynamicTip * dtip; }; diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp index eeea1486..419de737 100644 --- a/kget/droptarget.cpp +++ b/kget/droptarget.cpp @@ -39,13 +39,13 @@ #include "kmainwidget.h" #include <tqcursor.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xos.h> #include <X11/extensions/shape.h> #undef Bool -#undef Status +#undef tqStatus #endif #include "settings.h" #include "droptarget.h" @@ -77,10 +77,10 @@ DropTarget::DropTarget(KMainWindow * mainWin):TQWidget() // setup pixmaps - if (!bgnd.mask()) - kdError(5001) << "Drop target pixmap has no mask!\n"; + if (!bgnd.tqmask()) + kdError(5001) << "Drop target pixmap has no tqmask!\n"; else - mask = *bgnd.mask(); + tqmask = *bgnd.tqmask(); setBackgroundPixmap( bgnd ); @@ -118,7 +118,7 @@ DropTarget::~DropTarget() void DropTarget::mousePressEvent(TQMouseEvent * e) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { // toggleMinimizeRestore (); // oldX = 0; @@ -127,14 +127,14 @@ DropTarget::mousePressEvent(TQMouseEvent * e) dx = TQCursor::pos().x() - pos().x(); dy = TQCursor::pos().y() - pos().y(); } - else if (e->button() == RightButton) + else if (e->button() == Qt::RightButton) { popupMenu->setItemEnabled(pop_Min, kmain->isVisible()); popupMenu->setItemEnabled(pop_Max, kmain->isHidden()); popupMenu->popup(TQCursor::pos()); } - else if (e->button() == MidButton) + else if (e->button() == Qt::MidButton) { kmain->slotPasteTransfer(); } @@ -143,8 +143,8 @@ DropTarget::mousePressEvent(TQMouseEvent * e) void DropTarget::resizeEvent(TQResizeEvent *) { -#ifdef Q_WS_X11 - XShapeCombineMask(x11Display(), winId(), ShapeBounding, 0, 0, mask.handle(), ShapeSet); +#ifdef TQ_WS_X11 + XShapeCombineMask(x11Display(), winId(), ShapeBounding, 0, 0, tqmask.handle(), ShapeSet); #endif } @@ -224,7 +224,7 @@ void DropTarget::mouseReleaseEvent(TQMouseEvent *) /** No descriptions */ void DropTarget::mouseDoubleClickEvent(TQMouseEvent * e) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) toggleMinimizeRestore(); } diff --git a/kget/droptarget.h b/kget/droptarget.h index a6276278..84ae0ea2 100644 --- a/kget/droptarget.h +++ b/kget/droptarget.h @@ -35,9 +35,10 @@ class KPopupMenu; class KMainWidget; class KMainWindow; -class DropTarget:public QWidget +class DropTarget:public TQWidget { -Q_OBJECT + Q_OBJECT + TQ_OBJECT public: DropTarget(KMainWindow *); @@ -64,7 +65,7 @@ private slots: private: KPopupMenu * popupMenu; - KMainWidget *parent; + KMainWidget *tqparent; bool b_sticky; @@ -74,7 +75,7 @@ private: int size[4]; - TQBitmap mask; + TQBitmap tqmask; public: // Public attributes /** */ // int oldX; diff --git a/kget/kfileio.cpp b/kget/kfileio.cpp index 63f230bc..51149baa 100644 --- a/kget/kfileio.cpp +++ b/kget/kfileio.cpp @@ -42,35 +42,35 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose if (!info.exists()) { if (aVerbose) - KMessageBox::error(qApp->mainWidget(), i18n("The specified file does not exist:\n%1").arg(aFileName)); - return TQString::null; + KMessageBox::error(tqApp->mainWidget(), i18n("The specified file does not exist:\n%1").tqarg(aFileName)); + return TQString(); } if (info.isDir()) { if (aVerbose) - KMessageBox::error(qApp->mainWidget(), i18n("This is a folder and not a file:\n%1").arg(aFileName)); - return TQString::null; + KMessageBox::error(tqApp->mainWidget(), i18n("This is a folder and not a file:\n%1").tqarg(aFileName)); + return TQString(); } if (!info.isReadable()) { if (aVerbose) - KMessageBox::error(qApp->mainWidget(), i18n("You do not have read permission for the file:\n%1").arg(aFileName)); - return TQString::null; + KMessageBox::error(tqApp->mainWidget(), i18n("You do not have read permission for the file:\n%1").tqarg(aFileName)); + return TQString(); } if (len <= 0) - return TQString::null; + return TQString(); if (!file.open(IO_Raw | IO_ReadOnly)) { if (aVerbose) switch (file.status()) { case IO_ReadError: - KMessageBox::error(qApp->mainWidget(), i18n("Could not read file:\n%1").arg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not read file:\n%1").tqarg(aFileName)); break; case IO_OpenError: - KMessageBox::error(qApp->mainWidget(), i18n("Could not open file:\n%1").arg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file:\n%1").tqarg(aFileName)); break; default: - KMessageBox::error(qApp->mainWidget(), i18n("Error while reading file:\n%1").arg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Error while reading file:\n%1").tqarg(aFileName)); } - return TQString::null; + return TQString(); } result.resize(len + (int) aEnsureNL + 1); @@ -82,11 +82,11 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose result[len] = '\0'; if (readLen < len) { - TQString msg = i18n("Could only read %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(readLen, - 0)).arg(KGlobal::locale()->formatNumber(len, 0)); + TQString msg = i18n("Could only read %1 bytes of %2.").tqarg(KGlobal::locale()->formatNumber(readLen, + 0)).tqarg(KGlobal::locale()->formatNumber(len, 0)); - KMessageBox::error(qApp->mainWidget(), msg); - return TQString::null; + KMessageBox::error(tqApp->mainWidget(), msg); + return TQString(); } kdDebug() << "kFileToString: " << readLen << " bytes read" << endl; @@ -107,9 +107,9 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam if (info.exists()) { if (aAskIfExists) { - TQString str = i18n("File %1 exists.\nDo you want to replace it?").arg(aFileName); + TQString str = i18n("File %1 exists.\nDo you want to replace it?").tqarg(aFileName); - rc = KMessageBox::questionYesNo(qApp->mainWidget(), str, TQString::null, i18n("Replace"),KStdGuiItem::cancel()); + rc = KMessageBox::questionYesNo(tqApp->mainWidget(), str, TQString(), i18n("Replace"),KStdGuiItem::cancel()); if (rc != KMessageBox::Yes) return FALSE; } @@ -124,7 +124,7 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam // failed to rename file if (!aVerbose) return FALSE; - rc = KMessageBox::warningContinueCancel(qApp->mainWidget(), i18n("Failed to make a backup copy of %1.\nContinue anyway?").arg(aFileName)); + rc = KMessageBox::warningContinueCancel(tqApp->mainWidget(), i18n("Failed to make a backup copy of %1.\nContinue anyway?").tqarg(aFileName)); if (rc != KMessageBox::Continue) return FALSE; } @@ -135,13 +135,13 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam if (aVerbose) switch (file.status()) { case IO_WriteError: - KMessageBox::error(qApp->mainWidget(), i18n("Could not write to file:\n%1").arg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").tqarg(aFileName)); break; case IO_OpenError: - KMessageBox::error(qApp->mainWidget(), i18n("Could not open file for writing:\n%1").arg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file for writing:\n%1").tqarg(aFileName)); break; default: - KMessageBox::error(qApp->mainWidget(), i18n("Error while writing file:\n%1").arg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Error while writing file:\n%1").tqarg(aFileName)); } return FALSE; } @@ -149,14 +149,14 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam writeLen = file.writeBlock(aBuffer, len); if (writeLen < 0) { - KMessageBox::error(qApp->mainWidget(), i18n("Could not write to file:\n%1").arg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").tqarg(aFileName)); return FALSE; } else if (writeLen < len) { - TQString msg = i18n("Could only write %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(writeLen, - 0)).arg(KGlobal::locale()->formatNumber(len, + TQString msg = i18n("Could only write %1 bytes of %2.").tqarg(KGlobal::locale()->formatNumber(writeLen, + 0)).tqarg(KGlobal::locale()->formatNumber(len, 0)); - KMessageBox::error(qApp->mainWidget(), msg); + KMessageBox::error(tqApp->mainWidget(), msg); return FALSE; } diff --git a/kget/kfileio.h b/kget/kfileio.h index 84a50cd2..c47eb173 100644 --- a/kget/kfileio.h +++ b/kget/kfileio.h @@ -20,7 +20,7 @@ #ifndef kfileio_h #define kfileio_h -/** Load a file. Returns a pointer to the memory-block that contains +/** Load a file. Returns a pointer to the memory-block that tqcontains * the loaded file. Returns a NULL string if the file could not be loaded. * If withDialogs is FALSE no warning dialogs are opened if there are * problems. diff --git a/kget/kget_iface.h b/kget/kget_iface.h index df01375c..0d410bf5 100644 --- a/kget/kget_iface.h +++ b/kget/kget_iface.h @@ -21,9 +21,9 @@ protected: k_dcop: /** * @param src The urls to download - * @param destDir The destination direction or TQString::null if unspecified + * @param destDir The destination direction or TQString() if unspecified */ - virtual ASYNC addTransfers( const KURL::List& src, const TQString& destDir = TQString::null ) = 0; + virtual ASYNC addTransfers( const KURL::List& src, const TQString& destDir = TQString() ) = 0; virtual bool isDropTargetVisible() const = 0; diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp index a9bab704..295d04b4 100644 --- a/kget/kget_plug_in/kget_linkview.cpp +++ b/kget/kget_plug_in/kget_linkview.cpp @@ -18,8 +18,8 @@ #define COL_MIME 2 #define COL_URL 3 -LinkViewItem::LinkViewItem( TQListView *parent, const LinkItem *lnk ) - : TQListViewItem( parent ), +LinkViewItem::LinkViewItem( TQListView *tqparent, const LinkItem *lnk ) + : TQListViewItem( tqparent ), link( lnk ) { TQString file = link->url.fileName(); @@ -37,17 +37,17 @@ LinkViewItem::LinkViewItem( TQListView *parent, const LinkItem *lnk ) /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// -KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) - : KMainWindow( parent, name ) +KGetLinkView::KGetLinkView( TQWidget *tqparent, const char *name ) + : KMainWindow( tqparent, name ) { setPlainCaption( i18n( "KGet" ) ); KAction* actionDownload = new KAction( i18n("Download Selected Files"), "kget", CTRL+Key_D, - this, TQT_SLOT( slotStartLeech() ), + TQT_TQOBJECT(this), TQT_SLOT( slotStartLeech() ), actionCollection(), "startDownload" ); - KAction* actionSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), + KAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), actionCollection() ); m_links.setAutoDelete( true ); @@ -56,7 +56,7 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) actionSelectAll->plug( toolBar() ); TQWidget *mainWidget = new TQWidget( this ); - TQVBoxLayout *layout = new TQVBoxLayout( mainWidget ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( mainWidget ); setCentralWidget( mainWidget ); m_view = new KListView( mainWidget, "listview" ); @@ -68,8 +68,8 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) m_view->setShowSortIndicator( true ); KListViewSearchLineWidget *line = new KListViewSearchLineWidget( m_view, mainWidget, "search line" ); - layout->addWidget( line ); - layout->addWidget( m_view ); + tqlayout->addWidget( line ); + tqlayout->addWidget( m_view ); // setting a fixed (not floating) toolbar toolBar()->setMovingEnabled( false ); @@ -125,7 +125,7 @@ void KGetLinkView::slotStartLeech() TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); - stream << urls << TQString::null; + stream << urls << TQString(); bool ok = DCOPClient::mainClient()->send( "kget", "KGet-Interface", "addTransfers(KURL::List, TQString)", data ); @@ -139,7 +139,7 @@ void KGetLinkView::slotStartLeech() void KGetLinkView::setPageURL( const TQString& url ) { - setPlainCaption( i18n( "Links in: %1 - KGet" ).arg( url ) ); + setPlainCaption( i18n( "Links in: %1 - KGet" ).tqarg( url ) ); } void KGetLinkView::slotSelectAll() diff --git a/kget/kget_plug_in/kget_linkview.h b/kget/kget_plug_in/kget_linkview.h index 26ce28fc..b09e902d 100644 --- a/kget/kget_plug_in/kget_linkview.h +++ b/kget/kget_plug_in/kget_linkview.h @@ -16,10 +16,10 @@ #include "links.h" -class LinkViewItem : public QListViewItem +class LinkViewItem : public TQListViewItem { public: - LinkViewItem( TQListView *parent, const LinkItem * lnk ); + LinkViewItem( TQListView *tqparent, const LinkItem * lnk ); const LinkItem *link; }; @@ -27,9 +27,10 @@ public: class KGetLinkView : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KGetLinkView( TQWidget *parent = 0L, const char *name = 0L ); + KGetLinkView( TQWidget *tqparent = 0L, const char *name = 0L ); ~KGetLinkView(); void setLinks( TQPtrList<LinkItem>& links ); diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index c73406a2..78ef597e 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -44,8 +44,8 @@ #include "links.h" #include "kget_linkview.h" -KGet_plug_in::KGet_plug_in( TQObject* parent, const char* name ) - : Plugin( parent, name ) +KGet_plug_in::KGet_plug_in( TQObject* tqparent, const char* name ) + : Plugin( tqparent, name ) { TQPixmap pix = KGlobal::iconLoader()->loadIcon("kget", KIcon::MainToolbar); @@ -104,10 +104,10 @@ void KGet_plug_in::slotShowDrop() void KGet_plug_in::slotShowLinks() { - if ( !parent() || !parent()->inherits( "KHTMLPart" ) ) + if ( !tqparent() || !tqparent()->inherits( "KHTMLPart" ) ) return; - KHTMLPart *htmlPart = static_cast<KHTMLPart*>( parent() ); + KHTMLPart *htmlPart = static_cast<KHTMLPart*>( tqparent() ); KParts::Part *activePart = 0L; if ( htmlPart->partManager() ) { @@ -157,15 +157,15 @@ void KGet_plug_in::slotShowLinks() view->show(); } -KPluginFactory::KPluginFactory( TQObject* parent, const char* name ) - : KLibFactory( parent, name ) +KPluginFactory::KPluginFactory( TQObject* tqparent, const char* name ) + : KLibFactory( tqparent, name ) { s_instance = new KInstance("KPluginFactory"); } -TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) +TQObject* KPluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) { - TQObject *obj = new KGet_plug_in( parent, name ); + TQObject *obj = new KGet_plug_in( tqparent, name ); return obj; } diff --git a/kget/kget_plug_in/kget_plug_in.h b/kget/kget_plug_in/kget_plug_in.h index b5cfea29..6cca1390 100644 --- a/kget/kget_plug_in/kget_plug_in.h +++ b/kget/kget_plug_in/kget_plug_in.h @@ -27,8 +27,9 @@ class KInstance; class KGet_plug_in : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KGet_plug_in( TQObject* parent = 0, const char* name = 0 ); + KGet_plug_in( TQObject* tqparent = 0, const char* name = 0 ); KToggleAction *m_paToggleDropTarget ; DCOPClient* p_dcopServer; virtual ~KGet_plug_in(); @@ -43,12 +44,13 @@ private slots: class KPluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - KPluginFactory( TQObject *parent = 0, const char *name = 0 ); + KPluginFactory( TQObject *tqparent = 0, const char *name = 0 ); ~KPluginFactory() ; - virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, - const char* name = "TQObject", + virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, + const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: diff --git a/kget/kget_plug_in/links.cpp b/kget/kget_plug_in/links.cpp index 12600353..b1410cef 100644 --- a/kget/kget_plug_in/links.cpp +++ b/kget/kget_plug_in/links.cpp @@ -24,17 +24,17 @@ LinkItem::LinkItem( DOM::Element link ) // somehow getElementsByTagName("#text") doesn't work :( - DOM::NodeList children = link.childNodes(); - for ( uint i = 0; i < children.length(); i++ ) + DOM::NodeList tqchildren = link.childNodes(); + for ( uint i = 0; i < tqchildren.length(); i++ ) { - DOM::Node node = children.item( i ); + DOM::Node node = tqchildren.item( i ); if ( node.nodeType() == DOM::Node::TEXT_NODE ) text.append( node.nodeValue().string() ); } // force "local file" mimetype determination KMimeType::Ptr mt = KMimeType::findByURL( url, 0, true, true); - icon = mt->icon( TQString::null, false ); // dummy parameters + icon = mt->icon( TQString(), false ); // dummy parameters mimeType = mt->comment(); m_valid = true; diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index 01fc48c4..6e830d67 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -129,7 +129,7 @@ KMainWidget::KMainWidget(bool bStartDocked) { KConfig cfg( "kioslaverc", false, false); - cfg.setGroup(TQString::null); + cfg.setGroup(TQString()); cfg.writeEntry("AutoResume", true); cfg.sync(); } @@ -142,8 +142,8 @@ KMainWidget::KMainWidget(bool bStartDocked) kmain = this; // Set log time, needed for the name of log file - TQDate date = TQDateTime::currentDateTime().date(); - TQTime time = TQDateTime::currentDateTime().time(); + TQDate date = TQDateTime::tqcurrentDateTime().date(); + TQTime time = TQDateTime::tqcurrentDateTime().time(); TQString tmp; tmp.sprintf("log%d:%d:%d-%d:%d:%d", date.day(), date.month(), date.year(), time.hour(), time.minute(), time.second()); @@ -151,7 +151,7 @@ KMainWidget::KMainWidget(bool bStartDocked) logFileName = locateLocal("appdata", "logs/"); logFileName += tmp; - lastClipboard = TQApplication::clipboard()->text( QClipboard::Clipboard ).stripWhiteSpace(); + lastClipboard = TQApplication::tqclipboard()->text( TQClipboard::Clipboard ).stripWhiteSpace(); // Load all settings from KConfig ksettings.load(); @@ -223,7 +223,7 @@ KMainWidget::KMainWidget(bool bStartDocked) kdock = new DockWidget(this); connect(kdock, TQT_SIGNAL(quitSelected()), TQT_SLOT(slotQuit())); - // Set geometry + // Set tqgeometry if (ksettings.mainPosition.x() != -1) { resize(ksettings.mainSize); move(ksettings.mainPosition); @@ -253,7 +253,7 @@ KMainWidget::KMainWidget(bool bStartDocked) setCaption(i18n("Offline"), false); log(i18n("Starting offline")); } else - setCaption(TQString::null, false); + setCaption(TQString(), false); m_paAutoPaste->setChecked(ksettings.b_autoPaste); m_paShowLog->setChecked(b_viewLogWindow); @@ -342,65 +342,65 @@ void KMainWidget::setupGUI() connect(myTransferList, TQT_SIGNAL(popupMenu(Transfer *)), this, TQT_SLOT(slotPopupMenu(Transfer *))); // file actions - m_paOpenTransfer = KStdAction::open(this, TQT_SLOT(slotOpenTransfer()), coll, "open_transfer"); - m_paPasteTransfer = KStdAction::paste(this, TQT_SLOT(slotPasteTransfer()), coll, "paste_transfer"); + m_paOpenTransfer = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenTransfer()), coll, "open_transfer"); + m_paPasteTransfer = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPasteTransfer()), coll, "paste_transfer"); - m_paExportTransfers = new KAction(i18n("&Export Transfer List..."), 0, this, TQT_SLOT(slotExportTransfers()), coll, "export_transfers"); - m_paImportTransfers = new KAction(i18n("&Import Transfer List..."), 0, this, TQT_SLOT(slotImportTransfers()), coll, "import_transfers"); + m_paExportTransfers = new KAction(i18n("&Export Transfer List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportTransfers()), coll, "export_transfers"); + m_paImportTransfers = new KAction(i18n("&Import Transfer List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportTransfers()), coll, "import_transfers"); - m_paImportText = new KAction(i18n("Import Text &File..."), 0, this, TQT_SLOT(slotImportTextFile()), coll, "import_text"); + m_paImportText = new KAction(i18n("Import Text &File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportTextFile()), coll, "import_text"); - m_paQuit = KStdAction::quit(this, TQT_SLOT(slotQuit()), coll, "quit"); + m_paQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), coll, "quit"); // transfer actions - m_paCopy = new KAction(i18n("&Copy URL to Clipboard"), 0, this, TQT_SLOT(slotCopyToClipboard()), coll, "copy_url"); - m_paIndividual = new KAction(i18n("&Open Individual Window"), 0, this, TQT_SLOT(slotOpenIndividual()), coll, "open_individual"); + m_paCopy = new KAction(i18n("&Copy URL to Clipboard"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyToClipboard()), coll, "copy_url"); + m_paIndividual = new KAction(i18n("&Open Individual Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenIndividual()), coll, "open_individual"); - m_paMoveToBegin = new KAction(i18n("Move to &Beginning"), 0, this, TQT_SLOT(slotMoveToBegin()), coll, "move_begin"); + m_paMoveToBegin = new KAction(i18n("Move to &Beginning"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveToBegin()), coll, "move_begin"); - m_paMoveToEnd = new KAction(i18n("Move to &End"), 0, this, TQT_SLOT(slotMoveToEnd()), coll, "move_end"); + m_paMoveToEnd = new KAction(i18n("Move to &End"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveToEnd()), coll, "move_end"); #ifdef _DEBUG sDebug << "Loading pics" << endl; #endif - m_paResume = new KAction(i18n("&Resume"),"tool_resume", 0, this, TQT_SLOT(slotResumeCurrent()), coll, "resume"); - m_paPause = new KAction(i18n("&Pause"),"tool_pause", 0, this, TQT_SLOT(slotPauseCurrent()), coll, "pause"); - m_paDelete = new KAction(i18n("&Delete"),"editdelete", Qt::Key_Delete, this, TQT_SLOT(slotDeleteCurrent()), coll, "delete"); - m_paRestart = new KAction(i18n("Re&start"),"tool_restart", 0, this, TQT_SLOT(slotRestartCurrent()), coll, "restart"); + m_paResume = new KAction(i18n("&Resume"),"tool_resume", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResumeCurrent()), coll, "resume"); + m_paPause = new KAction(i18n("&Pause"),"tool_pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPauseCurrent()), coll, "pause"); + m_paDelete = new KAction(i18n("&Delete"),"editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrent()), coll, "delete"); + m_paRestart = new KAction(i18n("Re&start"),"tool_restart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRestartCurrent()), coll, "restart"); - m_paQueue = new KRadioAction(i18n("&Queue"),"tool_queue", 0, this, TQT_SLOT(slotQueueCurrent()), coll, "queue"); - m_paTimer = new KRadioAction(i18n("&Timer"),"tool_timer", 0, this, TQT_SLOT(slotTimerCurrent()), coll, "timer"); - m_paDelay = new KRadioAction(i18n("De&lay"),"tool_delay", 0, this, TQT_SLOT(slotDelayCurrent()), coll, "delay"); + m_paQueue = new KRadioAction(i18n("&Queue"),"tool_queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQueueCurrent()), coll, "queue"); + m_paTimer = new KRadioAction(i18n("&Timer"),"tool_timer", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTimerCurrent()), coll, "timer"); + m_paDelay = new KRadioAction(i18n("De&lay"),"tool_delay", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDelayCurrent()), coll, "delay"); m_paQueue->setExclusiveGroup("TransferMode"); m_paTimer->setExclusiveGroup("TransferMode"); m_paDelay->setExclusiveGroup("TransferMode"); // options actions - m_paUseAnimation = new KToggleAction(i18n("Use &Animation"), 0, this, TQT_SLOT(slotToggleAnimation()), coll, "toggle_animation"); - m_paExpertMode = new KToggleAction(i18n("&Expert Mode"),"tool_expert", 0, this, TQT_SLOT(slotToggleExpertMode()), coll, "expert_mode"); - m_paUseLastDir = new KToggleAction(i18n("&Use-Last-Folder Mode"),"tool_uselastdir", 0, this, TQT_SLOT(slotToggleUseLastDir()), coll, "use_last_dir"); - m_paAutoDisconnect = new KToggleAction(i18n("Auto-&Disconnect Mode"),"tool_disconnect", 0, this, TQT_SLOT(slotToggleAutoDisconnect()), coll, "auto_disconnect"); - m_paAutoShutdown = new KToggleAction(i18n("Auto-S&hutdown Mode"), "tool_shutdown", 0, this, TQT_SLOT(slotToggleAutoShutdown()), coll, "auto_shutdown"); - m_paOfflineMode = new KToggleAction(i18n("&Offline Mode"),"tool_offline_mode_off", 0, this, TQT_SLOT(slotToggleOfflineMode()), coll, "offline_mode"); - m_paAutoPaste = new KToggleAction(i18n("Auto-Pas&te Mode"),"tool_clipboard", 0, this, TQT_SLOT(slotToggleAutoPaste()), coll, "auto_paste"); + m_paUseAnimation = new KToggleAction(i18n("Use &Animation"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAnimation()), coll, "toggle_animation"); + m_paExpertMode = new KToggleAction(i18n("&Expert Mode"),"tool_expert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleExpertMode()), coll, "expert_mode"); + m_paUseLastDir = new KToggleAction(i18n("&Use-Last-Folder Mode"),"tool_uselastdir", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleUseLastDir()), coll, "use_last_dir"); + m_paAutoDisconnect = new KToggleAction(i18n("Auto-&Disconnect Mode"),"tool_disconnect", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoDisconnect()), coll, "auto_disconnect"); + m_paAutoShutdown = new KToggleAction(i18n("Auto-S&hutdown Mode"), "tool_shutdown", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoShutdown()), coll, "auto_shutdown"); + m_paOfflineMode = new KToggleAction(i18n("&Offline Mode"),"tool_offline_mode_off", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleOfflineMode()), coll, "offline_mode"); + m_paAutoPaste = new KToggleAction(i18n("Auto-Pas&te Mode"),"tool_clipboard", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoPaste()), coll, "auto_paste"); - m_paPreferences = KStdAction::preferences(this, TQT_SLOT(slotPreferences()), coll); + m_paPreferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), coll); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), coll); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), coll); - KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), coll); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), coll); + KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), coll); - m_menubarAction = KStdAction::showMenubar(this, TQT_SLOT(slotShowMenubar()), coll, "settings_showmenubar" ); + m_menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotShowMenubar()), coll, "settings_showmenubar" ); m_menubarAction->setChecked( !menuBar()->isHidden() ); // view actions createStandardStatusBarAction(); - m_paShowLog = new KToggleAction(i18n("Show &Log Window"),"tool_logwindow", 0, this, TQT_SLOT(slotToggleLogWindow()), coll, "toggle_log"); + m_paShowLog = new KToggleAction(i18n("Show &Log Window"),"tool_logwindow", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLogWindow()), coll, "toggle_log"); m_paShowLog->setCheckedState(i18n("Hide &Log Window")); - m_paDropTarget = new KAction(i18n("Show Drop &Target"),"tool_drop_target", 0, this, TQT_SLOT(slotToggleDropTarget()), coll, "drop_target"); - m_paKonquerorIntegration = new KAction(i18n("Enable &KGet as Konqueror Download Manager"), "konqueror", 0, this, TQT_SLOT(slotKonquerorIntegration()), coll, "konqueror_integration"); + m_paDropTarget = new KAction(i18n("Show Drop &Target"),"tool_drop_target", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDropTarget()), coll, "drop_target"); + m_paKonquerorIntegration = new KAction(i18n("Enable &KGet as Konqueror Download Manager"), "konqueror", 0, TQT_TQOBJECT(this), TQT_SLOT(slotKonquerorIntegration()), coll, "konqueror_integration"); if (ksettings.b_KonquerorIntegration) { m_paKonquerorIntegration->setText(i18n("Disable &KGet as Konqueror Download Manager")); } @@ -411,11 +411,11 @@ void KMainWidget::setupGUI() createGUI("kgetui.rc"); // setup statusbar - statusBar()->insertFixedItem(i18n(" Transfers: %1 ").arg(99), ID_TOTAL_TRANSFERS); - statusBar()->insertFixedItem(i18n(" Files: %1 ").arg(555), ID_TOTAL_FILES); - statusBar()->insertFixedItem(i18n(" Size: %1 KB ").arg("134.56"), ID_TOTAL_SIZE); - statusBar()->insertFixedItem(i18n(" Time: %1 ").arg(KIO::convertSeconds(0)), ID_TOTAL_TIME); - statusBar()->insertFixedItem(i18n(" %1 KB/s ").arg("123.34"), ID_TOTAL_SPEED); + statusBar()->insertFixedItem(i18n(" Transfers: %1 ").tqarg(99), ID_TOTAL_TRANSFERS); + statusBar()->insertFixedItem(i18n(" Files: %1 ").tqarg(555), ID_TOTAL_FILES); + statusBar()->insertFixedItem(i18n(" Size: %1 KB ").tqarg("134.56"), ID_TOTAL_SIZE); + statusBar()->insertFixedItem(i18n(" Time: %1 ").tqarg(KIO::convertSeconds(0)), ID_TOTAL_TIME); + statusBar()->insertFixedItem(i18n(" %1 KB/s ").tqarg("123.34"), ID_TOTAL_SPEED); setAutoSaveSettings( "MainWindow", false /*Settings takes care of size & pos & state */ ); @@ -485,7 +485,7 @@ void KMainWidget::setupWhatsThis() tmp = i18n("<b>Auto paste</b> button toggles the auto-paste mode\n" "on and off.\n" "\n" "When set, KGet will periodically scan the clipboard\n" "for URLs and paste them automatically."); m_paAutoPaste->setWhatsThis(tmp); - tmp = i18n("<b>Drop target</b> button toggles the window style\n" "between a normal window and a drop target.\n" "\n" "When set, the main window will be hidden and\n" "instead a small shaped window will appear.\n" "\n" "You can show/hide a normal window with a simple click\n" "on a shaped window."); + tmp = i18n("<b>Drop target</b> button toggles the window style\n" "between a normal window and a drop target.\n" "\n" "When set, the main window will be hidden and\n" "instead a small tqshaped window will appear.\n" "\n" "You can show/hide a normal window with a simple click\n" "on a tqshaped window."); m_paDropTarget->setWhatsThis(tmp); /* tmp = i18n("<b>Dock widget</b> button toggles the window style\n" "between a normal window and a docked widget.\n" "\n" "When set, the main window will be hidden and\n" "instead a docked widget will appear on the panel.\n" "\n" "You can show/hide a normal window by simply clicking\n" "on a docked widget."); @@ -555,7 +555,7 @@ void KMainWidget::slotImportTextFile() list = kFileToString(filename.path()); // file not accessible -> give error message i = 0; - while ((j = list.find('\n', i)) != -1) { + while ((j = list.tqfind('\n', i)) != -1) { TQString newtransfer = list.mid(i, j - i); addTransfer(newtransfer); i = j + 1; @@ -708,7 +708,7 @@ void KMainWidget::slotQuit() for (; it.current(); ++it) { item = it.current(); - if (item->getStatus() == Transfer::ST_RUNNING && !ksettings.b_expertMode) { + if (item->gettqStatus() == Transfer::ST_RUNNING && !ksettings.b_expertMode) { if (KMessageBox::warningContinueCancel(this, i18n("Some transfers are still running.\nAre you sure you want to quit KGet?"), i18n("Warning"), KStdGuiItem::quit()) != KMessageBox::Continue) { #ifdef _DEBUG sDebugOut << endl; @@ -859,7 +859,7 @@ void KMainWidget::slotDeleteCurrent() KMessageBox::information(this, i18n("The transfer you wanted to delete completed before it could be deleted.", "%n transfers you wanted to delete completed before they could be deleted.", transferFinishedMeanwhile ), - TQString::null, "completedBeforeDeletion" ); + TQString(), "completedBeforeDeletion" ); #ifdef _DEBUG sDebugOut << endl; @@ -876,10 +876,10 @@ void KMainWidget::stopAll() log(i18n("Stopping all jobs"), false); TransferIterator it(myTransferList); - Transfer::TransferStatus Status; + Transfer::TransfertqStatus tqStatus; for (; it.current(); ++it) { - Status = it.current()->getStatus(); - if (Status == Transfer::ST_TRYING || Status == Transfer::ST_RUNNING) + tqStatus = it.current()->gettqStatus(); + if (tqStatus == Transfer::ST_TRYING || tqStatus == Transfer::ST_RUNNING) it.current()->slotStop(); } slotUpdateActions(); @@ -977,7 +977,7 @@ void KMainWidget::slotOpenTransfer() KURL url = KURL::fromPathOrURL(newtransfer); if (!url.isValid()) { - KMessageBox::error(this, i18n("Malformed URL:\n%1").arg(newtransfer), i18n("Error")); + KMessageBox::error(this, i18n("Malformed URL:\n%1").tqarg(newtransfer), i18n("Error")); ok = false; } } @@ -997,7 +997,7 @@ void KMainWidget::slotCheckClipboard() //sDebugIn << endl; #endif - TQString clipData = TQApplication::clipboard()->text( QClipboard::Clipboard ).stripWhiteSpace(); + TQString clipData = TQApplication::tqclipboard()->text( TQClipboard::Clipboard ).stripWhiteSpace(); if (clipData != lastClipboard) { sDebug << "New clipboard event" << endl; @@ -1026,7 +1026,7 @@ void KMainWidget::slotPasteTransfer() TQString newtransfer; - newtransfer = TQApplication::clipboard()->text(); + newtransfer = TQApplication::tqclipboard()->text(); newtransfer = newtransfer.stripWhiteSpace(); if (!ksettings.b_expertMode) { @@ -1079,7 +1079,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile) { if (!b_expertMode) { // open the filedialog for confirmation - KFileDialog dlg( destDir, TQString::null, + KFileDialog dlg( destDir, TQString(), 0L, "save_as", true); dlg.setCaption(i18n("Save As")); dlg.setOperationMode(KFileDialog::Saving); @@ -1114,7 +1114,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile) //check if destination already exists if(KIO::NetAccess::exists(destURL, false, this)) { - if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").arg( destURL.prettyURL()), TQString::null, i18n("Overwrite"), i18n("Do Not Overwrite") ) + if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").tqarg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ) == KMessageBox::Yes) { bDestisMalformed=false; @@ -1141,7 +1141,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile) // create a new transfer item Transfer *item = myTransferList->addTransfer(url, destURL); - KNotifyClient::event(kdock->winId(), "added", i18n("<i>%1</i> has been added.").arg(url.prettyURL())); + KNotifyClient::event(kdock->winId(), "added", i18n("<i>%1</i> has been added.").tqarg(url.prettyURL())); item->updateAll(); // update the remaining fields if (ksettings.b_showIndividual) @@ -1192,7 +1192,7 @@ void KMainWidget::addTransfers( const KURL::List& src, const TQString& destDir ) destURL.setFileName( fileName ); if(KIO::NetAccess::exists(destURL, false, this)) { - if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").arg( destURL.prettyURL()), TQString::null, i18n("Overwrite"), i18n("Do Not Overwrite") ) + if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").tqarg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ) == KMessageBox::Yes) { SafeDelete::deleteFile( destURL ); @@ -1360,7 +1360,7 @@ void KMainWidget::checkQueue() // count running transfers for (; it.current(); ++it) { - status = it.current()->getStatus(); + status = it.current()->gettqStatus(); if (status == Transfer::ST_RUNNING || status == Transfer::ST_TRYING) numRun++; } @@ -1370,9 +1370,9 @@ void KMainWidget::checkQueue() bool isQuequed; for (; it.current() && numRun < ksettings.maxSimultaneousConnections; ++it) { item = it.current(); - isRunning = (item->getStatus() == Transfer::ST_RUNNING) || ((item->getStatus() == Transfer::ST_TRYING)); + isRunning = (item->gettqStatus() == Transfer::ST_RUNNING) || ((item->gettqStatus() == Transfer::ST_TRYING)); - isQuequed = (item->getMode() == Transfer::MD_QUEUED || item->getMode() == Transfer::MD_NEW); + isQuequed = (item->getMode() == Transfer::MD_TQUEUED || item->getMode() == Transfer::MD_NEW); if (!isRunning && isQuequed && !ksettings.b_offline) { @@ -1394,7 +1394,7 @@ void KMainWidget::checkQueue() for (; it.current(); ++it) { item = it.current(); - if (item->getMode() == Transfer::MD_NEW && item->getStatus() == Transfer::ST_STOPPED) + if (item->getMode() == Transfer::MD_NEW && item->gettqStatus() == Transfer::ST_STOPPED) { item->checkCache(); } @@ -1420,7 +1420,7 @@ void KMainWidget::slotAnimTimeout() animCounter = 0; } // update status of all items of transferList - isTransfer = myTransferList->updateStatus(animCounter); + isTransfer = myTransferList->updatetqStatus(animCounter); //if (this->isVisible()) { updateStatusBar(); @@ -1445,8 +1445,8 @@ void KMainWidget::slotTransferTimeout() for (; it.current(); ++it) { item = it.current(); - if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::currentDateTime()) { - item->setMode(Transfer::MD_QUEUED); + if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::tqcurrentDateTime()) { + item->setMode(Transfer::MD_TQUEUED); flag = true; } } @@ -1455,7 +1455,7 @@ void KMainWidget::slotTransferTimeout() checkQueue(); } - if (ksettings.b_autoDisconnect && ksettings.b_timedDisconnect && ksettings.disconnectTime <= TQTime::currentTime() && ksettings.disconnectDate == TQDate::currentDate()) { + if (ksettings.b_autoDisconnect && ksettings.b_timedDisconnect && ksettings.disconnectTime <= TQTime::currentTime() && ksettings.disconnectDate == TQDate::tqcurrentDate()) { onlineDisconnect(); } @@ -1511,7 +1511,7 @@ void KMainWidget::slotStatusChanged(Transfer * item, int _operation) } else { - KNotifyClient::event(kdock->winId(), "finished", i18n("<i>%1</i> successfully downloaded.").arg(srcurl)); + KNotifyClient::event(kdock->winId(), "finished", i18n("<i>%1</i> successfully downloaded.").tqarg(srcurl)); } if ( item ) @@ -1533,7 +1533,7 @@ void KMainWidget::slotStatusChanged(Transfer * item, int _operation) case Transfer::OP_ABORTED: break; case Transfer::OP_DELAYED: - case Transfer::OP_QUEUED: + case Transfer::OP_TQUEUED: slotUpdateActions(); item->slotUpdateActions(); break; @@ -1593,9 +1593,9 @@ void KMainWidget::slotCopyToClipboard() if (item) { TQString url = item->getSrc().url(); - QClipboard *cb = TQApplication::clipboard(); - cb->setText( url, QClipboard::Selection ); - cb->setText( url, QClipboard::Clipboard); + TQClipboard *cb = TQApplication::tqclipboard(); + cb->setText( url, TQClipboard::Selection ); + cb->setText( url, TQClipboard::Clipboard); myTransferList->clearSelection(); } @@ -1766,7 +1766,7 @@ void KMainWidget::slotToggleOfflineMode() m_paOfflineMode->setIconSet(LOAD_ICON("tool_offline_mode_off")); } else { log(i18n("Offline mode off.")); - setCaption(TQString::null, false); + setCaption(TQString(), false); m_paOfflineMode->setIconSet(LOAD_ICON("tool_offline_mode_on")); } @@ -2040,7 +2040,7 @@ void KMainWidget::slotUpdateActions() sDebug << "-->ONLINE= " << ksettings.b_offline << endl; #endif if (item == first_item && !ksettings.b_offline) { - switch (item->getStatus()) { + switch (item->gettqStatus()) { case Transfer::ST_TRYING: case Transfer::ST_RUNNING: m_paResume->setEnabled(false); @@ -2052,7 +2052,7 @@ void KMainWidget::slotUpdateActions() m_paPause->setEnabled(false); m_paRestart->setEnabled(false); #ifdef _DEBUG - sDebug << "STATUS IS stopped" << item->getStatus() << endl; + sDebug << "STATUS IS stopped" << item->gettqStatus() << endl; #endif break; case Transfer::ST_FINISHED: @@ -2064,7 +2064,7 @@ void KMainWidget::slotUpdateActions() } //end switch - } else if (item->getStatus() != first_item->getStatus()) { + } else if (item->gettqStatus() != first_item->gettqStatus()) { // disable all when all selected items don't have the same status m_paResume->setEnabled(false); m_paPause->setEnabled(false); @@ -2076,15 +2076,15 @@ void KMainWidget::slotUpdateActions() m_paDelete->setEnabled(true); m_paCopy->setEnabled(true); m_paIndividual->setEnabled(true); - if (item->getStatus() != Transfer::ST_FINISHED) { + if (item->gettqStatus() != Transfer::ST_FINISHED) { m_paQueue->setEnabled(true); m_paTimer->setEnabled(true); m_paDelay->setEnabled(true); switch (item->getMode()) { - case Transfer::MD_QUEUED: + case Transfer::MD_TQUEUED: #ifdef _DEBUG - sDebug << "....................THE MODE IS MD_QUEUED " << item->getMode() << endl; + sDebug << "....................THE MODE IS MD_TQUEUED " << item->getMode() << endl; #endif m_paQueue->setChecked(true); break; @@ -2166,11 +2166,11 @@ void KMainWidget::updateStatusBar() } } - statusBar()->changeItem(i18n(" Transfers: %1 ").arg(myTransferList->childCount()), ID_TOTAL_TRANSFERS); - statusBar()->changeItem(i18n(" Files: %1 ").arg(totalFiles), ID_TOTAL_FILES); - statusBar()->changeItem(i18n(" Size: %1 ").arg(KIO::convertSize(totalSize)), ID_TOTAL_SIZE); - statusBar()->changeItem(i18n(" Time: %1 ").arg(KIO::convertSeconds(remTime)), ID_TOTAL_TIME); - statusBar()->changeItem(i18n(" %1/s ").arg(KIO::convertSize(totalSpeed)), ID_TOTAL_SPEED); + statusBar()->changeItem(i18n(" Transfers: %1 ").tqarg(myTransferList->childCount()), ID_TOTAL_TRANSFERS); + statusBar()->changeItem(i18n(" Files: %1 ").tqarg(totalFiles), ID_TOTAL_FILES); + statusBar()->changeItem(i18n(" Size: %1 ").tqarg(KIO::convertSize(totalSize)), ID_TOTAL_SIZE); + statusBar()->changeItem(i18n(" Time: %1 ").tqarg(KIO::convertSeconds(remTime)), ID_TOTAL_TIME); + statusBar()->changeItem(i18n(" %1/s ").tqarg(KIO::convertSize(totalSpeed)), ID_TOTAL_SPEED); //update size for each statusbar field statusBar()->setItemFixed(ID_TOTAL_TRANSFERS, -1); statusBar()->setItemFixed(ID_TOTAL_FILES, -1); @@ -2179,11 +2179,11 @@ void KMainWidget::updateStatusBar() statusBar()->setItemFixed(ID_TOTAL_SPEED, -1); if (kdock) { - tmpstr = i18n("<b>Transfers:</b> %1 ").arg(myTransferList->childCount()) + - i18n("<br /><b>Files:</b> %1 ").arg(totalFiles) + - i18n("<br /><b>Size:</b> %1 ").arg(KIO::convertSize(totalSize)) + - i18n("<br /><b>Time:</b> %1 ").arg(KIO::convertSeconds(remTime)) + - i18n("<br /><b>Speed:</b> %1/s").arg(KIO::convertSize(totalSpeed)); + tmpstr = i18n("<b>Transfers:</b> %1 ").tqarg(myTransferList->childCount()) + + i18n("<br /><b>Files:</b> %1 ").tqarg(totalFiles) + + i18n("<br /><b>Size:</b> %1 ").tqarg(KIO::convertSize(totalSize)) + + i18n("<br /><b>Time:</b> %1 ").tqarg(KIO::convertSeconds(remTime)) + + i18n("<br /><b>Speed:</b> %1/s").tqarg(KIO::convertSize(totalSpeed)); kdock->updateToolTip( tmpstr ); //trayicon changes if download is in progress if (totalSpeed == 0) @@ -2239,7 +2239,7 @@ void KMainWidget::slotCheckConnection() if (b_connected != old) { if (b_connected) { log(i18n("We are online.")); - setCaption(TQString::null, false); + setCaption(TQString(), false); ksettings.b_offline=ksettings.b_offlineMode; checkQueue(); } else { @@ -2461,19 +2461,19 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) if (!url.isValid() || !KProtocolInfo::supportsReading( url ) ) { if (!ksettings.b_expertMode) - KMessageBox::error(this, i18n("Malformed URL:\n%1").arg(url.prettyURL()), i18n("Error")); + KMessageBox::error(this, i18n("Malformed URL:\n%1").tqarg(url.prettyURL()), i18n("Error")); return false; } // if we find this URL in the list - Transfer *transfer = myTransferList->find( url ); + Transfer *transfer = myTransferList->tqfind( url ); if ( transfer ) { - if ( transfer->getStatus() != Transfer::ST_FINISHED ) + if ( transfer->gettqStatus() != Transfer::ST_FINISHED ) { if ( !ksettings.b_expertMode ) { - KMessageBox::error(this, i18n("Already saving URL\n%1").arg(url.prettyURL()), i18n("Error")); + KMessageBox::error(this, i18n("Already saving URL\n%1").tqarg(url.prettyURL()), i18n("Error")); } transfer->showIndividual(); @@ -2483,7 +2483,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) else // transfer is finished, ask if we want to download again { if ( ksettings.b_expertMode || - (KMessageBox::questionYesNo(this, i18n("Already saved URL\n%1\nDownload again?").arg(url.prettyURL()),i18n("Question"),i18n("Download Again"),KStdGuiItem::cancel() ) + (KMessageBox::questionYesNo(this, i18n("Already saved URL\n%1\nDownload again?").tqarg(url.prettyURL()),i18n("Question"),i18n("Download Again"),KStdGuiItem::cancel() ) == KMessageBox::Yes) ) { transfer->slotRequestRemove(); @@ -2498,7 +2498,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) // why restrict this to ftp and http? (pfeiffer) // // don't download file URL's TODO : uncomment? // if (url.protocol() == "http" && url.protocol() != "ftp") { -// KMessageBox::error(this, i18n("File protocol not accepted!\n%1").arg(url.prettyURL()), i18n("Error")); +// KMessageBox::error(this, i18n("File protocol not accepted!\n%1").tqarg(url.prettyURL()), i18n("Error")); // #ifdef _DEBUG // sDebugOut << endl; // #endif diff --git a/kget/kmainwidget.h b/kget/kmainwidget.h index 363ca2f0..8fb75c51 100644 --- a/kget/kmainwidget.h +++ b/kget/kmainwidget.h @@ -52,7 +52,8 @@ class Settings; class KMainWidget:public KMainWindow, virtual public KGetIface { -Q_OBJECT + Q_OBJECT + TQ_OBJECT public: enum StatusbarFields { ID_TOTAL_TRANSFERS = 1, ID_TOTAL_FILES, ID_TOTAL_SIZE, @@ -66,7 +67,7 @@ public: const KURL& destFile = KURL()); // dcop interface - virtual void addTransfers( const KURL::List& src, const TQString& destDir = TQString::null ); + virtual void addTransfers( const KURL::List& src, const TQString& destDir = TQString() ); virtual bool isDropTargetVisible() const; virtual void setDropTargetVisible( bool setVisible ); diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp index 09490134..7ce11939 100644 --- a/kget/logwindow.cpp +++ b/kget/logwindow.cpp @@ -45,8 +45,8 @@ // res.simplifyWhiteSpace(); // int pos; -// while ( (pos = res.find(' ')) != -1) { -// res.replace(pos, 1, new TQChar( 0x00a0 ), 1); +// while ( (pos = res.tqfind(' ')) != -1) { +// res.tqreplace(pos, 1, new TQChar( 0x00a0 ), 1); // } // return res; @@ -58,14 +58,14 @@ static TQString removeHTML(const TQString & str) TQString res = str; int pos; - // replace <br/> with a newline - while ((pos = res.find("<br/>")) != -1) { - res.replace(pos, 4, "\n"); + // tqreplace <br/> with a newline + while ((pos = res.tqfind("<br/>")) != -1) { + res.tqreplace(pos, 4, "\n"); } // remove all tags - while ((pos = res.find('<')) != -1) { - int pos2 = res.find('>', pos); + while ((pos = res.tqfind('<')) != -1) { + int pos2 = res.tqfind('>', pos); if (pos2 == -1) { pos2 = res.length() + 1; @@ -77,7 +77,7 @@ static TQString removeHTML(const TQString & str) } -SeparatedLog::SeparatedLog(TQWidget * parent):TQWidget(parent) +SeparatedLog::SeparatedLog(TQWidget * tqparent):TQWidget(tqparent) { idSelected = 0; @@ -112,7 +112,7 @@ SeparatedLog::SeparatedLog(TQWidget * parent):TQWidget(parent) void SeparatedLog::addLog(uint id, const TQString & filename, const TQString & message) { - if (!trMap.contains(id)) { + if (!trMap.tqcontains(id)) { trMap.insert(id, message); TQListViewItem *last=lv_log->lastItem(); new TQListViewItem(lv_log, last); @@ -200,7 +200,7 @@ void LogWindow::logTransfer(uint id, const TQString & filename, const TQString & { TQString mixed_msg, single_msg, job_id; - job_id = TQString("Job[<font color=\"red\">%1</font>] : ").arg(id); + job_id = TQString("Job[<font color=\"red\">%1</font>] : ").tqarg(id); mixed_msg = "<font color=\"blue\">" + TQTime::currentTime().toString() + "</font> : " + job_id + message; single_msg = "<font color=\"blue\">" + TQTime::currentTime().toString() + "</font> : " + message; diff --git a/kget/logwindow.h b/kget/logwindow.h index 6f9bd8d8..46d18439 100644 --- a/kget/logwindow.h +++ b/kget/logwindow.h @@ -36,11 +36,12 @@ class TQListView; class TQTextEdit; -class SeparatedLog:public QWidget +class SeparatedLog:public TQWidget { - -Q_OBJECT public: - SeparatedLog(TQWidget * parent); + Q_OBJECT + TQ_OBJECT +public: + SeparatedLog(TQWidget * tqparent); ~SeparatedLog() {} void addLog(uint id, const TQString & filename, const TQString & message); @@ -62,8 +63,9 @@ private: class LogWindow:public KDialogBase { - -Q_OBJECT public: + Q_OBJECT + TQ_OBJECT +public: LogWindow(); ~LogWindow() {} diff --git a/kget/main.cpp b/kget/main.cpp index f6ca1cb0..68f07c60 100644 --- a/kget/main.cpp +++ b/kget/main.cpp @@ -93,7 +93,7 @@ static void setSignalHandler(void (*handler) (int)) static void cleanup(void) { - qInstallMsgHandler(0L /*oldMsgHandler*/); + tqInstallMsgHandler(0L /*oldMsgHandler*/); // TQString cmd; } diff --git a/kget/safedelete.cpp b/kget/safedelete.cpp index 16deb1dd..3cf7b8fd 100644 --- a/kget/safedelete.cpp +++ b/kget/safedelete.cpp @@ -16,7 +16,7 @@ bool SafeDelete::deleteFile( const KURL& url ) { KMessageBox::information(0L, i18n("Not deleting\n%1\nas it is a " - "directory.").arg( url.prettyURL() ), + "directory.").tqarg( url.prettyURL() ), i18n("Not Deleted")); return false; } @@ -28,7 +28,7 @@ bool SafeDelete::deleteFile( const KURL& url ) else KMessageBox::information( 0L, i18n("Not deleting\n%1\nas it is not a local" - " file.").arg( url.prettyURL() ), + " file.").tqarg( url.prettyURL() ), i18n("Not Deleted") ); return false; diff --git a/kget/settings.cpp b/kget/settings.cpp index 942acb09..4329dfc8 100644 --- a/kget/settings.cpp +++ b/kget/settings.cpp @@ -91,7 +91,7 @@ Settings::load() b_timedDisconnect = config->readBoolEntry("TimedDisconnect", DEF_TimedDisconnect); disconnectTime.setHMS(config->readNumEntry("DisconnectTimeHour"), config->readNumEntry("DisconnectTimeMinute"), 0); - disconnectDate = TQDate::currentDate(); // doesn't make sense to save it + disconnectDate = TQDate::tqcurrentDate(); // doesn't make sense to save it b_autoShutdown = config->readBoolEntry("AutoShutdown", DEF_AutoShutdown); b_autoPaste = config->readBoolEntry("AutoPaste", DEF_AutoPaste); @@ -175,14 +175,14 @@ Settings::load() listViewFont = config->readFontEntry("Font", &font); - // read main window geometry settings + // read main window tqgeometry settings config->setGroup("MainGeometry"); const TQPoint point(-1,-1); mainPosition = config->readPointEntry("Position", &point); mainSize = config->readSizeEntry("Size"); mainState = config->readUnsignedLongNumEntry("State", 0); - // read drop target geometry settings + // read drop target tqgeometry settings config->setGroup("DropGeometry"); dropPosition = config->readPointEntry("Position", &point); dropState = config->readUnsignedLongNumEntry("State", DEFAULT_DOCK_STATE ); @@ -269,13 +269,13 @@ void Settings::save() config->setGroup("Misc"); config->writeEntry("Font", listViewFont); - // write main window geometry properties + // write main window tqgeometry properties config->setGroup("MainGeometry"); config->writeEntry("Position", kmain->pos()); config->writeEntry("Size", kmain->size()); config->writeEntry("State", KWin::windowInfo(kmain->winId()).state()); - // write drop target geometry properties + // write drop target tqgeometry properties config->setGroup("DropGeometry"); config->writeEntry("Position", kdrop->pos()); unsigned long state = KWin::windowInfo(kdrop->winId()).state(); diff --git a/kget/settings.h b/kget/settings.h index 7c02b166..aeaaba98 100644 --- a/kget/settings.h +++ b/kget/settings.h @@ -172,7 +172,7 @@ public: TQFont listViewFont; - // geometry settings + // tqgeometry settings TQPoint mainPosition; TQSize mainSize; unsigned long int mainState; diff --git a/kget/slave.cpp b/kget/slave.cpp index f8569e79..0a1fa766 100644 --- a/kget/slave.cpp +++ b/kget/slave.cpp @@ -70,7 +70,7 @@ void Slave::Op(SlaveCommand _cmd) } /** No descriptions */ -void Slave::PostMessage(SlaveResult _event, Q_ULLONG _data) +void Slave::PostMessage(SlaveResult _event, TQ_ULLONG _data) { SlaveEvent *e1 = new SlaveEvent(m_parent, _event, _data); diff --git a/kget/slave.h b/kget/slave.h index 1bb2635c..8e483982 100644 --- a/kget/slave.h +++ b/kget/slave.h @@ -43,9 +43,10 @@ namespace KIO class Transfer; -class Slave:public TQObject, public QThread +class Slave:public TQObject, public TQThread { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: enum SlaveCommand { @@ -82,7 +83,7 @@ private slots: private: void Connect(); - void PostMessage(SlaveResult _event, Q_ULLONG _data = 0L); + void PostMessage(SlaveResult _event, TQ_ULLONG _data = 0L); void PostMessage(SlaveResult _event, const TQString & _msg); void InfoMessage(const TQString & _msg); diff --git a/kget/slaveevent.cpp b/kget/slaveevent.cpp index 87d4c07a..fecd43ed 100644 --- a/kget/slaveevent.cpp +++ b/kget/slaveevent.cpp @@ -28,7 +28,7 @@ #define EVENT_TYPE (TQEvent::User + 252) -SlaveEvent::SlaveEvent(Transfer * _item, unsigned int _event, Q_ULLONG _ldata):TQCustomEvent(EVENT_TYPE) +SlaveEvent::SlaveEvent(Transfer * _item, unsigned int _event, TQ_ULLONG _ldata):TQCustomEvent(EVENT_TYPE) { m_event = _event; m_item = _item; @@ -61,7 +61,7 @@ Transfer *SlaveEvent::getItem() const return m_item; } -Q_ULLONG SlaveEvent::getData() const +TQ_ULLONG SlaveEvent::getData() const { return m_ldata; } diff --git a/kget/slaveevent.h b/kget/slaveevent.h index 6f87bbbe..adc29aa2 100644 --- a/kget/slaveevent.h +++ b/kget/slaveevent.h @@ -35,23 +35,23 @@ class Transfer; *@author Patrick Charbonnier */ -class SlaveEvent:public QCustomEvent +class SlaveEvent:public TQCustomEvent { public: - SlaveEvent(Transfer * _item, unsigned int _event, Q_ULLONG _ldata = 0L); + SlaveEvent(Transfer * _item, unsigned int _event, TQ_ULLONG _ldata = 0L); SlaveEvent(Transfer * _item, unsigned int _event, const TQString & _msg); ~SlaveEvent(); unsigned int getEvent() const; Transfer *getItem() const; - Q_ULLONG getData() const; + TQ_ULLONG getData() const; const TQString & getMsg() const; private: unsigned int m_event; Transfer *m_item; - Q_ULLONG m_ldata; + TQ_ULLONG m_ldata; TQString m_msg; }; diff --git a/kget/transfer.cpp b/kget/transfer.cpp index 7569e52b..e06cdfc5 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -109,7 +109,7 @@ Transfer::init(const uint _id) id = _id; m_pSlave = new Slave(this, src, dest); canResume = false; - startTime = TQDateTime::currentDateTime(); + startTime = TQDateTime::tqcurrentDateTime(); speed = 0; // retryCount = ksettings.reconnectRetries-1; retryCount = 0; @@ -178,7 +178,7 @@ void Transfer::synchronousAbort() void Transfer::slotUpdateActions() { - sDebugIn << "the item Status is =" << status << "offline=" << ksettings.b_offline << endl; + sDebugIn << "the item tqStatus is =" << status << "offline=" << ksettings.b_offline << endl; //if we are offline just disable Resume and Pause and return if (ksettings.b_offline) { m_paResume->setEnabled(false); @@ -218,7 +218,7 @@ void Transfer::slotUpdateActions() m_paDelay->blockSignals(true); switch (mode) { - case MD_QUEUED: + case MD_TQUEUED: m_paQueue->setChecked(true); break; case MD_SCHEDULED: @@ -270,10 +270,10 @@ void Transfer::updateAll() { sDebugIn << endl; - updateStatus(status); // first phase of animation + updatetqStatus(status); // first phase of animation - logMessage(i18n("Copy file from: %1").arg(src.prettyURL())); - logMessage(i18n("To: %1").arg(dest.prettyURL())); + logMessage(i18n("Copy file from: %1").tqarg(src.prettyURL())); + logMessage(i18n("To: %1").tqarg(dest.prettyURL())); // source setText(view->lv_url, src.prettyURL()); @@ -291,7 +291,7 @@ void Transfer::updateAll() } if (totalSize != 0) { - //logMessage(i18n("Total size is %1 bytes").arg((double)totalSize)); + //logMessage(i18n("Total size is %1 bytes").tqarg((double)totalSize)); setText(view->lv_total, KIO::convertSize(totalSize)); } else { //logMessage(i18n("Total size is unknown")); @@ -303,7 +303,7 @@ void Transfer::updateAll() } -bool Transfer::updateStatus(int counter) +bool Transfer::updatetqStatus(int counter) { //sDebug<< ">>>>Entering"<<endl; @@ -323,7 +323,7 @@ bool Transfer::updateStatus(int counter) isTransfer = true; break; case ST_STOPPED: - if(mode == MD_QUEUED) + if(mode == MD_TQUEUED) pix = &view->pixQueued; else if(mode == MD_SCHEDULED) pix = &view->pixScheduled; @@ -337,18 +337,18 @@ bool Transfer::updateStatus(int counter) setPixmap(view->lv_pixmap, *pix); view->setUpdatesEnabled(true); - if(prevStatus!=status || prevMode != mode || status==ST_RUNNING || status==ST_TRYING) + if(prevtqStatus!=status || prevMode != mode || status==ST_RUNNING || status==ST_TRYING) { TQRect rect = view->header()->sectionRect(view->lv_pixmap); int x = rect.x(); - int y = view->itemRect(this).y(); + int y = view->tqitemRect(this).y(); int w = rect.width(); int h = rect.height(); view->TQScrollView::updateContents(x,y,w,h); - prevStatus = status; + prevtqStatus = status; prevMode = mode; } @@ -385,8 +385,8 @@ void Transfer::slotResume() m_paResume->setEnabled(false); status = ST_TRYING; - mode = MD_QUEUED; - logMessage(i18n("Attempt number %1").arg(retryCount)); + mode = MD_TQUEUED; + logMessage(i18n("Attempt number %1").tqarg(retryCount)); sDebug << "sending Resume to slave " << endl; m_pSlave->Op(Slave::RETR); @@ -407,7 +407,7 @@ void Transfer::slotResume() sDebug << "Killing Slave" << endl; slotSpeed(0); - mode = MD_QUEUED; + mode = MD_TQUEUED; status=ST_STOPPED; m_paQueue->setChecked(true); @@ -455,7 +455,7 @@ void Transfer::slotRequestRemove() if (dlgIndividual && !ksettings.b_expertMode) { if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete this transfer?"), - TQString::null, KStdGuiItem::del(), + TQString(), KStdGuiItem::del(), TQString("delete_transfer")) != KMessageBox::Continue) return; @@ -492,11 +492,11 @@ void Transfer::slotQueue() logMessage(i18n("Queueing")); - assert(!(mode == MD_QUEUED)); + assert(!(mode == MD_TQUEUED)); - mode = MD_QUEUED; + mode = MD_TQUEUED; m_paQueue->setChecked(true); - emit statusChanged(this, OP_QUEUED); + emit statusChanged(this, OP_TQUEUED); sDebugOut << endl; } @@ -510,8 +510,8 @@ void Transfer::slotRequestSchedule() // if the time was already set somewhere in the future, keep it // otherwise set it to the current time + 60 seconds - if (startTime < TQDateTime::currentDateTime()) { - TQDateTime dt = TQDateTime::currentDateTime(); + if (startTime < TQDateTime::tqcurrentDateTime()) { + TQDateTime dt = TQDateTime::tqcurrentDateTime(); startTime = dt.addSecs(60); } if (status == ST_RUNNING) { @@ -581,7 +581,7 @@ void Transfer::slotRenaming(KIO::Job *, const KURL &, const KURL & to) dest = to; - logMessage(i18n("Renaming to %1").arg(dest.prettyURL().ascii())); + logMessage(i18n("Renaming to %1").tqarg(dest.prettyURL().ascii())); // destination setText (view->lv_filename, dest.fileName ()); @@ -623,7 +623,7 @@ void Transfer::slotSpeed(unsigned long bytes_per_second) dlgIndividual->setSpeed(i18n("Stopped")); } else { - TQString tmps = i18n("%1/s").arg(KIO::convertSize(speed)); + TQString tmps = i18n("%1/s").tqarg(KIO::convertSize(speed)); setText(view->lv_speed, tmps); setText(view->lv_remaining, remainingTime); if(dlgIndividual) @@ -644,7 +644,7 @@ void Transfer::slotTotalSize(KIO::filesize_t bytes) if (totalSize == 0) { totalSize = bytes; if (totalSize != 0) { - logMessage(i18n("Total size is %1 bytes").arg((double)totalSize,0,'f',0)); + logMessage(i18n("Total size is %1 bytes").tqarg((double)totalSize,0,'f',0)); setText(view->lv_total, KIO::convertSize(totalSize)); if(dlgIndividual) { @@ -786,8 +786,8 @@ bool Transfer::read(KSimpleConfig * config, int id) return false; } - mode = (TransferMode) config->readNumEntry("Mode", MD_QUEUED); - status = (TransferStatus) config->readNumEntry("Status", ST_RUNNING); + mode = (TransferMode) config->readNumEntry("Mode", MD_TQUEUED); + status = (TransfertqStatus) config->readNumEntry("tqStatus", ST_RUNNING); startTime = config->readDateTimeEntry("ScheduledTime"); canResume = config->readBoolEntry("CanResume", true); totalSize = config->readUnsignedNum64Entry("TotalSize", 0); @@ -815,7 +815,7 @@ void Transfer::write(KSimpleConfig * config, int id) config->writePathEntry("Source", src.url()); config->writePathEntry("Dest", dest.url()); config->writeEntry("Mode", mode); - config->writeEntry("Status", status); + config->writeEntry("tqStatus", status); config->writeEntry("CanResume", canResume); config->writeEntry("TotalSize", totalSize ); config->writeEntry("ProcessedSize", processedSize ); @@ -851,7 +851,7 @@ void Transfer::slotExecError() status = ST_STOPPED; mode = MD_SCHEDULED; - startTime=TQDateTime::currentDateTime().addSecs(ksettings.reconnectTime * 60); + startTime=TQDateTime::tqcurrentDateTime().addSecs(ksettings.reconnectTime * 60); emit statusChanged(this, OP_SCHEDULED); sDebugOut << endl; @@ -862,8 +862,8 @@ void Transfer::slotExecBroken() sDebugIn << endl; status = ST_STOPPED; - mode = MD_QUEUED; - emit statusChanged(this, OP_QUEUED); + mode = MD_TQUEUED; + emit statusChanged(this, OP_TQUEUED); sDebugOut << endl; } @@ -897,8 +897,8 @@ void Transfer::slotExecConnected() m_pSlave->Op(Slave::KILL); if (ksettings.b_addQueued) { - mode = MD_QUEUED; - emit statusChanged(this, OP_QUEUED); + mode = MD_TQUEUED; + emit statusChanged(this, OP_TQUEUED); } else { @@ -982,7 +982,7 @@ bool Transfer::keepDialogOpen() const void Transfer::maybeShow() { - if ( ksettings.b_showIndividual && getStatus() != Transfer::ST_FINISHED ) + if ( ksettings.b_showIndividual && gettqStatus() != Transfer::ST_FINISHED ) { if(dlgIndividual) dlgIndividual->show(); @@ -1016,7 +1016,7 @@ void Transfer::NotInCache() { logMessage(i18n("checking if file is in cache...no")); if (ksettings.b_addQueued) - mode = MD_QUEUED; + mode = MD_TQUEUED; else mode = MD_DELAYED; status = ST_STOPPED; diff --git a/kget/transfer.h b/kget/transfer.h index d528a6a7..17e4aa08 100644 --- a/kget/transfer.h +++ b/kget/transfer.h @@ -53,14 +53,15 @@ class TransferList; class Transfer:public TQObject, public KListViewItem { Q_OBJECT + TQ_OBJECT public: - enum TransferMode { MD_QUEUED, MD_DELAYED, MD_SCHEDULED, MD_NONE, MD_NEW }; + enum TransferMode { MD_TQUEUED, MD_DELAYED, MD_SCHEDULED, MD_NONE, MD_NEW }; - enum TransferStatus { ST_TRYING, ST_RUNNING, ST_STOPPED, ST_FINISHED }; + enum TransfertqStatus { ST_TRYING, ST_RUNNING, ST_STOPPED, ST_FINISHED }; enum TransferOperation { OP_FINISHED, OP_RESUMED, OP_PAUSED, OP_REMOVED, OP_ABORTED, - OP_QUEUED, OP_SCHEDULED, OP_DELAYED, OP_CONNECTED + OP_TQUEUED, OP_SCHEDULED, OP_DELAYED, OP_CONNECTED }; @@ -113,7 +114,7 @@ public: { return speed; } - TransferStatus getStatus()const + TransfertqStatus gettqStatus()const { return status; } @@ -126,7 +127,7 @@ public: { mode = _mode; } - void setStatus(TransferStatus _status) + void settqStatus(TransfertqStatus _status) { status = _status; }; @@ -138,7 +139,7 @@ public: // update methods void updateAll(); - bool updateStatus(int counter); + bool updatetqStatus(int counter); void showIndividual(); void UpdateRetry(); @@ -219,10 +220,10 @@ private: unsigned int remainingTimeSec; TQString remainingTime; - TransferStatus status; + TransfertqStatus status; TransferMode mode; - TransferStatus prevStatus; + TransfertqStatus prevtqStatus; TransferMode prevMode; // how many times have we retried already diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index bf54cb87..9de03889 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -52,8 +52,8 @@ static int defaultColumnWidth[] = { }; -TransferList::TransferList(TQWidget * parent, const char *name) - : KListView(parent, name) +TransferList::TransferList(TQWidget * tqparent, const char *name) + : KListView(tqparent, name) { // enable selection of more than one item setSelectionMode( TQListView::Extended ); @@ -75,7 +75,7 @@ TransferList::TransferList(TQWidget * parent, const char *name) jobid=1; - // initial layout + // initial tqlayout KConfig *config = KGlobal::config(); config->setGroup("ListView"); if ( config->readListEntry("ColumnWidths").isEmpty() ) @@ -96,11 +96,11 @@ TransferList::TransferList(TQWidget * parent, const char *name) animTry.setAutoDelete(true); for (int i = 0; i < 8; i++) { curPix = new TQPixmap(); - curPix->load(locate("appdata", connectPath.arg(i))); + curPix->load(locate("appdata", connectPath.tqarg(i))); animConn.append(curPix); curPix = new TQPixmap(); - curPix->load(locate("appdata", tryPath.arg(i))); + curPix->load(locate("appdata", tryPath.tqarg(i))); animTry.append(curPix); } } @@ -182,14 +182,14 @@ void TransferList::moveToEnd(Transfer * item) } -bool TransferList::updateStatus(int counter) +bool TransferList::updatetqStatus(int counter) { bool isTransfer = false; TransferIterator it(this); for (; it.current(); ++it) { - isTransfer |= it.current()->updateStatus(counter); + isTransfer |= it.current()->updatetqStatus(counter); } return isTransfer; @@ -202,7 +202,7 @@ bool TransferList::areTransfersQueuedOrScheduled() if (childCount() > 0) { for (; it.current(); ++it) { - if ((it.current()->getMode() == Transfer::MD_QUEUED)|| \ + if ((it.current()->getMode() == Transfer::MD_TQUEUED)|| \ (it.current()->getMode() == Transfer::MD_SCHEDULED)) return true; } @@ -211,7 +211,7 @@ bool TransferList::areTransfersQueuedOrScheduled() } -Transfer * TransferList::find(const KURL& _src) +Transfer * TransferList::tqfind(const KURL& _src) { TransferIterator it(this); @@ -229,7 +229,7 @@ void TransferList::readTransfers(const KURL& file) { TQString tmpFile; - if (KIO::NetAccess::download(file, tmpFile, (TQWidget*)parent())) { + if (KIO::NetAccess::download(file, tmpFile, (TQWidget*)tqparent())) { KSimpleConfig config(tmpFile); config.setGroup("Common"); diff --git a/kget/transferlist.h b/kget/transferlist.h index 89f50e6a..e9c7d546 100644 --- a/kget/transferlist.h +++ b/kget/transferlist.h @@ -34,7 +34,7 @@ class Transfer; -class TransferIterator:public QListViewItemIterator +class TransferIterator:public TQListViewItemIterator { public: @@ -56,10 +56,12 @@ public: class TransferList:public KListView { -Q_OBJECT public: + Q_OBJECT + TQ_OBJECT +public: - TransferList(TQWidget * parent = 0, const char *name = 0); + TransferList(TQWidget * tqparent = 0, const char *name = 0); virtual ~ TransferList(); Transfer *addTransfer(const KURL & _source, const KURL & _dest, @@ -74,8 +76,8 @@ Q_OBJECT public: { return phasesNum; } - bool updateStatus(int counter); - Transfer * find(const KURL& _src); + bool updatetqStatus(int counter); + Transfer * tqfind(const KURL& _src); bool areTransfersQueuedOrScheduled(); void readTransfers(const KURL& file); |