From 604bf3f969d880708ea9a1affce0b304c29e6ff5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:25:33 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- apps/ktorrent/groups/group.cpp | 2 +- apps/ktorrent/groups/groupview.cpp | 4 +-- apps/ktorrent/groups/torrentdrag.cpp | 2 +- apps/ktorrent/ktorrent.cpp | 34 +++++++++---------- apps/ktorrent/ktorrentapp.cpp | 2 +- apps/ktorrent/ktorrentcore.cpp | 4 +-- apps/ktorrent/ktorrentviewitem.cpp | 8 ++--- apps/ktorrent/ktorrentviewmenu.cpp | 2 +- apps/ktorrent/pref.cpp | 8 ++--- apps/ktorrent/queuedialog.cpp | 2 +- apps/ktorrent/trayicon.cpp | 6 ++-- estimation-scripts/enable-logging.diff | 4 +-- libktorrent/functions.cpp | 2 +- libktorrent/interfaces/filetreediritem.cpp | 4 +-- libktorrent/interfaces/functions.cpp | 6 ++-- libktorrent/labelview.cpp | 14 ++++---- libktorrent/pluginmanagerprefpage.cpp | 2 +- libktorrent/util/autorotatelogjob.cpp | 2 +- libktorrent/util/log.cpp | 2 +- plugins/infowidget/fileview.cpp | 2 +- plugins/infowidget/floatspinbox.cpp | 4 +-- plugins/infowidget/floatspinbox.h | 2 +- plugins/infowidget/infowidgetplugin.cpp | 16 ++++----- plugins/infowidget/infowidgetprefpage.cpp | 2 +- plugins/infowidget/iwfiletreeitem.cpp | 2 +- plugins/infowidget/localefloatvalidator.cpp | 2 +- plugins/infowidget/peerview.cpp | 8 ++--- plugins/infowidget/statustab.cpp | 2 +- plugins/infowidget/trackerview.cpp | 2 +- plugins/ipfilter/antip2p.cpp | 2 +- plugins/ipfilter/convertdialog.cpp | 14 ++++---- plugins/ipfilter/ipblockingprefpage.cpp | 12 +++---- plugins/logviewer/logprefpage.cpp | 2 +- plugins/logviewer/logviewer.cpp | 10 +++--- plugins/rssfeed/rss/loader.cpp | 14 ++++---- plugins/rssfeed/rss/loader.h | 6 ++-- plugins/rssfeed/rssfeed.cpp | 4 +-- plugins/rssfeed/rssfeedmanager.cpp | 4 +-- plugins/rssfeed/rssfeedplugin.cpp | 2 +- plugins/scanfolder/scanfolderprefpage.cpp | 2 +- plugins/scheduler/bwscheduler.cpp | 4 +-- plugins/scheduler/bwsprefpagewidget.cpp | 4 +-- plugins/scheduler/schedulerprefpage.cpp | 2 +- plugins/search/searchplugin.cpp | 6 ++-- plugins/search/searchprefpage.cpp | 6 ++-- plugins/search/searchwidget.cpp | 10 +++--- plugins/stats/StatsPluginPrefs.cc | 2 +- plugins/upnp/upnpplugin.cpp | 6 ++-- plugins/upnp/upnpprefpage.cpp | 2 +- plugins/upnp/upnprouter.cpp | 2 +- plugins/webinterface/httpserver.cpp | 2 +- plugins/webinterface/php_interface.cpp | 4 +-- plugins/webinterface/webinterfaceprefpage.cpp | 2 +- .../webinterface/webinterfaceprefwidget.cpp | 2 +- 54 files changed, 139 insertions(+), 139 deletions(-) diff --git a/apps/ktorrent/groups/group.cpp b/apps/ktorrent/groups/group.cpp index 9a1fd90..09de6db 100644 --- a/apps/ktorrent/groups/group.cpp +++ b/apps/ktorrent/groups/group.cpp @@ -42,7 +42,7 @@ namespace kt void Group::setIconByName(const TQString & in) { icon_name = in; - icon = KGlobal::iconLoader()->loadIcon(in,KIcon::Small); + icon = TDEGlobal::iconLoader()->loadIcon(in,KIcon::Small); } void Group::rename(const TQString & nn) diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp index 92b78c3..0b6af06 100644 --- a/apps/ktorrent/groups/groupview.cpp +++ b/apps/ktorrent/groups/groupview.cpp @@ -89,7 +89,7 @@ namespace kt current_item = 0; menu = 0; createMenu(col); - save_file = KGlobal::dirs()->saveLocation("data","ktorrent") + "groups"; + save_file = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "groups"; GroupViewItem* all = addGroup(gman->allGroup(),0); GroupViewItem* dwnld = addGroup(gman->downloadGroup(),all); GroupViewItem* upld = addGroup(gman->uploadGroup(),all); @@ -105,7 +105,7 @@ namespace kt addGroup(gman->activeUploadsGroup(), active); custom_root = new KListViewItem(all,i18n("Custom Groups")); - custom_root->setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + custom_root->setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); setOpen(custom_root,true); } diff --git a/apps/ktorrent/groups/torrentdrag.cpp b/apps/ktorrent/groups/torrentdrag.cpp index c0aad98..69aaf94 100644 --- a/apps/ktorrent/groups/torrentdrag.cpp +++ b/apps/ktorrent/groups/torrentdrag.cpp @@ -26,7 +26,7 @@ namespace kt TorrentDrag::TorrentDrag(TQWidget* src, const char *name) : TQStoredDrag("application/x-ktorrent-drag-object",src, name) { - setPixmap(KGlobal::iconLoader()->loadIcon("player_playlist",KIcon::Small)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("player_playlist",KIcon::Small)); } diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp index c4e29fc..d492f02 100644 --- a/apps/ktorrent/ktorrent.cpp +++ b/apps/ktorrent/ktorrent.cpp @@ -132,7 +132,7 @@ KTorrent::KTorrent() m_systray_icon = new TrayIcon(m_core, this); m_group_view->loadGroups(); - m_view_man->restoreViewState(KGlobal::config(),this); + m_view_man->restoreViewState(TDEGlobal::config(),this); TQToolButton* tb = new TQToolButton(m_activeTabWidget); tb->setIconSet(SmallIcon("tab_new")); @@ -215,8 +215,8 @@ KTorrent::KTorrent() addToolWidget(m_group_view,"player_playlist",i18n("Groups"),DOCK_LEFT); setAutoSaveSettings("WindowStatus",true); - KGlobal::config()->setGroup("WindowStatus"); - bool hidden_on_exit = KGlobal::config()->readBoolEntry("hidden_on_exit",false); + TDEGlobal::config()->setGroup("WindowStatus"); + bool hidden_on_exit = TDEGlobal::config()->readBoolEntry("hidden_on_exit",false); if (Settings::showSystemTrayIcon()) { if (hidden_on_exit) @@ -234,11 +234,11 @@ KTorrent::KTorrent() show(); } - bool menubar_hidden = KGlobal::config()->readBoolEntry("menubar_hidden",false); + bool menubar_hidden = TDEGlobal::config()->readBoolEntry("menubar_hidden",false); menuBar()->setHidden(menubar_hidden); m_menubarAction->setChecked(!menubar_hidden); - bool statusbar_hidden = KGlobal::config()->readBoolEntry("statusbar_hidden",false); + bool statusbar_hidden = TDEGlobal::config()->readBoolEntry("statusbar_hidden",false); statusBar()->setHidden(statusbar_hidden); m_statusbarAction->setChecked(!statusbar_hidden); @@ -598,11 +598,11 @@ bool KTorrent::queryExit() // stop timers to prevent update m_gui_update_timer.stop(); - KGlobal::config()->setGroup("WindowStatus"); - KGlobal::config()->writeEntry("hidden_on_exit",this->isHidden()); - KGlobal::config()->writeEntry("menubar_hidden",menuBar()->isHidden()); - KGlobal::config()->writeEntry("statusbar_hidden",statusBar()->isHidden()); - m_view_man->saveViewState(KGlobal::config()); + TDEGlobal::config()->setGroup("WindowStatus"); + TDEGlobal::config()->writeEntry("hidden_on_exit",this->isHidden()); + TDEGlobal::config()->writeEntry("menubar_hidden",menuBar()->isHidden()); + TDEGlobal::config()->writeEntry("statusbar_hidden",statusBar()->isHidden()); + m_view_man->saveViewState(TDEGlobal::config()); saveSettings(); hide(); m_systray_icon->hide(); // hide system tray icon upon exit @@ -712,12 +712,12 @@ void KTorrent::optionsConfigureToolbars() // use the standard toolbar editor #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); # endif #else - saveMainWindowSettings(KGlobal::config()); + saveMainWindowSettings(TDEGlobal::config()); #endif KEditToolbar dlg(factory()); connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); @@ -732,12 +732,12 @@ void KTorrent::newToolbarConfig() #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); # endif #else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); #endif } @@ -859,7 +859,7 @@ void KTorrent::addToolWidget(TQWidget* w,const TQString & icon,const TQString & if (!icon.isNull()) - w->setIcon(KGlobal::iconLoader()->loadIcon(icon,KIcon::Small)); + w->setIcon(TDEGlobal::iconLoader()->loadIcon(icon,KIcon::Small)); switch (dock) { diff --git a/apps/ktorrent/ktorrentapp.cpp b/apps/ktorrent/ktorrentapp.cpp index 44f8e1c..4e3c88e 100644 --- a/apps/ktorrent/ktorrentapp.cpp +++ b/apps/ktorrent/ktorrentapp.cpp @@ -48,7 +48,7 @@ int KTorrentApp::newInstance() TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bt::Globals::instance().setDebugMode(args->isSet("debug")); - TQString data_dir = KGlobal::dirs()->saveLocation("data","ktorrent"); + TQString data_dir = TDEGlobal::dirs()->saveLocation("data","ktorrent"); if (!data_dir.endsWith(bt::DirSeparator())) data_dir += bt::DirSeparator(); bt::Globals::instance().initLog(data_dir + "log"); diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp index da8a9f4..ac04a79 100644 --- a/apps/ktorrent/ktorrentcore.cpp +++ b/apps/ktorrent/ktorrentcore.cpp @@ -77,7 +77,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin bool dd_not_exist = !bt::Exists(data_dir); if (data_dir == TQString() || dd_not_exist) { - data_dir = KGlobal::dirs()->saveLocation("data","ktorrent"); + data_dir = TDEGlobal::dirs()->saveLocation("data","ktorrent"); if (dd_not_exist) { Settings::setTempDir(data_dir); @@ -139,7 +139,7 @@ KTorrentCore::~KTorrentCore() void KTorrentCore::loadPlugins() { - pman->loadConfigFile(KGlobal::dirs()->saveLocation("data","ktorrent") + "plugins"); + pman->loadConfigFile(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "plugins"); pman->loadPluginList(); } diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp index ae37665..ff21871 100644 --- a/apps/ktorrent/ktorrentviewitem.cpp +++ b/apps/ktorrent/ktorrentviewitem.cpp @@ -160,8 +160,8 @@ QCStringList KTorrentViewItem::getTorrentInfo(kt::TorrentInterface* tc) } info.append(TQString::number(s.num_peers).local8Bit()); - info.append(TQString(KGlobal::locale()->formatNumber(Percentage(s),2) + " %").local8Bit()); - info.append(KGlobal::locale()->formatNumber(kt::ShareRatio(s),2).local8Bit()); + info.append(TQString(TDEGlobal::locale()->formatNumber(Percentage(s),2) + " %").local8Bit()); + info.append(TDEGlobal::locale()->formatNumber(kt::ShareRatio(s),2).local8Bit()); info.append(TQString::number(s.seeders_connected_to).local8Bit()); info.append(TQString::number(s.leechers_connected_to).local8Bit()); return info; @@ -252,13 +252,13 @@ void KTorrentViewItem::update() if(m_parent->columnVisible(10)) { - setText(10,i18n("%1 %").arg(KGlobal::locale()->formatNumber(Percentage(s),2))); + setText(10,i18n("%1 %").arg(TDEGlobal::locale()->formatNumber(Percentage(s),2))); } if(m_parent->columnVisible(11)) { float ratio = kt::ShareRatio(s); - setText(11,TQString("%1").arg(KGlobal::locale()->formatNumber(ratio,2))); + setText(11,TQString("%1").arg(TDEGlobal::locale()->formatNumber(ratio,2))); } if (m_parent->columnVisible(12)) diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/apps/ktorrent/ktorrentviewmenu.cpp index 9dee4ce..7ebb62d 100644 --- a/apps/ktorrent/ktorrentviewmenu.cpp +++ b/apps/ktorrent/ktorrentviewmenu.cpp @@ -31,7 +31,7 @@ using namespace kt; KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name ) : KPopupMenu ( parent, name ),view(parent) { - KIconLoader* iload = KGlobal::iconLoader(); + KIconLoader* iload = TDEGlobal::iconLoader(); stop_id = insertItem( iload->loadIconSet("ktstop",KIcon::Small),i18n("to stop", "Stop"), diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp index 826663a..5acc667 100644 --- a/apps/ktorrent/pref.cpp +++ b/apps/ktorrent/pref.cpp @@ -144,7 +144,7 @@ void KTorrentPreferences::removePrefPage(kt::PrefPageInterface* pp) /////////////////////////////////////////////////////// -DownloadPrefPage::DownloadPrefPage() : kt::PrefPageInterface(i18n("Downloads"), i18n("Download Options"), KGlobal::iconLoader()->loadIcon("down", KIcon::NoGroup)), dp(0) +DownloadPrefPage::DownloadPrefPage() : kt::PrefPageInterface(i18n("Downloads"), i18n("Download Options"), TDEGlobal::iconLoader()->loadIcon("down", KIcon::NoGroup)), dp(0) {} DownloadPrefPage::~ DownloadPrefPage() @@ -214,7 +214,7 @@ void DownloadPrefPage::deleteWidget() ////////////////////////////////////// GeneralPrefPage::GeneralPrefPage() : kt::PrefPageInterface(i18n("General"), i18n("General Options"), - KGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), gp(0) + TDEGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), gp(0) {} GeneralPrefPage::~GeneralPrefPage() @@ -338,7 +338,7 @@ void GeneralPrefPage::updateData() if (Settings::tempDir() == TQString()) { - TQString data_dir = KGlobal::dirs()->saveLocation("data", "ktorrent"); + TQString data_dir = TDEGlobal::dirs()->saveLocation("data", "ktorrent"); if (!data_dir.endsWith(bt::DirSeparator())) data_dir += bt::DirSeparator(); @@ -409,7 +409,7 @@ void GeneralPrefPage::deleteWidget() AdvancedPrefPage::AdvancedPrefPage() : kt::PrefPageInterface(i18n("Advanced"), i18n("Advanced Options"), - KGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), ap(0) + TDEGlobal::iconLoader()->loadIcon("package_settings", KIcon::NoGroup)), ap(0) {} AdvancedPrefPage::~AdvancedPrefPage() diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp index d5cb5e5..a828017 100644 --- a/apps/ktorrent/queuedialog.cpp +++ b/apps/ktorrent/queuedialog.cpp @@ -98,7 +98,7 @@ void QueueItem::paintCell(TQPainter* p,const TQColorGroup & cg,int column,int wi QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *name) :QueueDlg(parent, name) { - KIconLoader* iload = KGlobal::iconLoader(); + KIconLoader* iload = TDEGlobal::iconLoader(); m_tabs->setTabIconSet(m_tabs->page(0), iload->loadIconSet("down", KIcon::Small)); m_tabs->setTabIconSet(m_tabs->page(1), iload->loadIconSet("up", KIcon::Small)); diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp index 8588fc2..de633c4 100644 --- a/apps/ktorrent/trayicon.cpp +++ b/apps/ktorrent/trayicon.cpp @@ -159,7 +159,7 @@ void TrayIcon::maxShareRatioReached(kt::TorrentInterface* tc) return; const TorrentStats & s = tc->getStats(); - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); double speed_up = (double)s.bytes_uploaded / 1024.0; TQString msg = i18n("%1 has reached its maximum share ratio of %2 and has been stopped." @@ -178,7 +178,7 @@ void TrayIcon::maxSeedTimeReached(kt::TorrentInterface* tc) return; const TorrentStats & s = tc->getStats(); - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); double speed_up = (double)s.bytes_uploaded / 1024.0; TQString msg = i18n("%1 has reached its maximum seed time of %2 hours and has been stopped." @@ -223,7 +223,7 @@ void TrayIcon::queuingNotPossible(kt::TorrentInterface* tc) const TorrentStats & s = tc->getStats(); TQString msg; - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); if (tc->overMaxRatio()) msg = i18n("%1 has reached its maximum share ratio of %2 and cannot be enqueued. Remove the limit manually if you want to continue seeding.") diff --git a/estimation-scripts/enable-logging.diff b/estimation-scripts/enable-logging.diff index 57dc703..4cbd6a9 100644 --- a/estimation-scripts/enable-logging.diff +++ b/estimation-scripts/enable-logging.diff @@ -36,7 +36,7 @@ Index: estimation-scripts/enable-logging.diff -@@ -114,8 +119,43 @@ - setText(6,KBytesPerSecToString(tc->getUploadRate() / 1024.0)); - -- KLocale* loc = KGlobal::locale(); +- KLocale* loc = TDEGlobal::locale(); -+ -+ -+ if(counter==1) @@ -145,7 +145,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp @@ -114,8 +121,46 @@ setText(6,KBytesPerSecToString(s.upload_rate / 1024.0)); - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); + + + diff --git a/libktorrent/functions.cpp b/libktorrent/functions.cpp index 2bc76eb..f57837d 100644 --- a/libktorrent/functions.cpp +++ b/libktorrent/functions.cpp @@ -30,7 +30,7 @@ namespace kt { TQString DataDir() { - TQString str = KGlobal::dirs()->saveLocation("data","ktorrent"); + TQString str = TDEGlobal::dirs()->saveLocation("data","ktorrent"); if (!str.endsWith(bt::DirSeparator())) return str + bt::DirSeparator(); else diff --git a/libktorrent/interfaces/filetreediritem.cpp b/libktorrent/interfaces/filetreediritem.cpp index 93db727..cc199ce 100644 --- a/libktorrent/interfaces/filetreediritem.cpp +++ b/libktorrent/interfaces/filetreediritem.cpp @@ -39,7 +39,7 @@ namespace kt { parent = 0; size = 0; - setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); setText(0,name); setText(1,BytesToString(size)); setText(2,i18n("Yes")); @@ -53,7 +53,7 @@ namespace kt name(name),parent(parent) { size = 0; - setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); + setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); setText(0,name); setText(1,BytesToString(size)); setText(2,i18n("Yes")); diff --git a/libktorrent/interfaces/functions.cpp b/libktorrent/interfaces/functions.cpp index 6a19d7f..630e32a 100644 --- a/libktorrent/interfaces/functions.cpp +++ b/libktorrent/interfaces/functions.cpp @@ -30,7 +30,7 @@ namespace kt TQString BytesToString(Uint64 bytes,int precision) { - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); if (bytes >= 1024 * 1024 * 1024) return i18n("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision)); else if (bytes >= 1024*1024) @@ -43,13 +43,13 @@ namespace kt TQString KBytesPerSecToString(double speed,int precision) { - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision)); } TQString DurationToString(Uint32 nsecs) { - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); TQTime t; int ndays = nsecs / 86400; t = t.addSecs(nsecs % 86400); diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp index d7ce947..ca44f5d 100644 --- a/libktorrent/labelview.cpp +++ b/libktorrent/labelview.cpp @@ -69,18 +69,18 @@ namespace kt if (selected) { - setPaletteBackgroundColor(KGlobalSettings::highlightColor()); - setPaletteForegroundColor(KGlobalSettings::highlightedTextColor()); + setPaletteBackgroundColor(TDEGlobalSettings::highlightColor()); + setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor()); } else if (odd) { - setPaletteBackgroundColor(KGlobalSettings::baseColor()); - setPaletteForegroundColor(KGlobalSettings::textColor()); + setPaletteBackgroundColor(TDEGlobalSettings::baseColor()); + setPaletteForegroundColor(TDEGlobalSettings::textColor()); } else { - setPaletteBackgroundColor(KGlobalSettings::alternateBackgroundColor()); - setPaletteForegroundColor(KGlobalSettings::textColor()); + setPaletteBackgroundColor(TDEGlobalSettings::alternateBackgroundColor()); + setPaletteForegroundColor(TDEGlobalSettings::textColor()); } } @@ -109,7 +109,7 @@ namespace kt public: LabelViewBox(TQWidget* parent) : TQWidget(parent) { - setPaletteBackgroundColor(KGlobalSettings::baseColor()); + setPaletteBackgroundColor(TDEGlobalSettings::baseColor()); layout = new TQVBoxLayout(this); layout->setMargin(0); } diff --git a/libktorrent/pluginmanagerprefpage.cpp b/libktorrent/pluginmanagerprefpage.cpp index 8a6e33c..145d4de 100644 --- a/libktorrent/pluginmanagerprefpage.cpp +++ b/libktorrent/pluginmanagerprefpage.cpp @@ -60,7 +60,7 @@ namespace kt }; PluginManagerPrefPage::PluginManagerPrefPage(PluginManager* pman) - : PrefPageInterface(i18n("Plugins"), i18n("Plugin Options"),KGlobal::iconLoader()->loadIcon("ktplugins",KIcon::NoGroup)),pman(pman) + : PrefPageInterface(i18n("Plugins"), i18n("Plugin Options"),TDEGlobal::iconLoader()->loadIcon("ktplugins",KIcon::NoGroup)),pman(pman) { pmw = 0; } diff --git a/libktorrent/util/autorotatelogjob.cpp b/libktorrent/util/autorotatelogjob.cpp index de4d1c5..c703026 100644 --- a/libktorrent/util/autorotatelogjob.cpp +++ b/libktorrent/util/autorotatelogjob.cpp @@ -70,7 +70,7 @@ namespace bt else { // final log file is moved, now zip it and end the job - std::system(TQString("gzip " + KProcess::quote(file + "-1")).local8Bit()); + std::system(TQString("gzip " + TDEProcess::quote(file + "-1")).local8Bit()); m_error = 0; lg->logRotateDone(); emitResult(); diff --git a/libktorrent/util/log.cpp b/libktorrent/util/log.cpp index 2fb36f9..258506a 100644 --- a/libktorrent/util/log.cpp +++ b/libktorrent/util/log.cpp @@ -87,7 +87,7 @@ namespace bt // move current log to 1 and zip it bt::Move(file,file + "-1",true); - system(TQString("gzip " + KProcess::quote(file + "-1")).local8Bit()); + system(TQString("gzip " + TDEProcess::quote(file + "-1")).local8Bit()); } void setOutputFile(const TQString & file) diff --git a/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp index 6c80bf7..22a79ce 100644 --- a/plugins/infowidget/fileview.cpp +++ b/plugins/infowidget/fileview.cpp @@ -185,7 +185,7 @@ namespace kt percent = 0.0; else if (percent > 100.0) percent = 100.0; - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); it.current()->setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2))); } } diff --git a/plugins/infowidget/floatspinbox.cpp b/plugins/infowidget/floatspinbox.cpp index 883c7a0..641be87 100644 --- a/plugins/infowidget/floatspinbox.cpp +++ b/plugins/infowidget/floatspinbox.cpp @@ -94,7 +94,7 @@ TQString kt::FloatSpinBox::mapValueToText( int value ) { /// This is called from TQSpinBox, which passes an int. /// As we don't use the TQSpinBox's internal value, we ignore it. - TQString t = KGlobal::locale()->formatNumber( m_value, m_precision_digits); + TQString t = TDEGlobal::locale()->formatNumber( m_value, m_precision_digits); editor()->setText(t); return t; } @@ -104,7 +104,7 @@ int kt::FloatSpinBox::mapTextToValue( bool * ok ) /// This is called from TQSpinBox, which needs an int for return. /// As we don't use the TQSpinBox's internal value, we only return 0. - float value = KGlobal::locale()->readNumber(text(), ok); + float value = TDEGlobal::locale()->readNumber(text(), ok); if (*ok) { setValue(value); diff --git a/plugins/infowidget/floatspinbox.h b/plugins/infowidget/floatspinbox.h index 2df9966..a123382 100644 --- a/plugins/infowidget/floatspinbox.h +++ b/plugins/infowidget/floatspinbox.h @@ -30,7 +30,7 @@ namespace kt /** * @author Jonas Widarsson * - * A Spinbox for float values which respects KGlobal::locale(). + * A Spinbox for float values which respects TDEGlobal::locale(). * TQSpinBox's internal integer value is only * used for step detection. */ diff --git a/plugins/infowidget/infowidgetplugin.cpp b/plugins/infowidget/infowidgetplugin.cpp index 4961b57..2a1ddff 100644 --- a/plugins/infowidget/infowidgetplugin.cpp +++ b/plugins/infowidget/infowidgetplugin.cpp @@ -83,17 +83,17 @@ namespace kt getGUI()->addPrefPage(pref); currentTorrentChanged(const_cast(getGUI()->getCurrentTorrent())); - file_view->restoreLayout(KGlobal::config(),"FileView"); + file_view->restoreLayout(TDEGlobal::config(),"FileView"); } void InfoWidgetPlugin::unload() { if (cd_view) - cd_view->saveLayout(KGlobal::config(),"ChunkDownloadView"); + cd_view->saveLayout(TDEGlobal::config(),"ChunkDownloadView"); if (peer_view) - peer_view->saveLayout(KGlobal::config(),"PeerView"); + peer_view->saveLayout(TDEGlobal::config(),"PeerView"); if (file_view) - file_view->saveLayout(KGlobal::config(),"FileView"); + file_view->saveLayout(TDEGlobal::config(),"FileView"); getGUI()->removeViewListener(this); getGUI()->removePrefPage(pref); @@ -172,12 +172,12 @@ namespace kt peer_view = new PeerView(0); getGUI()->addToolWidget(peer_view,"tdmconfig",i18n("Peers"),GUIInterface::DOCK_BOTTOM); - peer_view->restoreLayout(KGlobal::config(),"PeerView"); + peer_view->restoreLayout(TDEGlobal::config(),"PeerView"); createMonitor(tc); } else if (!show && peer_view) { - peer_view->saveLayout(KGlobal::config(),"PeerView"); + peer_view->saveLayout(TDEGlobal::config(),"PeerView"); getGUI()->removeToolWidget(peer_view); delete peer_view; peer_view = 0; createMonitor(tc); @@ -193,13 +193,13 @@ namespace kt cd_view = new ChunkDownloadView(0); getGUI()->addToolWidget(cd_view,"fifteenpieces",i18n("Chunks"),GUIInterface::DOCK_BOTTOM); - cd_view->restoreLayout(KGlobal::config(),"ChunkDownloadView"); + cd_view->restoreLayout(TDEGlobal::config(),"ChunkDownloadView"); cd_view->changeTC(tc); createMonitor(tc); } else if (!show && cd_view) { - cd_view->saveLayout(KGlobal::config(),"ChunkDownloadView"); + cd_view->saveLayout(TDEGlobal::config(),"ChunkDownloadView"); getGUI()->removeToolWidget(cd_view); delete cd_view; cd_view = 0; createMonitor(tc); diff --git a/plugins/infowidget/infowidgetprefpage.cpp b/plugins/infowidget/infowidgetprefpage.cpp index 971b1c3..2e94116 100644 --- a/plugins/infowidget/infowidgetprefpage.cpp +++ b/plugins/infowidget/infowidgetprefpage.cpp @@ -31,7 +31,7 @@ namespace kt { InfoWidgetPrefPage::InfoWidgetPrefPage(InfoWidgetPlugin* iw) - : PrefPageInterface(i18n("Info Widget"),i18n("Information Widget Options"),KGlobal::iconLoader()->loadIcon("ktinfowidget",KIcon::NoGroup)),iw(iw) + : PrefPageInterface(i18n("Info Widget"),i18n("Information Widget Options"),TDEGlobal::iconLoader()->loadIcon("ktinfowidget",KIcon::NoGroup)),iw(iw) { pref = 0; } diff --git a/plugins/infowidget/iwfiletreeitem.cpp b/plugins/infowidget/iwfiletreeitem.cpp index 04a4e41..af976ca 100644 --- a/plugins/infowidget/iwfiletreeitem.cpp +++ b/plugins/infowidget/iwfiletreeitem.cpp @@ -91,7 +91,7 @@ namespace kt percent = 0.0; else if (percent > 100.0) percent = 100.0; - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2))); perc_complete = percent; } diff --git a/plugins/infowidget/localefloatvalidator.cpp b/plugins/infowidget/localefloatvalidator.cpp index f61808d..5990ebf 100644 --- a/plugins/infowidget/localefloatvalidator.cpp +++ b/plugins/infowidget/localefloatvalidator.cpp @@ -26,7 +26,7 @@ kt::LocaleFloatValidator::LocaleFloatValidator( TQObject * parent, const char * name ) :TQValidator(parent, name) { - TQString decimalPoint = TQRegExp::escape(KGlobal::locale()->decimalSymbol()); + TQString decimalPoint = TQRegExp::escape(TDEGlobal::locale()->decimalSymbol()); regexp.setPattern("^-?\\d*(" + decimalPoint + "\\d*)?$"); } diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp index 77380b2..ab3b06f 100644 --- a/plugins/infowidget/peerview.cpp +++ b/plugins/infowidget/peerview.cpp @@ -65,7 +65,7 @@ namespace kt { if (!yes_no_pix_loaded) { - KIconLoader* iload = KGlobal::iconLoader(); + KIconLoader* iload = TDEGlobal::iconLoader(); /* Prefer builtin flag images to the ones provided by KDE */ flagDB.addFlagSource("data", TQString("ktorrent/geoip/%1.png")); flagDB.addFlagSource("locale", TQString("l10n/%1/flag.png")); @@ -155,7 +155,7 @@ namespace kt void PeerViewItem::update() { - KLocale* loc = KGlobal::locale(); + KLocale* loc = TDEGlobal::locale(); const PeerInterface::Stats & s = peer->getStats(); if (s.download_rate >= 103) // lowest "visible" speed, all below will be 0,0 Kb/s @@ -246,8 +246,8 @@ namespace kt setShowSortIndicator(true); menu = new KPopupMenu(this); - kick_id = menu->insertItem(KGlobal::iconLoader()->loadIcon("delete_user", KIcon::NoGroup), i18n("to kick", "Kick peer")); - ban_id = menu->insertItem(KGlobal::iconLoader()->loadIcon("filter",KIcon::NoGroup), i18n("to ban", "Ban peer")); + kick_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("delete_user", KIcon::NoGroup), i18n("to kick", "Kick peer")); + ban_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("filter",KIcon::NoGroup), i18n("to ban", "Ban peer")); connect(this,TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint& )), this,TQT_SLOT(showContextMenu(KListView*, TQListViewItem*, const TQPoint& ))); diff --git a/plugins/infowidget/statustab.cpp b/plugins/infowidget/statustab.cpp index 44fe656..5c851b9 100644 --- a/plugins/infowidget/statustab.cpp +++ b/plugins/infowidget/statustab.cpp @@ -151,7 +151,7 @@ namespace kt if(!maxRatio->hasFocus() && useLimit->isChecked()) maxRatioUpdate(); - m_share_ratio->setText(TQString("%2").arg(ratio <= 0.8 ? "#ff0000" : "#1c9a1c").arg(KGlobal::locale()->formatNumber(ratio,2))); + m_share_ratio->setText(TQString("%2").arg(ratio <= 0.8 ? "#ff0000" : "#1c9a1c").arg(TDEGlobal::locale()->formatNumber(ratio,2))); Uint32 secs = curr_tc->getRunningTimeUL(); if (secs == 0) diff --git a/plugins/infowidget/trackerview.cpp b/plugins/infowidget/trackerview.cpp index 7a84f12..d7ac0b8 100644 --- a/plugins/infowidget/trackerview.cpp +++ b/plugins/infowidget/trackerview.cpp @@ -46,7 +46,7 @@ namespace kt TrackerView::TrackerView(TQWidget *parent, const char *name) :TrackerViewBase(parent, name), tc(0) { - KIconLoader* iload = KGlobal::iconLoader(); + KIconLoader* iload = TDEGlobal::iconLoader(); btnUpdate->setIconSet(iload->loadIconSet("apply", KIcon::Small)); btnAdd->setIconSet(iload->loadIconSet("add", KIcon::Small)); btnRemove->setIconSet(iload->loadIconSet("remove", KIcon::Small)); diff --git a/plugins/ipfilter/antip2p.cpp b/plugins/ipfilter/antip2p.cpp index d37300e..d448bd5 100644 --- a/plugins/ipfilter/antip2p.cpp +++ b/plugins/ipfilter/antip2p.cpp @@ -101,7 +101,7 @@ namespace kt void AntiP2P::load() { file = new MMapFile(); - if(! file->open(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat", MMapFile::READ) ) + if(! file->open(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat", MMapFile::READ) ) { Out(SYS_IPF|LOG_NOTICE) << "Anti-p2p file not loaded." << endl; file = 0; diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp index 95fb22a..5812453 100644 --- a/plugins/ipfilter/convertdialog.cpp +++ b/plugins/ipfilter/convertdialog.cpp @@ -87,14 +87,14 @@ namespace kt void ConvertDialog::convert() { - TQFile source( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.txt" ); - TQFile target( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" ); - TQFile temp( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp" ); + TQFile source( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.txt" ); + TQFile target( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" ); + TQFile temp( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp" ); if(target.exists()) { //make backup - KIO::NetAccess::file_copy(KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", -1, true); + KIO::NetAccess::file_copy(TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", -1, true); } /* READ INPUT FILE */ @@ -238,14 +238,14 @@ namespace kt { if(converting) { - TQFile target( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" ); + TQFile target( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" ); if(target.exists()) target.remove(); - TQFile temp( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp"); + TQFile temp( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp"); if(temp.exists()) { - KIO::NetAccess::file_copy(KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", -1, true); + KIO::NetAccess::file_copy(TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", -1, true); temp.remove(); } diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp index c717c6a..6c9b46f 100644 --- a/plugins/ipfilter/ipblockingprefpage.cpp +++ b/plugins/ipfilter/ipblockingprefpage.cpp @@ -89,7 +89,7 @@ namespace kt if(checkUseLevel1->isChecked()) { - TQFile target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat"); + TQFile target(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat"); if(target.exists()) lbl_status1->setText(i18n("Status: Loaded and running.")); else @@ -101,12 +101,12 @@ namespace kt void IPBlockingPrefPageWidget::btnDownload_clicked() { - TQString target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1"); + TQString target(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1"); TQFile target_file(target); TQFile txtfile(target + ".txt"); KURL url(m_url->url()); KURL dest(target); - KURL temp(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.tmp"); + KURL temp(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.tmp"); if(KIO::NetAccess::exists(temp,false, this)) KIO::NetAccess::del(temp,this); @@ -188,13 +188,13 @@ namespace kt void IPBlockingPrefPageWidget::convert() { - TQFile target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat"); + TQFile target(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat"); if(target.exists()) { if((KMessageBox::questionYesNo(this,i18n("Filter file (level1.dat) already exists, do you want to convert it again?"),i18n("File Exists")) == 4)) return; // else -// KIO::NetAccess::del(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat", NULL); +// KIO::NetAccess::del(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat", NULL); } ConvertDialog dlg(m_plugin); dlg.exec(); @@ -220,7 +220,7 @@ namespace kt //////////////////////////////////////////////////////////////////////////////////// IPBlockingPrefPage::IPBlockingPrefPage(CoreInterface* core, IPFilterPlugin* p) - : PrefPageInterface(i18n("IPBlocking Filter"), i18n("IPBlocking Filter Options"), KGlobal::iconLoader()->loadIcon("filter",KIcon::NoGroup)), m_core(core), m_plugin(p) + : PrefPageInterface(i18n("IPBlocking Filter"), i18n("IPBlocking Filter Options"), TDEGlobal::iconLoader()->loadIcon("filter",KIcon::NoGroup)), m_core(core), m_plugin(p) { widget = 0; } diff --git a/plugins/logviewer/logprefpage.cpp b/plugins/logviewer/logprefpage.cpp index 6cc6ce8..cd16e56 100644 --- a/plugins/logviewer/logprefpage.cpp +++ b/plugins/logviewer/logprefpage.cpp @@ -29,7 +29,7 @@ namespace kt LogPrefPage::LogPrefPage() : PrefPageInterface(i18n("LogViewer"), i18n("LogViewer Options"), - KGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup)) + TDEGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup)) { m_widget = 0; } diff --git a/plugins/logviewer/logviewer.cpp b/plugins/logviewer/logviewer.cpp index 8107191..4ab3ab1 100644 --- a/plugins/logviewer/logviewer.cpp +++ b/plugins/logviewer/logviewer.cpp @@ -51,10 +51,10 @@ namespace kt setMaxLogLines(200); setMinimumSize(TQSize(0,50)); setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); - KGlobal::config()->setGroup("LogViewer"); - if (KGlobal::config()->hasKey("LogViewerWidgetSize")) + TDEGlobal::config()->setGroup("LogViewer"); + if (TDEGlobal::config()->hasKey("LogViewerWidgetSize")) { - TQSize s = KGlobal::config()->readSizeEntry("LogViewerWidgetSize",0); + TQSize s = TDEGlobal::config()->readSizeEntry("LogViewerWidgetSize",0); resize(s); } @@ -64,8 +64,8 @@ namespace kt LogViewer::~LogViewer() { - KGlobal::config()->setGroup("LogViewer"); - KGlobal::config()->writeEntry("LogViewerWidgetSize",size()); + TDEGlobal::config()->setGroup("LogViewer"); + TDEGlobal::config()->writeEntry("LogViewerWidgetSize",size()); LogFlags::instance().setLog(0); } diff --git a/plugins/rssfeed/rss/loader.cpp b/plugins/rssfeed/rss/loader.cpp index 6c5b3d5..f725186 100644 --- a/plugins/rssfeed/rss/loader.cpp +++ b/plugins/rssfeed/rss/loader.cpp @@ -179,12 +179,12 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(slotExited(KProcess *))); - connect(d->process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(slotOutput(KProcess *, char *, int))); + connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); - d->process->start(KProcess::NotifyOnExit, KProcess::Stdout); + d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } int OutputRetriever::errorCode() const @@ -192,12 +192,12 @@ int OutputRetriever::errorCode() const return d->lastError; } -void OutputRetriever::slotOutput(KProcess *, char *data, int length) +void OutputRetriever::slotOutput(TDEProcess *, char *data, int length) { d->buffer->writeBlock(data, length); } -void OutputRetriever::slotExited(KProcess *p) +void OutputRetriever::slotExited(TDEProcess *p) { if (!p->normalExit()) d->lastError = p->exitStatus(); diff --git a/plugins/rssfeed/rss/loader.h b/plugins/rssfeed/rss/loader.h index f81406d..ae2a3b9 100644 --- a/plugins/rssfeed/rss/loader.h +++ b/plugins/rssfeed/rss/loader.h @@ -21,7 +21,7 @@ namespace KIO { class Job; } -class KProcess; +class TDEProcess; namespace RSS { @@ -192,8 +192,8 @@ namespace RSS virtual void abort() {} private slots: - void slotOutput(KProcess *process, char *data, int length); - void slotExited(KProcess *process); + void slotOutput(TDEProcess *process, char *data, int length); + void slotExited(TDEProcess *process); private: OutputRetriever(const OutputRetriever &other); diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp index 119b9b2..dea28b3 100644 --- a/plugins/rssfeed/rssfeed.cpp +++ b/plugins/rssfeed/rssfeed.cpp @@ -181,8 +181,8 @@ namespace kt TQString RssFeed::getFilename() { TQDir directory; - directory.mkdir(KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds"); - return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).replace("/", "_").replace(":", "_") + ".ktr"; + directory.mkdir(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds"); + return TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).replace("/", "_").replace(":", "_") + ".ktr"; } diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp index 20f81a6..65d1d6b 100644 --- a/plugins/rssfeed/rssfeedmanager.cpp +++ b/plugins/rssfeed/rssfeedmanager.cpp @@ -1082,12 +1082,12 @@ namespace kt TQString RssFeedManager::getFeedListFilename() { - return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds.ktr"; + return TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds.ktr"; } TQString RssFeedManager::getFilterListFilename() { - return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfilters.ktr"; + return TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfilters.ktr"; } void RssFeedManager::saveFeedList() diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/plugins/rssfeed/rssfeedplugin.cpp index fbe83e4..8025055 100644 --- a/plugins/rssfeed/rssfeedplugin.cpp +++ b/plugins/rssfeed/rssfeedplugin.cpp @@ -61,7 +61,7 @@ namespace kt void RssFeedPlugin::load() { //add the new tab to the gui - KIconLoader* iload = KGlobal::iconLoader(); + KIconLoader* iload = TDEGlobal::iconLoader(); m_rssFeedManager = new RssFeedManager(getCore()); getGUI()->addTabPage( m_rssFeedManager,iload->loadIconSet("player_playlist", KIcon::Small), diff --git a/plugins/scanfolder/scanfolderprefpage.cpp b/plugins/scanfolder/scanfolderprefpage.cpp index 4e01901..177cda5 100644 --- a/plugins/scanfolder/scanfolderprefpage.cpp +++ b/plugins/scanfolder/scanfolderprefpage.cpp @@ -32,7 +32,7 @@ namespace kt ScanFolderPrefPage::ScanFolderPrefPage(ScanFolderPlugin* plugin) : PrefPageInterface(i18n("ScanFolder"), i18n("ScanFolder Options"), - KGlobal::iconLoader()->loadIcon("view_sidetree",KIcon::NoGroup)), m_plugin(plugin) + TDEGlobal::iconLoader()->loadIcon("view_sidetree",KIcon::NoGroup)), m_plugin(plugin) {} diff --git a/plugins/scheduler/bwscheduler.cpp b/plugins/scheduler/bwscheduler.cpp index 56256a4..5f2502a 100644 --- a/plugins/scheduler/bwscheduler.cpp +++ b/plugins/scheduler/bwscheduler.cpp @@ -222,7 +222,7 @@ namespace kt void BWScheduler::loadSchedule() { - TQFile file(KGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule"); + TQFile file(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule"); if(!file.exists()) return; @@ -256,7 +256,7 @@ namespace kt void BWScheduler::saveSchedule() { - TQFile file(KGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule"); + TQFile file(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule"); file.open(IO_WriteOnly); TQDataStream stream(&file); diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp index 391ccbf..648afe7 100644 --- a/plugins/scheduler/bwsprefpagewidget.cpp +++ b/plugins/scheduler/bwsprefpagewidget.cpp @@ -53,7 +53,7 @@ namespace kt lblStatus->clear(); - pix_icon->setPixmap(KGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup)); + pix_icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup)); btnOk->setGuiItem(KStdGuiItem::ok()); btnCancel->setGuiItem(KStdGuiItem::cancel()); @@ -211,7 +211,7 @@ namespace kt void BWSPrefPageWidget::loadDefault() { //read schedule from HD - TQString fn = KGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule"; + TQString fn = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule"; loadSchedule(fn, false); } diff --git a/plugins/scheduler/schedulerprefpage.cpp b/plugins/scheduler/schedulerprefpage.cpp index 8af124b..9f561a4 100644 --- a/plugins/scheduler/schedulerprefpage.cpp +++ b/plugins/scheduler/schedulerprefpage.cpp @@ -32,7 +32,7 @@ namespace kt { SchedulerPrefPage::SchedulerPrefPage(SchedulerPlugin* plugin) - : PrefPageInterface(i18n("Scheduler"), i18n("Scheduler plugin options"), KGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup)), m_plugin(plugin) + : PrefPageInterface(i18n("Scheduler"), i18n("Scheduler plugin options"), TDEGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup)), m_plugin(plugin) { widget = 0; } diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp index 2f63f4e..9759cce 100644 --- a/plugins/search/searchplugin.cpp +++ b/plugins/search/searchplugin.cpp @@ -62,7 +62,7 @@ namespace kt void SearchPlugin::load() { - engines.load(KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); + engines.load(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); KToolBar* tb = getGUI()->addToolBar("search"); tab = new SearchTab(tb); connect(tab,TQT_SIGNAL(search( const TQString&, int, bool )), @@ -113,7 +113,7 @@ namespace kt return; } - KIconLoader* iload = KGlobal::iconLoader(); + KIconLoader* iload = TDEGlobal::iconLoader(); SearchWidget* search = new SearchWidget(this); getGUI()->addTabPage(search,iload->loadIconSet("viewmag", KIcon::Small),text,this); @@ -128,7 +128,7 @@ namespace kt void SearchPlugin::preferencesUpdated() { - engines.load(KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); + engines.load(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); if (tab) tab->updateSearchEngines(engines); diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp index c3f1517..8de3e28 100644 --- a/plugins/search/searchprefpage.cpp +++ b/plugins/search/searchprefpage.cpp @@ -99,7 +99,7 @@ namespace kt void SearchPrefPageWidget::saveSearchEngines() { - TQFile fptr(KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); + TQFile fptr(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); if (!fptr.open(IO_WriteOnly)) return; TQTextStream out(&fptr); @@ -185,7 +185,7 @@ namespace kt void SearchPrefPageWidget::btnUpdate_clicked() { - TQString fn = KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines.tmp"; + TQString fn = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines.tmp"; KURL source("http://www.ktorrent.org/downloads/search_engines"); if (KIO::NetAccess::download(source,fn,NULL)) @@ -245,7 +245,7 @@ namespace kt SearchPrefPage::SearchPrefPage(SearchPlugin* plugin) : PrefPageInterface(i18n("a noun", "Search"), i18n("Search Engine Options"), - KGlobal::iconLoader()->loadIcon("viewmag",KIcon::NoGroup)), m_plugin(plugin) + TDEGlobal::iconLoader()->loadIcon("viewmag",KIcon::NoGroup)), m_plugin(plugin) { widget = 0; } diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp index 01c27f7..0cf99a9 100644 --- a/plugins/search/searchwidget.cpp +++ b/plugins/search/searchwidget.cpp @@ -67,11 +67,11 @@ namespace kt right_click_menu = new KPopupMenu(this); right_click_menu->insertSeparator(); back_id = right_click_menu->insertItem( - KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() + TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() ? "forward" : "back",KIcon::Small), i18n("Back"),html_part,TQT_SLOT(back())); right_click_menu->insertItem( - KGlobal::iconLoader()->loadIconSet("reload",KIcon::Small), + TDEGlobal::iconLoader()->loadIconSet("reload",KIcon::Small), i18n("Reload"),html_part,TQT_SLOT(reload())); right_click_menu->setItemEnabled(back_id,false); @@ -83,13 +83,13 @@ namespace kt connect(sbar->m_reload,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(reload())); sbar->m_clear_button->setIconSet( - KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() + TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",KIcon::Small)); sbar->m_back->setIconSet( - KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() + TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() ? "forward" : "back", KIcon::Small)); sbar->m_reload->setIconSet( - KGlobal::iconLoader()->loadIconSet("reload",KIcon::Small)); + TDEGlobal::iconLoader()->loadIconSet("reload",KIcon::Small)); connect(html_part,TQT_SIGNAL(backAvailable(bool )), diff --git a/plugins/stats/StatsPluginPrefs.cc b/plugins/stats/StatsPluginPrefs.cc index 63a853d..495e077 100644 --- a/plugins/stats/StatsPluginPrefs.cc +++ b/plugins/stats/StatsPluginPrefs.cc @@ -22,7 +22,7 @@ namespace kt { -StatsPluginPrefs::StatsPluginPrefs() : PrefPageInterface(i18n("Statistics"), i18n("Statistics options"), KGlobal::iconLoader()->loadIcon("ktimemon",KIcon::NoGroup)), pmUi(0) +StatsPluginPrefs::StatsPluginPrefs() : PrefPageInterface(i18n("Statistics"), i18n("Statistics options"), TDEGlobal::iconLoader()->loadIcon("ktimemon",KIcon::NoGroup)), pmUi(0) { } diff --git a/plugins/upnp/upnpplugin.cpp b/plugins/upnp/upnpplugin.cpp index 66ee23c..8d2ff8f 100644 --- a/plugins/upnp/upnpplugin.cpp +++ b/plugins/upnp/upnpplugin.cpp @@ -59,12 +59,12 @@ namespace kt void UPnPPlugin::load() { - //KIconLoader* iload = KGlobal::iconLoader(); + //KIconLoader* iload = TDEGlobal::iconLoader(); sock = new UPnPMCastSocket(); pref = new UPnPPrefPage(sock); this->getGUI()->addPrefPage(pref); // load the routers list - TQString routers_file = KGlobal::dirs()->saveLocation("data","ktorrent") + "routers"; + TQString routers_file = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "routers"; if (bt::Exists(routers_file)) sock->loadRouters(routers_file); sock->discover(); @@ -72,7 +72,7 @@ namespace kt void UPnPPlugin::unload() { - TQString routers_file = KGlobal::dirs()->saveLocation("data","ktorrent") + "routers"; + TQString routers_file = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "routers"; sock->saveRouters(routers_file); this->getGUI()->removePrefPage(pref); sock->close(); diff --git a/plugins/upnp/upnpprefpage.cpp b/plugins/upnp/upnpprefpage.cpp index bce2285..7e9e095 100644 --- a/plugins/upnp/upnpprefpage.cpp +++ b/plugins/upnp/upnpprefpage.cpp @@ -28,7 +28,7 @@ namespace kt { - UPnPPrefPage::UPnPPrefPage(UPnPMCastSocket* sock): PrefPageInterface(i18n("UPnP"), i18n("UPnP Devices"),KGlobal::iconLoader()->loadIcon("ktupnp",KIcon::NoGroup)),sock(sock) + UPnPPrefPage::UPnPPrefPage(UPnPMCastSocket* sock): PrefPageInterface(i18n("UPnP"), i18n("UPnP Devices"),TDEGlobal::iconLoader()->loadIcon("ktupnp",KIcon::NoGroup)),sock(sock) { widget = 0; } diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp index 05d47a4..a5d1212 100644 --- a/plugins/upnp/upnprouter.cpp +++ b/plugins/upnp/upnprouter.cpp @@ -155,7 +155,7 @@ namespace kt if (!ret) { Out(SYS_PNP|LOG_IMPORTANT) << "Error parsing router description !" << endl; - TQString dest = KGlobal::dirs()->saveLocation("data","ktorrent") + "upnp_failure"; + TQString dest = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "upnp_failure"; KIO::file_copy(target,dest,-1,true,false,false); } else 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 <= 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 ){