summaryrefslogtreecommitdiffstats
path: root/kget
diff options
context:
space:
mode:
Diffstat (limited to 'kget')
-rw-r--r--kget/dlgAutomation.cpp2
-rw-r--r--kget/dlgConnection.cpp2
-rw-r--r--kget/dlgDirectories.cpp4
-rw-r--r--kget/dlgIndividual.cpp22
-rw-r--r--kget/dlgLimits.cpp2
-rw-r--r--kget/dlgPreferences.cpp2
-rw-r--r--kget/dlgadvancedbase.ui4
-rw-r--r--kget/dlgautomationbase.ui6
-rw-r--r--kget/dlgconnectionbase.ui10
-rw-r--r--kget/dlgdirectoriesbase.ui6
-rw-r--r--kget/dlglimitsbase.ui6
-rw-r--r--kget/dlgsystembase.ui4
-rw-r--r--kget/docking.cpp6
-rw-r--r--kget/docking.h2
-rw-r--r--kget/droptarget.cpp2
-rw-r--r--kget/kfileio.cpp32
-rw-r--r--kget/kget_plug_in/kget_linkview.cpp10
-rw-r--r--kget/kget_plug_in/links.cpp6
-rw-r--r--kget/kmainwidget.cpp96
-rw-r--r--kget/logwindow.cpp6
-rw-r--r--kget/safedelete.cpp4
-rw-r--r--kget/settings.cpp10
-rw-r--r--kget/settings.h2
-rw-r--r--kget/transfer.cpp36
-rw-r--r--kget/transfer.h12
-rw-r--r--kget/transferlist.cpp10
-rw-r--r--kget/transferlist.h2
27 files changed, 153 insertions, 153 deletions
diff --git a/kget/dlgAutomation.cpp b/kget/dlgAutomation.cpp
index 779cacf3..128a9209 100644
--- a/kget/dlgAutomation.cpp
+++ b/kget/dlgAutomation.cpp
@@ -27,7 +27,7 @@
#include <tqgroupbox.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <kdatetimewidget.h>
diff --git a/kget/dlgConnection.cpp b/kget/dlgConnection.cpp
index 5530953b..5e46eb21 100644
--- a/kget/dlgConnection.cpp
+++ b/kget/dlgConnection.cpp
@@ -28,7 +28,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <kprotocolmanager.h>
diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp
index 29d11dc0..a373cc67 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").tqarg(dir), i18n("Error"));
+ KMessageBox::error(this, i18n("Folder does not exist:\n%1").arg(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").tqarg(dir), i18n("Error"));
+ KMessageBox::error(this, i18n("Folder does not exist:\n%1").arg(dir), i18n("Error"));
return;
}
diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp
index b61f7c72..5e6889cd 100644
--- a/kget/dlgIndividual.cpp
+++ b/kget/dlgIndividual.cpp
@@ -25,14 +25,14 @@
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include "dockindividual.h"
#include <tqlabel.h>
#include <tqtabwidget.h>
#include <kprogress.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqcheckbox.h>
#include <kpushbutton.h>
#include <ksqueezedtextlabel.h>
@@ -162,9 +162,9 @@ DlgIndividual::DlgIndividual(Transfer * _item)
// otherwise set it to the current time
TQDateTime dt;
- if (item->getStartTime() < TQDateTime::tqcurrentDateTime() && item->getMode() != Transfer::MD_SCHEDULED)
+ if (item->getStartTime() < TQDateTime::currentDateTime() && item->getMode() != Transfer::MD_SCHEDULED)
{
- dt = TQDateTime::tqcurrentDateTime();
+ dt = TQDateTime::currentDateTime();
}
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(tqsizeHint());
+ // ml_log->setFixedSize(sizeHint());
ml_log->setVScrollBarMode(TQScrollView::Auto);
ml_log->setWordWrap(TQTextEdit::NoWrap);
- // ml_log->tqsetSizePolicy(policy);
+ // ml_log->setSizePolicy(policy);
panelAdvanced->addTab(ml_log, i18n("Log"));
- // panelAdvanced->setFixedSize(tqsizeHint());
+ // panelAdvanced->setFixedSize(sizeHint());
@@ -197,7 +197,7 @@ DlgIndividual::DlgIndividual(Transfer * _item)
advanced = ksettings.b_advancedIndividual;
slotToggleAdvanced();
- resize( tqminimumSizeHint() );
+ resize( minimumSizeHint() );
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").tqarg(percent).tqarg(KIO::convertSize(m_iTotalSize)).tqarg(m_location.fileName()));
+ setCaption(i18n("%1% of %2 - %3").arg(percent).arg(KIO::convertSize(m_iTotalSize)).arg(m_location.fileName()));
}
void DlgIndividual::setProcessedSize(KIO::filesize_t bytes)
{
- sizeLabel->setText(i18n("%1 of %2").tqarg(KIO::convertSize(bytes)).tqarg(KIO::convertSize(m_iTotalSize)));
+ sizeLabel->setText(i18n("%1 of %2").arg(KIO::convertSize(bytes)).arg(KIO::convertSize(m_iTotalSize)));
}
@@ -315,7 +315,7 @@ void DlgIndividual::slotKeepOpenToggled(bool bToggled)
bKeepDlgOpen=bToggled;
- if (!bKeepDlgOpen && item->gettqStatus()==Transfer::ST_FINISHED)
+ if (!bKeepDlgOpen && item->getStatus()==Transfer::ST_FINISHED)
{
hide();
m_pDockIndividual->hide();
diff --git a/kget/dlgLimits.cpp b/kget/dlgLimits.cpp
index 8c6ded6d..534dc4f6 100644
--- a/kget/dlgLimits.cpp
+++ b/kget/dlgLimits.cpp
@@ -26,7 +26,7 @@
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <knuminput.h>
#include <klocale.h>
diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp
index cc5ebb43..9f6a84b8 100644
--- a/kget/dlgPreferences.cpp
+++ b/kget/dlgPreferences.cpp
@@ -25,7 +25,7 @@
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <kapplication.h>
#include <klocale.h>
diff --git a/kget/dlgadvancedbase.ui b/kget/dlgadvancedbase.ui
index 9b317d91..03436214 100644
--- a/kget/dlgadvancedbase.ui
+++ b/kget/dlgadvancedbase.ui
@@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -178,7 +178,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>35</width>
<height>20</height>
diff --git a/kget/dlgautomationbase.ui b/kget/dlgautomationbase.ui
index abf40f34..bad713e1 100644
--- a/kget/dlgautomationbase.ui
+++ b/kget/dlgautomationbase.ui
@@ -112,7 +112,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -146,7 +146,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
diff --git a/kget/dlgconnectionbase.ui b/kget/dlgconnectionbase.ui
index 49eada65..1a0034e5 100644
--- a/kget/dlgconnectionbase.ui
+++ b/kget/dlgconnectionbase.ui
@@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -174,7 +174,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -283,7 +283,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kget/dlgdirectoriesbase.ui b/kget/dlgdirectoriesbase.ui
index 6a86b045..1c86ec64 100644
--- a/kget/dlgdirectoriesbase.ui
+++ b/kget/dlgdirectoriesbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<grid>
<property name="name">
@@ -51,7 +51,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -106,7 +106,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kget/dlglimitsbase.ui b/kget/dlglimitsbase.ui
index 09e0cbce..29af48da 100644
--- a/kget/dlglimitsbase.ui
+++ b/kget/dlglimitsbase.ui
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -123,7 +123,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/kget/dlgsystembase.ui b/kget/dlgsystembase.ui
index 5d516195..03fa75fe 100644
--- a/kget/dlgsystembase.ui
+++ b/kget/dlgsystembase.ui
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>10</height>
diff --git a/kget/docking.cpp b/kget/docking.cpp
index c637303d..b13e04a5 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->settqStatus( kapp->aboutData()->shortDescription() );
+ dtip->setStatus( kapp->aboutData()->shortDescription() );
}
@@ -100,7 +100,7 @@ void DockWidget::mousePressEvent(TQMouseEvent * e)
void DockWidget::updateToolTip( const TQString& _status )
{
- dtip->settqStatus( _status );
+ dtip->setStatus( _status );
}
@@ -117,7 +117,7 @@ DynamicTip::DynamicTip( TQWidget * parent )
}
-void DynamicTip::settqStatus( const TQString & _status )
+void DynamicTip::setStatus( const TQString & _status )
{
status = _status;
}
diff --git a/kget/docking.h b/kget/docking.h
index 7d866c88..d7c73aac 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 settqStatus( const TQString & _status );
+ void setStatus( const TQString & _status );
protected:
void maybeTip( const TQPoint & );
diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp
index 78bad0b4..9fdf6ee5 100644
--- a/kget/droptarget.cpp
+++ b/kget/droptarget.cpp
@@ -45,7 +45,7 @@
#include <X11/Xos.h>
#include <X11/extensions/shape.h>
#undef Bool
-#undef tqStatus
+#undef Status
#endif
#include "settings.h"
#include "droptarget.h"
diff --git a/kget/kfileio.cpp b/kget/kfileio.cpp
index 51149baa..59f26af6 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").tqarg(aFileName));
+ KMessageBox::error(tqApp->mainWidget(), i18n("The specified file does not exist:\n%1").arg(aFileName));
return TQString();
}
if (info.isDir()) {
if (aVerbose)
- KMessageBox::error(tqApp->mainWidget(), i18n("This is a folder and not a file:\n%1").tqarg(aFileName));
+ KMessageBox::error(tqApp->mainWidget(), i18n("This is a folder and not a file:\n%1").arg(aFileName));
return TQString();
}
if (!info.isReadable()) {
if (aVerbose)
- KMessageBox::error(tqApp->mainWidget(), i18n("You do not have read permission for the file:\n%1").tqarg(aFileName));
+ KMessageBox::error(tqApp->mainWidget(), i18n("You do not have read permission for the file:\n%1").arg(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").tqarg(aFileName));
+ KMessageBox::error(tqApp->mainWidget(), i18n("Could not read file:\n%1").arg(aFileName));
break;
case IO_OpenError:
- KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file:\n%1").tqarg(aFileName));
+ KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file:\n%1").arg(aFileName));
break;
default:
- KMessageBox::error(tqApp->mainWidget(), i18n("Error while reading file:\n%1").tqarg(aFileName));
+ KMessageBox::error(tqApp->mainWidget(), i18n("Error while reading file:\n%1").arg(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.").tqarg(KGlobal::locale()->formatNumber(readLen,
- 0)).tqarg(KGlobal::locale()->formatNumber(len, 0));
+ TQString msg = i18n("Could only read %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(readLen,
+ 0)).arg(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?").tqarg(aFileName);
+ TQString str = i18n("File %1 exists.\nDo you want to replace it?").arg(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?").tqarg(aFileName));
+ rc = KMessageBox::warningContinueCancel(tqApp->mainWidget(), i18n("Failed to make a backup copy of %1.\nContinue anyway?").arg(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").tqarg(aFileName));
+ KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").arg(aFileName));
break;
case IO_OpenError:
- KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file for writing:\n%1").tqarg(aFileName));
+ KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file for writing:\n%1").arg(aFileName));
break;
default:
- KMessageBox::error(tqApp->mainWidget(), i18n("Error while writing file:\n%1").tqarg(aFileName));
+ KMessageBox::error(tqApp->mainWidget(), i18n("Error while writing file:\n%1").arg(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").tqarg(aFileName));
+ KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").arg(aFileName));
return FALSE;
} else if (writeLen < len) {
- TQString msg = i18n("Could only write %1 bytes of %2.").tqarg(KGlobal::locale()->formatNumber(writeLen,
- 0)).tqarg(KGlobal::locale()->formatNumber(len,
+ TQString msg = i18n("Could only write %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(writeLen,
+ 0)).arg(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 69a3cfc1..d97da7d8 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 <tqlayout.h>
+#include <layout.h>
#include <dcopclient.h>
#include <kaction.h>
@@ -56,7 +56,7 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name )
actionSelectAll->plug( toolBar() );
TQWidget *mainWidget = new TQWidget( this );
- TQVBoxLayout *tqlayout = new TQVBoxLayout( mainWidget );
+ TQVBoxLayout *layout = 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" );
- tqlayout->addWidget( line );
- tqlayout->addWidget( m_view );
+ layout->addWidget( line );
+ layout->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" ).tqarg( url ) );
+ setPlainCaption( i18n( "Links in: %1 - KGet" ).arg( url ) );
}
void KGetLinkView::slotSelectAll()
diff --git a/kget/kget_plug_in/links.cpp b/kget/kget_plug_in/links.cpp
index b1410cef..38392ea0 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 tqchildren = link.childNodes();
- for ( uint i = 0; i < tqchildren.length(); i++ )
+ DOM::NodeList children = link.childNodes();
+ for ( uint i = 0; i < children.length(); i++ )
{
- DOM::Node node = tqchildren.item( i );
+ DOM::Node node = children.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 ad5fa4a9..3271f0d0 100644
--- a/kget/kmainwidget.cpp
+++ b/kget/kmainwidget.cpp
@@ -38,7 +38,7 @@
#include <net/if.h>
#endif
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqregexp.h>
#include <tqdragobject.h>
#include <tqwhatsthis.h>
@@ -142,8 +142,8 @@ KMainWidget::KMainWidget(bool bStartDocked)
kmain = this;
// Set log time, needed for the name of log file
- TQDate date = TQDateTime::tqcurrentDateTime().date();
- TQTime time = TQDateTime::tqcurrentDateTime().time();
+ TQDate date = TQDateTime::currentDateTime().date();
+ TQTime time = TQDateTime::currentDateTime().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::tqclipboard()->text( TQClipboard::Clipboard ).stripWhiteSpace();
+ lastClipboard = TQApplication::clipboard()->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 tqgeometry
+ // Set geometry
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 ").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);
+ 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);
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 tqshaped window will appear.\n" "\n" "You can show/hide a normal window with a simple click\n" "on a tqshaped 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 shaped window will appear.\n" "\n" "You can show/hide a normal window with a simple click\n" "on a shaped 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.");
@@ -708,7 +708,7 @@ void KMainWidget::slotQuit()
for (; it.current(); ++it) {
item = it.current();
- if (item->gettqStatus() == Transfer::ST_RUNNING && !ksettings.b_expertMode) {
+ if (item->getStatus() == 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::TransfertqStatus tqStatus;
+ Transfer::TransferStatus Status;
for (; it.current(); ++it) {
- tqStatus = it.current()->gettqStatus();
- if (tqStatus == Transfer::ST_TRYING || tqStatus == Transfer::ST_RUNNING)
+ Status = it.current()->getStatus();
+ if (Status == Transfer::ST_TRYING || Status == 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").tqarg(newtransfer), i18n("Error"));
+ KMessageBox::error(this, i18n("Malformed URL:\n%1").arg(newtransfer), i18n("Error"));
ok = false;
}
}
@@ -997,7 +997,7 @@ void KMainWidget::slotCheckClipboard()
//sDebugIn << endl;
#endif
- TQString clipData = TQApplication::tqclipboard()->text( TQClipboard::Clipboard ).stripWhiteSpace();
+ TQString clipData = TQApplication::clipboard()->text( TQClipboard::Clipboard ).stripWhiteSpace();
if (clipData != lastClipboard) {
sDebug << "New clipboard event" << endl;
@@ -1026,7 +1026,7 @@ void KMainWidget::slotPasteTransfer()
TQString newtransfer;
- newtransfer = TQApplication::tqclipboard()->text();
+ newtransfer = TQApplication::clipboard()->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?").tqarg( 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?").arg( 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.").tqarg(url.prettyURL()));
+ KNotifyClient::event(kdock->winId(), "added", i18n("<i>%1</i> has been added.").arg(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?").tqarg( 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?").arg( 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()->gettqStatus();
+ status = it.current()->getStatus();
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->gettqStatus() == Transfer::ST_RUNNING) || ((item->gettqStatus() == Transfer::ST_TRYING));
+ isRunning = (item->getStatus() == Transfer::ST_RUNNING) || ((item->getStatus() == 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->gettqStatus() == Transfer::ST_STOPPED)
+ if (item->getMode() == Transfer::MD_NEW && item->getStatus() == Transfer::ST_STOPPED)
{
item->checkCache();
}
@@ -1420,7 +1420,7 @@ void KMainWidget::slotAnimTimeout()
animCounter = 0;
}
// update status of all items of transferList
- isTransfer = myTransferList->updatetqStatus(animCounter);
+ isTransfer = myTransferList->updateStatus(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::tqcurrentDateTime()) {
+ if (item->getMode() == Transfer::MD_SCHEDULED && item->getStartTime() <= TQDateTime::currentDateTime()) {
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::tqcurrentDate()) {
+ if (ksettings.b_autoDisconnect && ksettings.b_timedDisconnect && ksettings.disconnectTime <= TQTime::currentTime() && ksettings.disconnectDate == TQDate::currentDate()) {
onlineDisconnect();
}
@@ -1511,7 +1511,7 @@ void KMainWidget::slotStatusChanged(Transfer * item, int _operation)
}
else
{
- KNotifyClient::event(kdock->winId(), "finished", i18n("<i>%1</i> successfully downloaded.").tqarg(srcurl));
+ KNotifyClient::event(kdock->winId(), "finished", i18n("<i>%1</i> successfully downloaded.").arg(srcurl));
}
if ( item )
@@ -1593,7 +1593,7 @@ void KMainWidget::slotCopyToClipboard()
if (item) {
TQString url = item->getSrc().url();
- TQClipboard *cb = TQApplication::tqclipboard();
+ TQClipboard *cb = TQApplication::clipboard();
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->gettqStatus()) {
+ switch (item->getStatus()) {
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->gettqStatus() << endl;
+ sDebug << "STATUS IS stopped" << item->getStatus() << endl;
#endif
break;
case Transfer::ST_FINISHED:
@@ -2064,7 +2064,7 @@ void KMainWidget::slotUpdateActions()
} //end switch
- } else if (item->gettqStatus() != first_item->gettqStatus()) {
+ } else if (item->getStatus() != first_item->getStatus()) {
// 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->gettqStatus() != Transfer::ST_FINISHED) {
+ if (item->getStatus() != 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 ").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);
+ 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);
//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 ").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));
+ 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));
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").tqarg(url.prettyURL()), i18n("Error"));
+ KMessageBox::error(this, i18n("Malformed URL:\n%1").arg(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->gettqStatus() != Transfer::ST_FINISHED )
+ if ( transfer->getStatus() != Transfer::ST_FINISHED )
{
if ( !ksettings.b_expertMode )
{
- KMessageBox::error(this, i18n("Already saving URL\n%1").tqarg(url.prettyURL()), i18n("Error"));
+ KMessageBox::error(this, i18n("Already saving URL\n%1").arg(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?").tqarg(url.prettyURL()),i18n("Question"),i18n("Download Again"),KStdGuiItem::cancel() )
+ (KMessageBox::questionYesNo(this, i18n("Already saved URL\n%1\nDownload again?").arg(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").tqarg(url.prettyURL()), i18n("Error"));
+// KMessageBox::error(this, i18n("File protocol not accepted!\n%1").arg(url.prettyURL()), i18n("Error"));
// #ifdef _DEBUG
// sDebugOut << endl;
// #endif
diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp
index 30c6d486..40045a42 100644
--- a/kget/logwindow.cpp
+++ b/kget/logwindow.cpp
@@ -25,7 +25,7 @@
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistview.h>
#include <klocale.h>
@@ -37,7 +37,7 @@
#include "logwindow.h"
#include <kapplication.h>
-#include <tqtextedit.h>
+#include <textedit.h>
// // 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[<font color=\"red\">%1</font>] : ").tqarg(id);
+ job_id = TQString("Job[<font color=\"red\">%1</font>] : ").arg(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/safedelete.cpp b/kget/safedelete.cpp
index 3cf7b8fd..16deb1dd 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.").tqarg( url.prettyURL() ),
+ "directory.").arg( 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.").tqarg( url.prettyURL() ),
+ " file.").arg( url.prettyURL() ),
i18n("Not Deleted") );
return false;
diff --git a/kget/settings.cpp b/kget/settings.cpp
index 66bc73f6..9e6adc4d 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::tqcurrentDate(); // doesn't make sense to save it
+ disconnectDate = TQDate::currentDate(); // 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 tqgeometry settings
+ // read main window geometry 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 tqgeometry settings
+ // read drop target geometry 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 tqgeometry properties
+ // write main window geometry 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 tqgeometry properties
+ // write drop target geometry 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 2571801d..7ed6a875 100644
--- a/kget/settings.h
+++ b/kget/settings.h
@@ -172,7 +172,7 @@ public:
TQFont listViewFont;
- // tqgeometry settings
+ // geometry settings
TQPoint mainPosition;
TQSize mainSize;
unsigned long int mainState;
diff --git a/kget/transfer.cpp b/kget/transfer.cpp
index 36ce7887..230daa19 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::tqcurrentDateTime();
+ startTime = TQDateTime::currentDateTime();
speed = 0;
// retryCount = ksettings.reconnectRetries-1;
retryCount = 0;
@@ -270,10 +270,10 @@ void Transfer::updateAll()
{
sDebugIn << endl;
- updatetqStatus(status); // first phase of animation
+ updateStatus(status); // first phase of animation
- logMessage(i18n("Copy file from: %1").tqarg(src.prettyURL()));
- logMessage(i18n("To: %1").tqarg(dest.prettyURL()));
+ logMessage(i18n("Copy file from: %1").arg(src.prettyURL()));
+ logMessage(i18n("To: %1").arg(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").tqarg((double)totalSize));
+ //logMessage(i18n("Total size is %1 bytes").arg((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::updatetqStatus(int counter)
+bool Transfer::updateStatus(int counter)
{
//sDebug<< ">>>>Entering"<<endl;
@@ -337,18 +337,18 @@ bool Transfer::updatetqStatus(int counter)
setPixmap(view->lv_pixmap, *pix);
view->setUpdatesEnabled(true);
- if(prevtqStatus!=status || prevMode != mode || status==ST_RUNNING || status==ST_TRYING)
+ if(prevStatus!=status || prevMode != mode || status==ST_RUNNING || status==ST_TRYING)
{
TQRect rect = view->header()->sectionRect(view->lv_pixmap);
int x = rect.x();
- int y = view->tqitemRect(this).y();
+ int y = view->itemRect(this).y();
int w = rect.width();
int h = rect.height();
view->TQScrollView::updateContents(x,y,w,h);
- prevtqStatus = status;
+ prevStatus = status;
prevMode = mode;
}
@@ -386,7 +386,7 @@ void Transfer::slotResume()
status = ST_TRYING;
mode = MD_TQUEUED;
- logMessage(i18n("Attempt number %1").tqarg(retryCount));
+ logMessage(i18n("Attempt number %1").arg(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::tqcurrentDateTime()) {
- TQDateTime dt = TQDateTime::tqcurrentDateTime();
+ if (startTime < TQDateTime::currentDateTime()) {
+ TQDateTime dt = TQDateTime::currentDateTime();
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").tqarg(dest.prettyURL().ascii()));
+ logMessage(i18n("Renaming to %1").arg(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").tqarg(KIO::convertSize(speed));
+ TQString tmps = i18n("%1/s").arg(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").tqarg((double)totalSize,0,'f',0));
+ logMessage(i18n("Total size is %1 bytes").arg((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 = (TransfertqStatus) config->readNumEntry("Status", ST_RUNNING);
+ status = (TransferStatus) 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::tqcurrentDateTime().addSecs(ksettings.reconnectTime * 60);
+ startTime=TQDateTime::currentDateTime().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 && gettqStatus() != Transfer::ST_FINISHED )
+ if ( ksettings.b_showIndividual && getStatus() != Transfer::ST_FINISHED )
{
if(dlgIndividual)
dlgIndividual->show();
diff --git a/kget/transfer.h b/kget/transfer.h
index 17e4aa08..c21938eb 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 TransfertqStatus { ST_TRYING, ST_RUNNING, ST_STOPPED, ST_FINISHED };
+ enum TransferStatus { 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;
}
- TransfertqStatus gettqStatus()const
+ TransferStatus getStatus()const
{
return status;
}
@@ -127,7 +127,7 @@ public:
{
mode = _mode;
}
- void settqStatus(TransfertqStatus _status)
+ void setStatus(TransferStatus _status)
{
status = _status;
};
@@ -139,7 +139,7 @@ public:
// update methods
void updateAll();
- bool updatetqStatus(int counter);
+ bool updateStatus(int counter);
void showIndividual();
void UpdateRetry();
@@ -220,10 +220,10 @@ private:
unsigned int remainingTimeSec;
TQString remainingTime;
- TransfertqStatus status;
+ TransferStatus status;
TransferMode mode;
- TransfertqStatus prevtqStatus;
+ TransferStatus prevStatus;
TransferMode prevMode;
// how many times have we retried already
diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp
index 71a48dec..2def3372 100644
--- a/kget/transferlist.cpp
+++ b/kget/transferlist.cpp
@@ -75,7 +75,7 @@ TransferList::TransferList(TQWidget * parent, const char *name)
jobid=1;
- // initial tqlayout
+ // initial layout
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.tqarg(i)));
+ curPix->load(locate("appdata", connectPath.arg(i)));
animConn.append(curPix);
curPix = new TQPixmap();
- curPix->load(locate("appdata", tryPath.tqarg(i)));
+ curPix->load(locate("appdata", tryPath.arg(i)));
animTry.append(curPix);
}
}
@@ -182,14 +182,14 @@ void TransferList::moveToEnd(Transfer * item)
}
-bool TransferList::updatetqStatus(int counter)
+bool TransferList::updateStatus(int counter)
{
bool isTransfer = false;
TransferIterator it(this);
for (; it.current(); ++it) {
- isTransfer |= it.current()->updatetqStatus(counter);
+ isTransfer |= it.current()->updateStatus(counter);
}
return isTransfer;
diff --git a/kget/transferlist.h b/kget/transferlist.h
index ae3fd6d8..e32bcb3a 100644
--- a/kget/transferlist.h
+++ b/kget/transferlist.h
@@ -76,7 +76,7 @@ public:
{
return phasesNum;
}
- bool updatetqStatus(int counter);
+ bool updateStatus(int counter);
Transfer * find(const KURL& _src);
bool areTransfersQueuedOrScheduled();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 20:16:46 +0000