From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- kget/dlgAutomation.cpp | 2 +- kget/dlgConnection.cpp | 2 +- kget/dlgDirectories.cpp | 4 +- kget/dlgIndividual.cpp | 22 ++++----- kget/dlgLimits.cpp | 2 +- kget/dlgPreferences.cpp | 2 +- kget/dlgadvancedbase.ui | 4 +- kget/dlgautomationbase.ui | 6 +-- kget/dlgconnectionbase.ui | 10 ++-- kget/dlgdirectoriesbase.ui | 6 +-- kget/dlglimitsbase.ui | 6 +-- kget/dlgsystembase.ui | 4 +- kget/docking.cpp | 6 +-- kget/docking.h | 2 +- kget/droptarget.cpp | 2 +- kget/kfileio.cpp | 32 ++++++------- kget/kget_plug_in/kget_linkview.cpp | 10 ++-- kget/kget_plug_in/links.cpp | 6 +-- kget/kmainwidget.cpp | 96 ++++++++++++++++++------------------- kget/logwindow.cpp | 6 +-- kget/safedelete.cpp | 4 +- kget/settings.cpp | 10 ++-- kget/settings.h | 2 +- kget/transfer.cpp | 36 +++++++------- kget/transfer.h | 12 ++--- kget/transferlist.cpp | 10 ++-- kget/transferlist.h | 2 +- 27 files changed, 153 insertions(+), 153 deletions(-) (limited to 'kget') diff --git a/kget/dlgAutomation.cpp b/kget/dlgAutomation.cpp index 128a9209..779cacf3 100644 --- a/kget/dlgAutomation.cpp +++ b/kget/dlgAutomation.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/kget/dlgConnection.cpp b/kget/dlgConnection.cpp index 5e46eb21..5530953b 100644 --- a/kget/dlgConnection.cpp +++ b/kget/dlgConnection.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp index a373cc67..29d11dc0 100644 --- a/kget/dlgDirectories.cpp +++ b/kget/dlgDirectories.cpp @@ -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; } @@ -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/dlgIndividual.cpp b/kget/dlgIndividual.cpp index 5e6889cd..b61f7c72 100644 --- a/kget/dlgIndividual.cpp +++ b/kget/dlgIndividual.cpp @@ -25,14 +25,14 @@ ***************************************************************************/ -#include +#include #include "dockindividual.h" #include #include #include -#include +#include #include #include #include @@ -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/dlgLimits.cpp b/kget/dlgLimits.cpp index 534dc4f6..8c6ded6d 100644 --- a/kget/dlgLimits.cpp +++ b/kget/dlgLimits.cpp @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp index 9f6a84b8..cc5ebb43 100644 --- a/kget/dlgPreferences.cpp +++ b/kget/dlgPreferences.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ -#include +#include #include #include diff --git a/kget/dlgadvancedbase.ui b/kget/dlgadvancedbase.ui index 03436214..9b317d91 100644 --- a/kget/dlgadvancedbase.ui +++ b/kget/dlgadvancedbase.ui @@ -48,7 +48,7 @@ Preferred - + 40 20 @@ -178,7 +178,7 @@ Expanding - + 35 20 diff --git a/kget/dlgautomationbase.ui b/kget/dlgautomationbase.ui index bad713e1..abf40f34 100644 --- a/kget/dlgautomationbase.ui +++ b/kget/dlgautomationbase.ui @@ -112,7 +112,7 @@ Preferred - + 40 20 @@ -129,7 +129,7 @@ Preferred - + 50 20 @@ -146,7 +146,7 @@ Preferred - + 50 20 diff --git a/kget/dlgconnectionbase.ui b/kget/dlgconnectionbase.ui index 1a0034e5..49eada65 100644 --- a/kget/dlgconnectionbase.ui +++ b/kget/dlgconnectionbase.ui @@ -94,7 +94,7 @@ Expanding - + 40 20 @@ -111,7 +111,7 @@ Expanding - + 40 20 @@ -141,7 +141,7 @@ Expanding - + 40 20 @@ -174,7 +174,7 @@ Expanding - + 40 20 @@ -283,7 +283,7 @@ Expanding - + 20 20 diff --git a/kget/dlgdirectoriesbase.ui b/kget/dlgdirectoriesbase.ui index 1c86ec64..6a86b045 100644 --- a/kget/dlgdirectoriesbase.ui +++ b/kget/dlgdirectoriesbase.ui @@ -21,7 +21,7 @@ - layout1 + tqlayout1 @@ -51,7 +51,7 @@ Expanding - + 20 40 @@ -106,7 +106,7 @@ - layout12 + tqlayout12 diff --git a/kget/dlglimitsbase.ui b/kget/dlglimitsbase.ui index 29af48da..09e0cbce 100644 --- a/kget/dlglimitsbase.ui +++ b/kget/dlglimitsbase.ui @@ -106,7 +106,7 @@ Expanding - + 40 20 @@ -123,7 +123,7 @@ Expanding - + 40 20 @@ -140,7 +140,7 @@ Expanding - + 40 20 diff --git a/kget/dlgsystembase.ui b/kget/dlgsystembase.ui index 03fa75fe..5d516195 100644 --- a/kget/dlgsystembase.ui +++ b/kget/dlgsystembase.ui @@ -107,7 +107,7 @@ Expanding - + 40 20 @@ -124,7 +124,7 @@ Expanding - + 40 10 diff --git a/kget/docking.cpp b/kget/docking.cpp index b13e04a5..c637303d 100644 --- a/kget/docking.cpp +++ b/kget/docking.cpp @@ -56,7 +56,7 @@ DockWidget::DockWidget(KMainWidget * _parent):KSystemTray(_parent) setAcceptDrops(true); dtip = new DynamicTip( this ); - dtip->setStatus( kapp->aboutData()->shortDescription() ); + dtip->settqStatus( kapp->aboutData()->shortDescription() ); } @@ -100,7 +100,7 @@ void DockWidget::mousePressEvent(TQMouseEvent * e) void DockWidget::updateToolTip( const TQString& _status ) { - dtip->setStatus( _status ); + dtip->settqStatus( _status ); } @@ -117,7 +117,7 @@ DynamicTip::DynamicTip( TQWidget * parent ) } -void DynamicTip::setStatus( const TQString & _status ) +void DynamicTip::settqStatus( const TQString & _status ) { status = _status; } diff --git a/kget/docking.h b/kget/docking.h index d7c73aac..7d866c88 100644 --- a/kget/docking.h +++ b/kget/docking.h @@ -43,7 +43,7 @@ class DynamicTip : public TQToolTip public: DynamicTip( TQWidget * parent ); 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 & ); diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp index 9fdf6ee5..78bad0b4 100644 --- a/kget/droptarget.cpp +++ b/kget/droptarget.cpp @@ -45,7 +45,7 @@ #include #include #undef Bool -#undef Status +#undef tqStatus #endif #include "settings.h" #include "droptarget.h" diff --git a/kget/kfileio.cpp b/kget/kfileio.cpp index 59f26af6..51149baa 100644 --- a/kget/kfileio.cpp +++ b/kget/kfileio.cpp @@ -42,17 +42,17 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose if (!info.exists()) { if (aVerbose) - KMessageBox::error(tqApp->mainWidget(), i18n("The specified file does not exist:\n%1").arg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("The specified file does not exist:\n%1").tqarg(aFileName)); return TQString(); } if (info.isDir()) { if (aVerbose) - KMessageBox::error(tqApp->mainWidget(), i18n("This is a folder and not a file:\n%1").arg(aFileName)); + 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(tqApp->mainWidget(), i18n("You do not have read permission for the file:\n%1").arg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("You do not have read permission for the file:\n%1").tqarg(aFileName)); return TQString(); } if (len <= 0) @@ -62,13 +62,13 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose if (aVerbose) switch (file.status()) { case IO_ReadError: - KMessageBox::error(tqApp->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(tqApp->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(tqApp->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(); } @@ -82,8 +82,8 @@ 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(tqApp->mainWidget(), msg); return TQString(); @@ -107,7 +107,7 @@ 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(tqApp->mainWidget(), str, TQString(), i18n("Replace"),KStdGuiItem::cancel()); if (rc != KMessageBox::Yes) @@ -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(tqApp->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(tqApp->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(tqApp->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(tqApp->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,11 +149,11 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam writeLen = file.writeBlock(aBuffer, len); if (writeLen < 0) { - KMessageBox::error(tqApp->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(tqApp->mainWidget(), msg); diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp index d97da7d8..69a3cfc1 100644 --- a/kget/kget_plug_in/kget_linkview.cpp +++ b/kget/kget_plug_in/kget_linkview.cpp @@ -1,6 +1,6 @@ #include "kget_linkview.h" -#include +#include #include #include @@ -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 ); @@ -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/links.cpp b/kget/kget_plug_in/links.cpp index 38392ea0..b1410cef 100644 --- a/kget/kget_plug_in/links.cpp +++ b/kget/kget_plug_in/links.cpp @@ -24,10 +24,10 @@ 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() ); } diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index 3271f0d0..ad5fa4a9 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -38,7 +38,7 @@ #include #endif -#include +#include #include #include #include @@ -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( TQClipboard::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); @@ -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("Auto paste 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("Drop target 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("Drop target 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("Dock widget 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."); @@ -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; @@ -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( TQClipboard::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) { @@ -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(), 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("%1 has been added.").arg(url.prettyURL())); + KNotifyClient::event(kdock->winId(), "added", i18n("%1 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(), 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,7 +1370,7 @@ 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_TQUEUED || item->getMode() == Transfer::MD_NEW); @@ -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,7 +1445,7 @@ void KMainWidget::slotTransferTimeout() for (; it.current(); ++it) { item = it.current(); - if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::currentDateTime()) { + 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("%1 successfully downloaded.").arg(srcurl)); + KNotifyClient::event(kdock->winId(), "finished", i18n("%1 successfully downloaded.").tqarg(srcurl)); } if ( item ) @@ -1593,7 +1593,7 @@ void KMainWidget::slotCopyToClipboard() if (item) { TQString url = item->getSrc().url(); - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setText( url, TQClipboard::Selection ); cb->setText( url, TQClipboard::Clipboard); myTransferList->clearSelection(); @@ -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,7 +2076,7 @@ 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); @@ -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("Transfers: %1 ").arg(myTransferList->childCount()) + - i18n("
Files: %1 ").arg(totalFiles) + - i18n("
Size: %1 ").arg(KIO::convertSize(totalSize)) + - i18n("
Time: %1 ").arg(KIO::convertSeconds(remTime)) + - i18n("
Speed: %1/s").arg(KIO::convertSize(totalSpeed)); + tmpstr = i18n("Transfers: %1 ").tqarg(myTransferList->childCount()) + + i18n("
Files: %1 ").tqarg(totalFiles) + + i18n("
Size: %1 ").tqarg(KIO::convertSize(totalSize)) + + i18n("
Time: %1 ").tqarg(KIO::convertSeconds(remTime)) + + i18n("
Speed: %1/s").tqarg(KIO::convertSize(totalSpeed)); kdock->updateToolTip( tmpstr ); //trayicon changes if download is in progress if (totalSpeed == 0) @@ -2461,7 +2461,7 @@ 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; } @@ -2469,11 +2469,11 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) Transfer *transfer = myTransferList->find( 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/logwindow.cpp b/kget/logwindow.cpp index 40045a42..30c6d486 100644 --- a/kget/logwindow.cpp +++ b/kget/logwindow.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ -#include +#include #include #include @@ -37,7 +37,7 @@ #include "logwindow.h" #include -#include +#include // // Replace regular space with nbsp // TQString replaceSpaces(const TQString &str) { @@ -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[%1] : ").arg(id); + job_id = TQString("Job[%1] : ").tqarg(id); mixed_msg = "" + TQTime::currentTime().toString() + " : " + job_id + message; single_msg = "" + TQTime::currentTime().toString() + " : " + message; 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 9e6adc4d..66bc73f6 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 7ed6a875..2571801d 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/transfer.cpp b/kget/transfer.cpp index 230daa19..36ce7887 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; @@ -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"<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; } @@ -386,7 +386,7 @@ void Transfer::slotResume() status = ST_TRYING; mode = MD_TQUEUED; - logMessage(i18n("Attempt number %1").arg(retryCount)); + logMessage(i18n("Attempt number %1").tqarg(retryCount)); sDebug << "sending Resume to slave " << endl; m_pSlave->Op(Slave::RETR); @@ -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) { @@ -787,7 +787,7 @@ bool Transfer::read(KSimpleConfig * config, int id) } mode = (TransferMode) config->readNumEntry("Mode", MD_TQUEUED); - status = (TransferStatus) config->readNumEntry("Status", ST_RUNNING); + status = (TransfertqStatus) config->readNumEntry("Status", ST_RUNNING); startTime = config->readDateTimeEntry("ScheduledTime"); canResume = config->readBoolEntry("CanResume", true); totalSize = config->readUnsignedNum64Entry("TotalSize", 0); @@ -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; @@ -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(); diff --git a/kget/transfer.h b/kget/transfer.h index c21938eb..17e4aa08 100644 --- a/kget/transfer.h +++ b/kget/transfer.h @@ -57,7 +57,7 @@ class Transfer:public TQObject, public KListViewItem public: 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, @@ -114,7 +114,7 @@ public: { return speed; } - TransferStatus getStatus()const + TransfertqStatus gettqStatus()const { return status; } @@ -127,7 +127,7 @@ public: { mode = _mode; } - void setStatus(TransferStatus _status) + void settqStatus(TransfertqStatus _status) { status = _status; }; @@ -139,7 +139,7 @@ public: // update methods void updateAll(); - bool updateStatus(int counter); + bool updatetqStatus(int counter); void showIndividual(); void UpdateRetry(); @@ -220,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 2def3372..71a48dec 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -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; diff --git a/kget/transferlist.h b/kget/transferlist.h index e32bcb3a..ae3fd6d8 100644 --- a/kget/transferlist.h +++ b/kget/transferlist.h @@ -76,7 +76,7 @@ public: { return phasesNum; } - bool updateStatus(int counter); + bool updatetqStatus(int counter); Transfer * find(const KURL& _src); bool areTransfersQueuedOrScheduled(); -- cgit v1.2.1