diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:33 -0600 |
| commit | 604bf3f969d880708ea9a1affce0b304c29e6ff5 (patch) | |
| tree | e8fad7142f5d23041b1c9e6c2a1d0d8c814b0ebe /plugins/webinterface | |
| parent | 93f5eb31173901d14b4376614f89d43973ddd45b (diff) | |
| download | ktorrent-604bf3f969d880708ea9a1affce0b304c29e6ff5.tar.gz ktorrent-604bf3f969d880708ea9a1affce0b304c29e6ff5.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'plugins/webinterface')
| -rw-r--r-- | plugins/webinterface/httpserver.cpp | 2 | ||||
| -rw-r--r-- | plugins/webinterface/php_interface.cpp | 4 | ||||
| -rw-r--r-- | plugins/webinterface/webinterfaceprefpage.cpp | 2 | ||||
| -rw-r--r-- | plugins/webinterface/webinterfaceprefwidget.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp index c85b7f1..3f01945 100644 --- a/plugins/webinterface/httpserver.cpp +++ b/plugins/webinterface/httpserver.cpp @@ -58,7 +58,7 @@ namespace kt php_i = new PhpInterface(core); clients.setAutoDelete(true); - TQStringList dirList = KGlobal::instance()->dirs()->findDirs("data", "ktorrent/www"); + TQStringList dirList = TDEGlobal::instance()->dirs()->findDirs("data", "ktorrent/www"); rootDir = *(dirList.begin()); Out(SYS_WEB|LOG_DEBUG) << "WWW Root Directory "<< rootDir <<endl; session.logged_in = false; diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp index 048310d..41693f3 100644 --- a/plugins/webinterface/php_interface.cpp +++ b/plugins/webinterface/php_interface.cpp @@ -46,7 +46,7 @@ namespace kt TQString BytesToString2(Uint64 bytes,int precision = 2) { - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); if (bytes >= 1024 * 1024 * 1024) return TQString("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision)); else if (bytes >= 1024*1024) @@ -59,7 +59,7 @@ namespace kt TQString KBytesPerSecToString2(double speed,int precision = 2) { - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); return TQString("%1 KB/s").arg(loc->formatNumber(speed,precision)); } diff --git a/plugins/webinterface/webinterfaceprefpage.cpp b/plugins/webinterface/webinterfaceprefpage.cpp index 7225afd..0821ab1 100644 --- a/plugins/webinterface/webinterfaceprefpage.cpp +++ b/plugins/webinterface/webinterfaceprefpage.cpp @@ -25,7 +25,7 @@ namespace kt WebInterfacePrefPage::WebInterfacePrefPage(WebInterfacePlugin* plugin) : PrefPageInterface(i18n("WebInterface"), i18n("WebInterface Options"), - KGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup)) + TDEGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup)) { m_widget = 0; w_plugin=plugin; diff --git a/plugins/webinterface/webinterfaceprefwidget.cpp b/plugins/webinterface/webinterfaceprefwidget.cpp index 48ab0c7..4f4a4a4 100644 --- a/plugins/webinterface/webinterfaceprefwidget.cpp +++ b/plugins/webinterface/webinterfaceprefwidget.cpp @@ -50,7 +50,7 @@ WebInterfacePrefWidget::WebInterfacePrefWidget(TQWidget *parent, const char *nam forward->setChecked(WebInterfacePluginSettings::forward()); sessionTTL->setValue(WebInterfacePluginSettings::sessionTTL()); - TQStringList dirList=KGlobal::instance()->dirs()->findDirs("data", "ktorrent/www"); + TQStringList dirList=TDEGlobal::instance()->dirs()->findDirs("data", "ktorrent/www"); TQDir d(*(dirList.begin())); TQStringList skinList=d.entryList(TQDir::Dirs); for ( TQStringList::Iterator it = skinList.begin(); it != skinList.end(); ++it ){ |