TDE
/
ktorrent
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ktorrent
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 93f5eb3117
commit 604bf3f969
54 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File

2
apps/ktorrent/groups/group.cpp
Unescape View File

@ -42,7 +42,7 @@ namespace kt
void Group::setIconByName(const TQString & in) void Group::setIconByName(const TQString & in)
{ {
icon_name = in; icon_name = in;
icon = KGlobal::iconLoader()->loadIcon(in,KIcon::Small); icon = TDEGlobal::iconLoader()->loadIcon(in,KIcon::Small);
} }
void Group::rename(const TQString & nn) void Group::rename(const TQString & nn)

4
apps/ktorrent/groups/groupview.cpp
Unescape View File

@ -89,7 +89,7 @@ namespace kt
current_item = 0; current_item = 0;
menu = 0; menu = 0;
createMenu(col); 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* all = addGroup(gman->allGroup(),0);
GroupViewItem* dwnld = addGroup(gman->downloadGroup(),all); GroupViewItem* dwnld = addGroup(gman->downloadGroup(),all);
GroupViewItem* upld = addGroup(gman->uploadGroup(),all); GroupViewItem* upld = addGroup(gman->uploadGroup(),all);
@ -105,7 +105,7 @@ namespace kt
addGroup(gman->activeUploadsGroup(), active); addGroup(gman->activeUploadsGroup(), active);
custom_root = new KListViewItem(all,i18n("Custom Groups")); 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); setOpen(custom_root,true);
} }

2
apps/ktorrent/groups/torrentdrag.cpp
Unescape View File

@ -26,7 +26,7 @@ namespace kt
TorrentDrag::TorrentDrag(TQWidget* src, const char *name) : TQStoredDrag("application/x-ktorrent-drag-object",src, name) 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));
} }

34
apps/ktorrent/ktorrent.cpp
Unescape View File

@ -132,7 +132,7 @@ KTorrent::KTorrent()
m_systray_icon = new TrayIcon(m_core, this); m_systray_icon = new TrayIcon(m_core, this);
m_group_view->loadGroups(); m_group_view->loadGroups();
m_view_man->restoreViewState(KGlobal::config(),this); m_view_man->restoreViewState(TDEGlobal::config(),this);
TQToolButton* tb = new TQToolButton(m_activeTabWidget); TQToolButton* tb = new TQToolButton(m_activeTabWidget);
tb->setIconSet(SmallIcon("tab_new")); tb->setIconSet(SmallIcon("tab_new"));
@ -215,8 +215,8 @@ KTorrent::KTorrent()
addToolWidget(m_group_view,"player_playlist",i18n("Groups"),DOCK_LEFT); addToolWidget(m_group_view,"player_playlist",i18n("Groups"),DOCK_LEFT);
setAutoSaveSettings("WindowStatus",true); setAutoSaveSettings("WindowStatus",true);
KGlobal::config()->setGroup("WindowStatus"); TDEGlobal::config()->setGroup("WindowStatus");
bool hidden_on_exit = KGlobal::config()->readBoolEntry("hidden_on_exit",false); bool hidden_on_exit = TDEGlobal::config()->readBoolEntry("hidden_on_exit",false);
if (Settings::showSystemTrayIcon()) if (Settings::showSystemTrayIcon())
{ {
if (hidden_on_exit) if (hidden_on_exit)
@ -234,11 +234,11 @@ KTorrent::KTorrent()
show(); show();
} }
bool menubar_hidden = KGlobal::config()->readBoolEntry("menubar_hidden",false); bool menubar_hidden = TDEGlobal::config()->readBoolEntry("menubar_hidden",false);
menuBar()->setHidden(menubar_hidden); menuBar()->setHidden(menubar_hidden);
m_menubarAction->setChecked(!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); statusBar()->setHidden(statusbar_hidden);
m_statusbarAction->setChecked(!statusbar_hidden); m_statusbarAction->setChecked(!statusbar_hidden);
@ -598,11 +598,11 @@ bool KTorrent::queryExit()
// stop timers to prevent update // stop timers to prevent update
m_gui_update_timer.stop(); m_gui_update_timer.stop();
KGlobal::config()->setGroup("WindowStatus"); TDEGlobal::config()->setGroup("WindowStatus");
KGlobal::config()->writeEntry("hidden_on_exit",this->isHidden()); TDEGlobal::config()->writeEntry("hidden_on_exit",this->isHidden());
KGlobal::config()->writeEntry("menubar_hidden",menuBar()->isHidden()); TDEGlobal::config()->writeEntry("menubar_hidden",menuBar()->isHidden());
KGlobal::config()->writeEntry("statusbar_hidden",statusBar()->isHidden()); TDEGlobal::config()->writeEntry("statusbar_hidden",statusBar()->isHidden());
m_view_man->saveViewState(KGlobal::config()); m_view_man->saveViewState(TDEGlobal::config());
saveSettings(); saveSettings();
hide(); hide();
m_systray_icon->hide(); // hide system tray icon upon exit m_systray_icon->hide(); // hide system tray icon upon exit
@ -712,12 +712,12 @@ void KTorrent::optionsConfigureToolbars()
// use the standard toolbar editor // use the standard toolbar editor
#if defined(TDE_MAKE_VERSION) #if defined(TDE_MAKE_VERSION)
# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
# else # else
saveMainWindowSettings(KGlobal::config()); saveMainWindowSettings(TDEGlobal::config());
# endif # endif
#else #else
saveMainWindowSettings(KGlobal::config()); saveMainWindowSettings(TDEGlobal::config());
#endif #endif
KEditToolbar dlg(factory()); KEditToolbar dlg(factory());
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig()));
@ -732,12 +732,12 @@ void KTorrent::newToolbarConfig()
#if defined(TDE_MAKE_VERSION) #if defined(TDE_MAKE_VERSION)
# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
# else # else
applyMainWindowSettings(KGlobal::config()); applyMainWindowSettings(TDEGlobal::config());
# endif # endif
#else #else
applyMainWindowSettings(KGlobal::config()); applyMainWindowSettings(TDEGlobal::config());
#endif #endif
} }
@ -859,7 +859,7 @@ void KTorrent::addToolWidget(TQWidget* w,const TQString & icon,const TQString &
if (!icon.isNull()) if (!icon.isNull())
w->setIcon(KGlobal::iconLoader()->loadIcon(icon,KIcon::Small)); w->setIcon(TDEGlobal::iconLoader()->loadIcon(icon,KIcon::Small));
switch (dock) switch (dock)
{ {

2
apps/ktorrent/ktorrentapp.cpp
Unescape View File

@ -48,7 +48,7 @@ int KTorrentApp::newInstance()
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
bt::Globals::instance().setDebugMode(args->isSet("debug")); 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())) if (!data_dir.endsWith(bt::DirSeparator()))
data_dir += bt::DirSeparator(); data_dir += bt::DirSeparator();
bt::Globals::instance().initLog(data_dir + "log"); bt::Globals::instance().initLog(data_dir + "log");

4
apps/ktorrent/ktorrentcore.cpp
Unescape View File

@ -77,7 +77,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin
bool dd_not_exist = !bt::Exists(data_dir); bool dd_not_exist = !bt::Exists(data_dir);
if (data_dir == TQString() || dd_not_exist) 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) if (dd_not_exist)
{ {
Settings::setTempDir(data_dir); Settings::setTempDir(data_dir);
@ -139,7 +139,7 @@ KTorrentCore::~KTorrentCore()
void KTorrentCore::loadPlugins() void KTorrentCore::loadPlugins()
{ {
pman->loadConfigFile(KGlobal::dirs()->saveLocation("data","ktorrent") + "plugins"); pman->loadConfigFile(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "plugins");
pman->loadPluginList(); pman->loadPluginList();
} }

8
apps/ktorrent/ktorrentviewitem.cpp
Unescape View File

@ -160,8 +160,8 @@ QCStringList KTorrentViewItem::getTorrentInfo(kt::TorrentInterface* tc)
} }
info.append(TQString::number(s.num_peers).local8Bit()); info.append(TQString::number(s.num_peers).local8Bit());
info.append(TQString(KGlobal::locale()->formatNumber(Percentage(s),2) + " %").local8Bit()); info.append(TQString(TDEGlobal::locale()->formatNumber(Percentage(s),2) + " %").local8Bit());
info.append(KGlobal::locale()->formatNumber(kt::ShareRatio(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.seeders_connected_to).local8Bit());
info.append(TQString::number(s.leechers_connected_to).local8Bit()); info.append(TQString::number(s.leechers_connected_to).local8Bit());
return info; return info;
@ -252,13 +252,13 @@ void KTorrentViewItem::update()
if(m_parent->columnVisible(10)) 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)) if(m_parent->columnVisible(11))
{ {
float ratio = kt::ShareRatio(s); 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)) if (m_parent->columnVisible(12))

2
apps/ktorrent/ktorrentviewmenu.cpp
Unescape View File

@ -31,7 +31,7 @@ using namespace kt;
KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name ) KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name )
: KPopupMenu ( parent, name ),view(parent) : KPopupMenu ( parent, name ),view(parent)
{ {
KIconLoader* iload = KGlobal::iconLoader(); KIconLoader* iload = TDEGlobal::iconLoader();
stop_id = insertItem( stop_id = insertItem(
iload->loadIconSet("ktstop",KIcon::Small),i18n("to stop", "Stop"), iload->loadIconSet("ktstop",KIcon::Small),i18n("to stop", "Stop"),

8
apps/ktorrent/pref.cpp
Unescape View File

@ -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() DownloadPrefPage::~ DownloadPrefPage()
@ -214,7 +214,7 @@ void DownloadPrefPage::deleteWidget()
////////////////////////////////////// //////////////////////////////////////
GeneralPrefPage::GeneralPrefPage() : GeneralPrefPage::GeneralPrefPage() :
kt::PrefPageInterface(i18n("General"), i18n("General Options"), 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() GeneralPrefPage::~GeneralPrefPage()
@ -338,7 +338,7 @@ void GeneralPrefPage::updateData()
if (Settings::tempDir() == TQString()) 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())) if (!data_dir.endsWith(bt::DirSeparator()))
data_dir += bt::DirSeparator(); data_dir += bt::DirSeparator();
@ -409,7 +409,7 @@ void GeneralPrefPage::deleteWidget()
AdvancedPrefPage::AdvancedPrefPage() : AdvancedPrefPage::AdvancedPrefPage() :
kt::PrefPageInterface(i18n("Advanced"), i18n("Advanced Options"), 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() AdvancedPrefPage::~AdvancedPrefPage()

2
apps/ktorrent/queuedialog.cpp
Unescape View File

@ -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) QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *name)
:QueueDlg(parent, 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(0), iload->loadIconSet("down", KIcon::Small));
m_tabs->setTabIconSet(m_tabs->page(1), iload->loadIconSet("up", KIcon::Small)); m_tabs->setTabIconSet(m_tabs->page(1), iload->loadIconSet("up", KIcon::Small));

6
apps/ktorrent/trayicon.cpp
Unescape View File

@ -159,7 +159,7 @@ void TrayIcon::maxShareRatioReached(kt::TorrentInterface* tc)
return; return;
const TorrentStats & s = tc->getStats(); const TorrentStats & s = tc->getStats();
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
double speed_up = (double)s.bytes_uploaded / 1024.0; double speed_up = (double)s.bytes_uploaded / 1024.0;
TQString msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and has been stopped." TQString msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and has been stopped."
@ -178,7 +178,7 @@ void TrayIcon::maxSeedTimeReached(kt::TorrentInterface* tc)
return; return;
const TorrentStats & s = tc->getStats(); const TorrentStats & s = tc->getStats();
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
double speed_up = (double)s.bytes_uploaded / 1024.0; double speed_up = (double)s.bytes_uploaded / 1024.0;
TQString msg = i18n("<b>%1</b> has reached its maximum seed time of %2 hours and has been stopped." TQString msg = i18n("<b>%1</b> 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(); const TorrentStats & s = tc->getStats();
TQString msg; TQString msg;
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
if (tc->overMaxRatio()) if (tc->overMaxRatio())
msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and cannot be enqueued. Remove the limit manually if you want to continue seeding.") msg = i18n("<b>%1</b> has reached its maximum share ratio of %2 and cannot be enqueued. Remove the limit manually if you want to continue seeding.")

4
estimation-scripts/enable-logging.diff
Unescape View File

@ -36,7 +36,7 @@ Index: estimation-scripts/enable-logging.diff
-@@ -114,8 +119,43 @@ -@@ -114,8 +119,43 @@
- setText(6,KBytesPerSecToString(tc->getUploadRate() / 1024.0)); - setText(6,KBytesPerSecToString(tc->getUploadRate() / 1024.0));
- -
- KLocale* loc = KGlobal::locale(); - KLocale* loc = TDEGlobal::locale();
-+ -+
-+ -+
-+ if(counter==1) -+ if(counter==1)
@ -145,7 +145,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
@@ -114,8 +121,46 @@ @@ -114,8 +121,46 @@
setText(6,KBytesPerSecToString(s.upload_rate / 1024.0)); setText(6,KBytesPerSecToString(s.upload_rate / 1024.0));
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
+ +
+ +
+ +

2
libktorrent/functions.cpp
Unescape View File

@ -30,7 +30,7 @@ namespace kt
{ {
TQString DataDir() TQString DataDir()
{ {
TQString str = KGlobal::dirs()->saveLocation("data","ktorrent"); TQString str = TDEGlobal::dirs()->saveLocation("data","ktorrent");
if (!str.endsWith(bt::DirSeparator())) if (!str.endsWith(bt::DirSeparator()))
return str + bt::DirSeparator(); return str + bt::DirSeparator();
else else

4
libktorrent/interfaces/filetreediritem.cpp
Unescape View File

@ -39,7 +39,7 @@ namespace kt
{ {
parent = 0; parent = 0;
size = 0; size = 0;
setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
setText(0,name); setText(0,name);
setText(1,BytesToString(size)); setText(1,BytesToString(size));
setText(2,i18n("Yes")); setText(2,i18n("Yes"));
@ -53,7 +53,7 @@ namespace kt
name(name),parent(parent) name(name),parent(parent)
{ {
size = 0; size = 0;
setPixmap(0,KGlobal::iconLoader()->loadIcon("folder",KIcon::Small)); setPixmap(0,TDEGlobal::iconLoader()->loadIcon("folder",KIcon::Small));
setText(0,name); setText(0,name);
setText(1,BytesToString(size)); setText(1,BytesToString(size));
setText(2,i18n("Yes")); setText(2,i18n("Yes"));

6
libktorrent/interfaces/functions.cpp
Unescape View File

@ -30,7 +30,7 @@ namespace kt
TQString BytesToString(Uint64 bytes,int precision) TQString BytesToString(Uint64 bytes,int precision)
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
if (bytes >= 1024 * 1024 * 1024) if (bytes >= 1024 * 1024 * 1024)
return i18n("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision)); return i18n("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
else if (bytes >= 1024*1024) else if (bytes >= 1024*1024)
@ -43,13 +43,13 @@ namespace kt
TQString KBytesPerSecToString(double speed,int precision) TQString KBytesPerSecToString(double speed,int precision)
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision)); return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision));
} }
TQString DurationToString(Uint32 nsecs) TQString DurationToString(Uint32 nsecs)
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
TQTime t; TQTime t;
int ndays = nsecs / 86400; int ndays = nsecs / 86400;
t = t.addSecs(nsecs % 86400); t = t.addSecs(nsecs % 86400);

14
libktorrent/labelview.cpp
Unescape View File

@ -69,18 +69,18 @@ namespace kt
if (selected) if (selected)
{ {
setPaletteBackgroundColor(KGlobalSettings::highlightColor()); setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
setPaletteForegroundColor(KGlobalSettings::highlightedTextColor()); setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
} }
else if (odd) else if (odd)
{ {
setPaletteBackgroundColor(KGlobalSettings::baseColor()); setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
setPaletteForegroundColor(KGlobalSettings::textColor()); setPaletteForegroundColor(TDEGlobalSettings::textColor());
} }
else else
{ {
setPaletteBackgroundColor(KGlobalSettings::alternateBackgroundColor()); setPaletteBackgroundColor(TDEGlobalSettings::alternateBackgroundColor());
setPaletteForegroundColor(KGlobalSettings::textColor()); setPaletteForegroundColor(TDEGlobalSettings::textColor());
} }
} }
@ -109,7 +109,7 @@ namespace kt
public: public:
LabelViewBox(TQWidget* parent) : TQWidget(parent) LabelViewBox(TQWidget* parent) : TQWidget(parent)
{ {
setPaletteBackgroundColor(KGlobalSettings::baseColor()); setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
layout = new TQVBoxLayout(this); layout = new TQVBoxLayout(this);
layout->setMargin(0); layout->setMargin(0);
} }

2
libktorrent/pluginmanagerprefpage.cpp
Unescape View File

@ -60,7 +60,7 @@ namespace kt
}; };
PluginManagerPrefPage::PluginManagerPrefPage(PluginManager* pman) 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; pmw = 0;
} }

2
libktorrent/util/autorotatelogjob.cpp
Unescape View File

@ -70,7 +70,7 @@ namespace bt
else else
{ {
// final log file is moved, now zip it and end the job // 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; m_error = 0;
lg->logRotateDone(); lg->logRotateDone();
emitResult(); emitResult();

2
libktorrent/util/log.cpp
Unescape View File

@ -87,7 +87,7 @@ namespace bt
// move current log to 1 and zip it // move current log to 1 and zip it
bt::Move(file,file + "-1",true); 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) void setOutputFile(const TQString & file)

2
plugins/infowidget/fileview.cpp
Unescape View File

@ -185,7 +185,7 @@ namespace kt
percent = 0.0; percent = 0.0;
else if (percent > 100.0) else if (percent > 100.0)
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))); it.current()->setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2)));
} }
} }

4
plugins/infowidget/floatspinbox.cpp
Unescape View File

@ -94,7 +94,7 @@ TQString kt::FloatSpinBox::mapValueToText( int value )
{ {
/// This is called from TQSpinBox, which passes an int. /// This is called from TQSpinBox, which passes an int.
/// As we don't use the TQSpinBox's internal value, we ignore it. /// 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); editor()->setText(t);
return t; return t;
} }
@ -104,7 +104,7 @@ int kt::FloatSpinBox::mapTextToValue( bool * ok )
/// This is called from TQSpinBox, which needs an int for return. /// 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. /// 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) if (*ok)
{ {
setValue(value); setValue(value);

2
plugins/infowidget/floatspinbox.h
Unescape View File

@ -30,7 +30,7 @@ namespace kt
/** /**
* @author Jonas Widarsson * @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 * TQSpinBox's internal integer value is only
* used for step detection. * used for step detection.
*/ */

16
plugins/infowidget/infowidgetplugin.cpp
Unescape View File

@ -83,17 +83,17 @@ namespace kt
getGUI()->addPrefPage(pref); getGUI()->addPrefPage(pref);
currentTorrentChanged(const_cast<kt::TorrentInterface*>(getGUI()->getCurrentTorrent())); currentTorrentChanged(const_cast<kt::TorrentInterface*>(getGUI()->getCurrentTorrent()));
file_view->restoreLayout(KGlobal::config(),"FileView"); file_view->restoreLayout(TDEGlobal::config(),"FileView");
} }
void InfoWidgetPlugin::unload() void InfoWidgetPlugin::unload()
{ {
if (cd_view) if (cd_view)
cd_view->saveLayout(KGlobal::config(),"ChunkDownloadView"); cd_view->saveLayout(TDEGlobal::config(),"ChunkDownloadView");
if (peer_view) if (peer_view)
peer_view->saveLayout(KGlobal::config(),"PeerView"); peer_view->saveLayout(TDEGlobal::config(),"PeerView");
if (file_view) if (file_view)
file_view->saveLayout(KGlobal::config(),"FileView"); file_view->saveLayout(TDEGlobal::config(),"FileView");
getGUI()->removeViewListener(this); getGUI()->removeViewListener(this);
getGUI()->removePrefPage(pref); getGUI()->removePrefPage(pref);
@ -172,12 +172,12 @@ namespace kt
peer_view = new PeerView(0); peer_view = new PeerView(0);
getGUI()->addToolWidget(peer_view,"tdmconfig",i18n("Peers"),GUIInterface::DOCK_BOTTOM); getGUI()->addToolWidget(peer_view,"tdmconfig",i18n("Peers"),GUIInterface::DOCK_BOTTOM);
peer_view->restoreLayout(KGlobal::config(),"PeerView"); peer_view->restoreLayout(TDEGlobal::config(),"PeerView");
createMonitor(tc); createMonitor(tc);
} }
else if (!show && peer_view) else if (!show && peer_view)
{ {
peer_view->saveLayout(KGlobal::config(),"PeerView"); peer_view->saveLayout(TDEGlobal::config(),"PeerView");
getGUI()->removeToolWidget(peer_view); getGUI()->removeToolWidget(peer_view);
delete peer_view; peer_view = 0; delete peer_view; peer_view = 0;
createMonitor(tc); createMonitor(tc);
@ -193,13 +193,13 @@ namespace kt
cd_view = new ChunkDownloadView(0); cd_view = new ChunkDownloadView(0);
getGUI()->addToolWidget(cd_view,"fifteenpieces",i18n("Chunks"),GUIInterface::DOCK_BOTTOM); 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); cd_view->changeTC(tc);
createMonitor(tc); createMonitor(tc);
} }
else if (!show && cd_view) else if (!show && cd_view)
{ {
cd_view->saveLayout(KGlobal::config(),"ChunkDownloadView"); cd_view->saveLayout(TDEGlobal::config(),"ChunkDownloadView");
getGUI()->removeToolWidget(cd_view); getGUI()->removeToolWidget(cd_view);
delete cd_view; cd_view = 0; delete cd_view; cd_view = 0;
createMonitor(tc); createMonitor(tc);

2
plugins/infowidget/infowidgetprefpage.cpp
Unescape View File

@ -31,7 +31,7 @@ namespace kt
{ {
InfoWidgetPrefPage::InfoWidgetPrefPage(InfoWidgetPlugin* iw) 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; pref = 0;
} }

2
plugins/infowidget/iwfiletreeitem.cpp
Unescape View File

@ -91,7 +91,7 @@ namespace kt
percent = 0.0; percent = 0.0;
else if (percent > 100.0) else if (percent > 100.0)
percent = 100.0; percent = 100.0;
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2))); setText(4,i18n("%1 %").arg(loc->formatNumber(percent,2)));
perc_complete = percent; perc_complete = percent;
} }

2
plugins/infowidget/localefloatvalidator.cpp
Unescape View File

@ -26,7 +26,7 @@
kt::LocaleFloatValidator::LocaleFloatValidator( TQObject * parent, const char * name ) kt::LocaleFloatValidator::LocaleFloatValidator( TQObject * parent, const char * name )
:TQValidator(parent, name) :TQValidator(parent, name)
{ {
TQString decimalPoint = TQRegExp::escape(KGlobal::locale()->decimalSymbol()); TQString decimalPoint = TQRegExp::escape(TDEGlobal::locale()->decimalSymbol());
regexp.setPattern("^-?\\d*(" + decimalPoint + "\\d*)?$"); regexp.setPattern("^-?\\d*(" + decimalPoint + "\\d*)?$");
} }

8
plugins/infowidget/peerview.cpp
Unescape View File

@ -65,7 +65,7 @@ namespace kt
{ {
if (!yes_no_pix_loaded) if (!yes_no_pix_loaded)
{ {
KIconLoader* iload = KGlobal::iconLoader(); KIconLoader* iload = TDEGlobal::iconLoader();
/* Prefer builtin flag images to the ones provided by KDE */ /* Prefer builtin flag images to the ones provided by KDE */
flagDB.addFlagSource("data", TQString("ktorrent/geoip/%1.png")); flagDB.addFlagSource("data", TQString("ktorrent/geoip/%1.png"));
flagDB.addFlagSource("locale", TQString("l10n/%1/flag.png")); flagDB.addFlagSource("locale", TQString("l10n/%1/flag.png"));
@ -155,7 +155,7 @@ namespace kt
void PeerViewItem::update() void PeerViewItem::update()
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
const PeerInterface::Stats & s = peer->getStats(); const PeerInterface::Stats & s = peer->getStats();
if (s.download_rate >= 103) // lowest "visible" speed, all below will be 0,0 Kb/s if (s.download_rate >= 103) // lowest "visible" speed, all below will be 0,0 Kb/s
@ -246,8 +246,8 @@ namespace kt
setShowSortIndicator(true); setShowSortIndicator(true);
menu = new KPopupMenu(this); menu = new KPopupMenu(this);
kick_id = menu->insertItem(KGlobal::iconLoader()->loadIcon("delete_user", KIcon::NoGroup), i18n("to kick", "Kick peer")); kick_id = menu->insertItem(TDEGlobal::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")); ban_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("filter",KIcon::NoGroup), i18n("to ban", "Ban peer"));
connect(this,TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint& )), connect(this,TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint& )),
this,TQT_SLOT(showContextMenu(KListView*, TQListViewItem*, const TQPoint& ))); this,TQT_SLOT(showContextMenu(KListView*, TQListViewItem*, const TQPoint& )));

2
plugins/infowidget/statustab.cpp
Unescape View File

@ -151,7 +151,7 @@ namespace kt
if(!maxRatio->hasFocus() && useLimit->isChecked()) if(!maxRatio->hasFocus() && useLimit->isChecked())
maxRatioUpdate(); maxRatioUpdate();
m_share_ratio->setText(TQString("<font color=\"%1\">%2</font>").arg(ratio <= 0.8 ? "#ff0000" : "#1c9a1c").arg(KGlobal::locale()->formatNumber(ratio,2))); m_share_ratio->setText(TQString("<font color=\"%1\">%2</font>").arg(ratio <= 0.8 ? "#ff0000" : "#1c9a1c").arg(TDEGlobal::locale()->formatNumber(ratio,2)));
Uint32 secs = curr_tc->getRunningTimeUL(); Uint32 secs = curr_tc->getRunningTimeUL();
if (secs == 0) if (secs == 0)

2
plugins/infowidget/trackerview.cpp
Unescape View File

@ -46,7 +46,7 @@ namespace kt
TrackerView::TrackerView(TQWidget *parent, const char *name) TrackerView::TrackerView(TQWidget *parent, const char *name)
:TrackerViewBase(parent, name), tc(0) :TrackerViewBase(parent, name), tc(0)
{ {
KIconLoader* iload = KGlobal::iconLoader(); KIconLoader* iload = TDEGlobal::iconLoader();
btnUpdate->setIconSet(iload->loadIconSet("apply", KIcon::Small)); btnUpdate->setIconSet(iload->loadIconSet("apply", KIcon::Small));
btnAdd->setIconSet(iload->loadIconSet("add", KIcon::Small)); btnAdd->setIconSet(iload->loadIconSet("add", KIcon::Small));
btnRemove->setIconSet(iload->loadIconSet("remove", KIcon::Small)); btnRemove->setIconSet(iload->loadIconSet("remove", KIcon::Small));

2
plugins/ipfilter/antip2p.cpp
Unescape View File

@ -101,7 +101,7 @@ namespace kt
void AntiP2P::load() void AntiP2P::load()
{ {
file = new MMapFile(); 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; Out(SYS_IPF|LOG_NOTICE) << "Anti-p2p file not loaded." << endl;
file = 0; file = 0;

14
plugins/ipfilter/convertdialog.cpp
Unescape View File

@ -87,14 +87,14 @@ namespace kt
void ConvertDialog::convert() void ConvertDialog::convert()
{ {
TQFile source( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.txt" ); TQFile source( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.txt" );
TQFile target( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" ); TQFile target( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" );
TQFile temp( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp" ); TQFile temp( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp" );
if(target.exists()) if(target.exists())
{ {
//make backup //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 */ /* READ INPUT FILE */
@ -238,14 +238,14 @@ namespace kt
{ {
if(converting) if(converting)
{ {
TQFile target( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" ); TQFile target( TDEGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" );
if(target.exists()) if(target.exists())
target.remove(); 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()) 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(); temp.remove();
} }

12
plugins/ipfilter/ipblockingprefpage.cpp
Unescape View File

@ -89,7 +89,7 @@ namespace kt
if(checkUseLevel1->isChecked()) if(checkUseLevel1->isChecked())
{ {
TQFile target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat"); TQFile target(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat");
if(target.exists()) if(target.exists())
lbl_status1->setText(i18n("Status: Loaded and running.")); lbl_status1->setText(i18n("Status: Loaded and running."));
else else
@ -101,12 +101,12 @@ namespace kt
void IPBlockingPrefPageWidget::btnDownload_clicked() 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 target_file(target);
TQFile txtfile(target + ".txt"); TQFile txtfile(target + ".txt");
KURL url(m_url->url()); KURL url(m_url->url());
KURL dest(target); 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)) if(KIO::NetAccess::exists(temp,false, this))
KIO::NetAccess::del(temp,this); KIO::NetAccess::del(temp,this);
@ -188,13 +188,13 @@ namespace kt
void IPBlockingPrefPageWidget::convert() 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(target.exists())
{ {
if((KMessageBox::questionYesNo(this,i18n("Filter file (level1.dat) already exists, do you want to convert it again?"),i18n("File Exists")) == 4)) if((KMessageBox::questionYesNo(this,i18n("Filter file (level1.dat) already exists, do you want to convert it again?"),i18n("File Exists")) == 4))
return; return;
// else // 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); ConvertDialog dlg(m_plugin);
dlg.exec(); dlg.exec();
@ -220,7 +220,7 @@ namespace kt
//////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
IPBlockingPrefPage::IPBlockingPrefPage(CoreInterface* core, IPFilterPlugin* p) 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; widget = 0;
} }

2
plugins/logviewer/logprefpage.cpp
Unescape View File

@ -29,7 +29,7 @@ namespace kt
LogPrefPage::LogPrefPage() LogPrefPage::LogPrefPage()
: PrefPageInterface(i18n("LogViewer"), i18n("LogViewer Options"), : PrefPageInterface(i18n("LogViewer"), i18n("LogViewer Options"),
KGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup)) TDEGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup))
{ {
m_widget = 0; m_widget = 0;
} }

10
plugins/logviewer/logviewer.cpp
Unescape View File

@ -51,10 +51,10 @@ namespace kt
setMaxLogLines(200); setMaxLogLines(200);
setMinimumSize(TQSize(0,50)); setMinimumSize(TQSize(0,50));
setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding); setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding);
KGlobal::config()->setGroup("LogViewer"); TDEGlobal::config()->setGroup("LogViewer");
if (KGlobal::config()->hasKey("LogViewerWidgetSize")) if (TDEGlobal::config()->hasKey("LogViewerWidgetSize"))
{ {
TQSize s = KGlobal::config()->readSizeEntry("LogViewerWidgetSize",0); TQSize s = TDEGlobal::config()->readSizeEntry("LogViewerWidgetSize",0);
resize(s); resize(s);
} }
@ -64,8 +64,8 @@ namespace kt
LogViewer::~LogViewer() LogViewer::~LogViewer()
{ {
KGlobal::config()->setGroup("LogViewer"); TDEGlobal::config()->setGroup("LogViewer");
KGlobal::config()->writeEntry("LogViewerWidgetSize",size()); TDEGlobal::config()->writeEntry("LogViewerWidgetSize",size());
LogFlags::instance().setLog(0); LogFlags::instance().setLog(0);
} }

14
plugins/rssfeed/rss/loader.cpp
Unescape View File

@ -179,12 +179,12 @@ void OutputRetriever::retrieveData(const KURL &url)
d->buffer->open(IO_WriteOnly); d->buffer->open(IO_WriteOnly);
d->process = new KShellProcess(); d->process = new KShellProcess();
connect(d->process, TQT_SIGNAL(processExited(KProcess *)), connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)),
TQT_SLOT(slotExited(KProcess *))); TQT_SLOT(slotExited(TDEProcess *)));
connect(d->process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
TQT_SLOT(slotOutput(KProcess *, char *, int))); TQT_SLOT(slotOutput(TDEProcess *, char *, int)));
*d->process << url.path(); *d->process << url.path();
d->process->start(KProcess::NotifyOnExit, KProcess::Stdout); d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
} }
int OutputRetriever::errorCode() const int OutputRetriever::errorCode() const
@ -192,12 +192,12 @@ int OutputRetriever::errorCode() const
return d->lastError; return d->lastError;
} }
void OutputRetriever::slotOutput(KProcess *, char *data, int length) void OutputRetriever::slotOutput(TDEProcess *, char *data, int length)
{ {
d->buffer->writeBlock(data, length); d->buffer->writeBlock(data, length);
} }
void OutputRetriever::slotExited(KProcess *p) void OutputRetriever::slotExited(TDEProcess *p)
{ {
if (!p->normalExit()) if (!p->normalExit())
d->lastError = p->exitStatus(); d->lastError = p->exitStatus();

6
plugins/rssfeed/rss/loader.h
Unescape View File

@ -21,7 +21,7 @@ namespace KIO
{ {
class Job; class Job;
} }
class KProcess; class TDEProcess;
namespace RSS namespace RSS
{ {
@ -192,8 +192,8 @@ namespace RSS
virtual void abort() {} virtual void abort() {}
private slots: private slots:
void slotOutput(KProcess *process, char *data, int length); void slotOutput(TDEProcess *process, char *data, int length);
void slotExited(KProcess *process); void slotExited(TDEProcess *process);
private: private:
OutputRetriever(const OutputRetriever &other); OutputRetriever(const OutputRetriever &other);

4
plugins/rssfeed/rssfeed.cpp
Unescape View File

@ -181,8 +181,8 @@ namespace kt
TQString RssFeed::getFilename() TQString RssFeed::getFilename()
{ {
TQDir directory; TQDir directory;
directory.mkdir(KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds"); directory.mkdir(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds");
return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).replace("/", "_").replace(":", "_") + ".ktr"; return TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).replace("/", "_").replace(":", "_") + ".ktr";
} }

4
plugins/rssfeed/rssfeedmanager.cpp
Unescape View File

@ -1082,12 +1082,12 @@ namespace kt
TQString RssFeedManager::getFeedListFilename() TQString RssFeedManager::getFeedListFilename()
{ {
return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds.ktr"; return TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds.ktr";
} }
TQString RssFeedManager::getFilterListFilename() TQString RssFeedManager::getFilterListFilename()
{ {
return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfilters.ktr"; return TDEGlobal::dirs()->saveLocation("data","ktorrent") + "rssfilters.ktr";
} }
void RssFeedManager::saveFeedList() void RssFeedManager::saveFeedList()

2
plugins/rssfeed/rssfeedplugin.cpp
Unescape View File

@ -61,7 +61,7 @@ namespace kt
void RssFeedPlugin::load() void RssFeedPlugin::load()
{ {
//add the new tab to the gui //add the new tab to the gui
KIconLoader* iload = KGlobal::iconLoader(); KIconLoader* iload = TDEGlobal::iconLoader();
m_rssFeedManager = new RssFeedManager(getCore()); m_rssFeedManager = new RssFeedManager(getCore());
getGUI()->addTabPage( getGUI()->addTabPage(
m_rssFeedManager,iload->loadIconSet("player_playlist", KIcon::Small), m_rssFeedManager,iload->loadIconSet("player_playlist", KIcon::Small),

2
plugins/scanfolder/scanfolderprefpage.cpp
Unescape View File

@ -32,7 +32,7 @@ namespace kt
ScanFolderPrefPage::ScanFolderPrefPage(ScanFolderPlugin* plugin) ScanFolderPrefPage::ScanFolderPrefPage(ScanFolderPlugin* plugin)
: PrefPageInterface(i18n("ScanFolder"), i18n("ScanFolder Options"), : 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)
{} {}

4
plugins/scheduler/bwscheduler.cpp
Unescape View File

@ -222,7 +222,7 @@ namespace kt
void BWScheduler::loadSchedule() void BWScheduler::loadSchedule()
{ {
TQFile file(KGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule"); TQFile file(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule");
if(!file.exists()) if(!file.exists())
return; return;
@ -256,7 +256,7 @@ namespace kt
void BWScheduler::saveSchedule() void BWScheduler::saveSchedule()
{ {
TQFile file(KGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule"); TQFile file(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule");
file.open(IO_WriteOnly); file.open(IO_WriteOnly);
TQDataStream stream(&file); TQDataStream stream(&file);

4
plugins/scheduler/bwsprefpagewidget.cpp
Unescape View File

@ -53,7 +53,7 @@ namespace kt
lblStatus->clear(); lblStatus->clear();
pix_icon->setPixmap(KGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup)); pix_icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("clock",KIcon::NoGroup));
btnOk->setGuiItem(KStdGuiItem::ok()); btnOk->setGuiItem(KStdGuiItem::ok());
btnCancel->setGuiItem(KStdGuiItem::cancel()); btnCancel->setGuiItem(KStdGuiItem::cancel());
@ -211,7 +211,7 @@ namespace kt
void BWSPrefPageWidget::loadDefault() void BWSPrefPageWidget::loadDefault()
{ {
//read schedule from HD //read schedule from HD
TQString fn = KGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule"; TQString fn = TDEGlobal::dirs()->saveLocation("data","ktorrent") + "bwschedule";
loadSchedule(fn, false); loadSchedule(fn, false);
} }

2
plugins/scheduler/schedulerprefpage.cpp
Unescape View File

@ -32,7 +32,7 @@ namespace kt
{ {
SchedulerPrefPage::SchedulerPrefPage(SchedulerPlugin* plugin) 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; widget = 0;
} }

6
plugins/search/searchplugin.cpp
Unescape View File

@ -62,7 +62,7 @@ namespace kt
void SearchPlugin::load() 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"); KToolBar* tb = getGUI()->addToolBar("search");
tab = new SearchTab(tb); tab = new SearchTab(tb);
connect(tab,TQT_SIGNAL(search( const TQString&, int, bool )), connect(tab,TQT_SIGNAL(search( const TQString&, int, bool )),
@ -113,7 +113,7 @@ namespace kt
return; return;
} }
KIconLoader* iload = KGlobal::iconLoader(); KIconLoader* iload = TDEGlobal::iconLoader();
SearchWidget* search = new SearchWidget(this); SearchWidget* search = new SearchWidget(this);
getGUI()->addTabPage(search,iload->loadIconSet("viewmag", KIcon::Small),text,this); getGUI()->addTabPage(search,iload->loadIconSet("viewmag", KIcon::Small),text,this);
@ -128,7 +128,7 @@ namespace kt
void SearchPlugin::preferencesUpdated() void SearchPlugin::preferencesUpdated()
{ {
engines.load(KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); engines.load(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines");
if (tab) if (tab)
tab->updateSearchEngines(engines); tab->updateSearchEngines(engines);

6
plugins/search/searchprefpage.cpp
Unescape View File

@ -99,7 +99,7 @@ namespace kt
void SearchPrefPageWidget::saveSearchEngines() 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)) if (!fptr.open(IO_WriteOnly))
return; return;
TQTextStream out(&fptr); TQTextStream out(&fptr);
@ -185,7 +185,7 @@ namespace kt
void SearchPrefPageWidget::btnUpdate_clicked() 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"); KURL source("http://www.ktorrent.org/downloads/search_engines");
if (KIO::NetAccess::download(source,fn,NULL)) if (KIO::NetAccess::download(source,fn,NULL))
@ -245,7 +245,7 @@ namespace kt
SearchPrefPage::SearchPrefPage(SearchPlugin* plugin) SearchPrefPage::SearchPrefPage(SearchPlugin* plugin)
: PrefPageInterface(i18n("a noun", "Search"), i18n("Search Engine Options"), : 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; widget = 0;
} }

10
plugins/search/searchwidget.cpp
Unescape View File

@ -67,11 +67,11 @@ namespace kt
right_click_menu = new KPopupMenu(this); right_click_menu = new KPopupMenu(this);
right_click_menu->insertSeparator(); right_click_menu->insertSeparator();
back_id = right_click_menu->insertItem( back_id = right_click_menu->insertItem(
KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout()
? "forward" : "back",KIcon::Small), ? "forward" : "back",KIcon::Small),
i18n("Back"),html_part,TQT_SLOT(back())); i18n("Back"),html_part,TQT_SLOT(back()));
right_click_menu->insertItem( right_click_menu->insertItem(
KGlobal::iconLoader()->loadIconSet("reload",KIcon::Small), TDEGlobal::iconLoader()->loadIconSet("reload",KIcon::Small),
i18n("Reload"),html_part,TQT_SLOT(reload())); i18n("Reload"),html_part,TQT_SLOT(reload()));
right_click_menu->setItemEnabled(back_id,false); 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())); connect(sbar->m_reload,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(reload()));
sbar->m_clear_button->setIconSet( sbar->m_clear_button->setIconSet(
KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout()
? "clear_left" : "locationbar_erase",KIcon::Small)); ? "clear_left" : "locationbar_erase",KIcon::Small));
sbar->m_back->setIconSet( sbar->m_back->setIconSet(
KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout()
? "forward" : "back", KIcon::Small)); ? "forward" : "back", KIcon::Small));
sbar->m_reload->setIconSet( sbar->m_reload->setIconSet(
KGlobal::iconLoader()->loadIconSet("reload",KIcon::Small)); TDEGlobal::iconLoader()->loadIconSet("reload",KIcon::Small));
connect(html_part,TQT_SIGNAL(backAvailable(bool )), connect(html_part,TQT_SIGNAL(backAvailable(bool )),

2
plugins/stats/StatsPluginPrefs.cc
Unescape View File

@ -22,7 +22,7 @@
namespace kt { 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)
{ {
} }

6
plugins/upnp/upnpplugin.cpp
Unescape View File

@ -59,12 +59,12 @@ namespace kt
void UPnPPlugin::load() void UPnPPlugin::load()
{ {
//KIconLoader* iload = KGlobal::iconLoader(); //KIconLoader* iload = TDEGlobal::iconLoader();
sock = new UPnPMCastSocket(); sock = new UPnPMCastSocket();
pref = new UPnPPrefPage(sock); pref = new UPnPPrefPage(sock);
this->getGUI()->addPrefPage(pref); this->getGUI()->addPrefPage(pref);
// load the routers list // 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)) if (bt::Exists(routers_file))
sock->loadRouters(routers_file); sock->loadRouters(routers_file);
sock->discover(); sock->discover();
@ -72,7 +72,7 @@ namespace kt
void UPnPPlugin::unload() 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); sock->saveRouters(routers_file);
this->getGUI()->removePrefPage(pref); this->getGUI()->removePrefPage(pref);
sock->close(); sock->close();

2
plugins/upnp/upnpprefpage.cpp
Unescape View File

@ -28,7 +28,7 @@
namespace kt 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; widget = 0;
} }

2
plugins/upnp/upnprouter.cpp
Unescape View File

@ -155,7 +155,7 @@ namespace kt
if (!ret) if (!ret)
{ {
Out(SYS_PNP|LOG_IMPORTANT) << "Error parsing router description !" << endl; 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); KIO::file_copy(target,dest,-1,true,false,false);
} }
else else

2
plugins/webinterface/httpserver.cpp
Unescape View File

@ -58,7 +58,7 @@ namespace kt
php_i = new PhpInterface(core); php_i = new PhpInterface(core);
clients.setAutoDelete(true); clients.setAutoDelete(true);
TQStringList dirList = KGlobal::instance()->dirs()->findDirs("data", "ktorrent/www"); TQStringList dirList = TDEGlobal::instance()->dirs()->findDirs("data", "ktorrent/www");
rootDir = *(dirList.begin()); rootDir = *(dirList.begin());
Out(SYS_WEB|LOG_DEBUG) << "WWW Root Directory "<< rootDir <<endl; Out(SYS_WEB|LOG_DEBUG) << "WWW Root Directory "<< rootDir <<endl;
session.logged_in = false; session.logged_in = false;

4
plugins/webinterface/php_interface.cpp
Unescape View File

@ -46,7 +46,7 @@ namespace kt
TQString BytesToString2(Uint64 bytes,int precision = 2) TQString BytesToString2(Uint64 bytes,int precision = 2)
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
if (bytes >= 1024 * 1024 * 1024) if (bytes >= 1024 * 1024 * 1024)
return TQString("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision)); return TQString("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
else if (bytes >= 1024*1024) else if (bytes >= 1024*1024)
@ -59,7 +59,7 @@ namespace kt
TQString KBytesPerSecToString2(double speed,int precision = 2) 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)); return TQString("%1 KB/s").arg(loc->formatNumber(speed,precision));
} }

2
plugins/webinterface/webinterfaceprefpage.cpp
Unescape View File

@ -25,7 +25,7 @@ namespace kt
WebInterfacePrefPage::WebInterfacePrefPage(WebInterfacePlugin* plugin) WebInterfacePrefPage::WebInterfacePrefPage(WebInterfacePlugin* plugin)
: PrefPageInterface(i18n("WebInterface"), i18n("WebInterface Options"), : PrefPageInterface(i18n("WebInterface"), i18n("WebInterface Options"),
KGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup)) TDEGlobal::iconLoader()->loadIcon("toggle_log",KIcon::NoGroup))
{ {
m_widget = 0; m_widget = 0;
w_plugin=plugin; w_plugin=plugin;

2
plugins/webinterface/webinterfaceprefwidget.cpp
Unescape View File

@ -50,7 +50,7 @@ WebInterfacePrefWidget::WebInterfacePrefWidget(TQWidget *parent, const char *nam
forward->setChecked(WebInterfacePluginSettings::forward()); forward->setChecked(WebInterfacePluginSettings::forward());
sessionTTL->setValue(WebInterfacePluginSettings::sessionTTL()); 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())); TQDir d(*(dirList.begin()));
TQStringList skinList=d.entryList(TQDir::Dirs); TQStringList skinList=d.entryList(TQDir::Dirs);
for ( TQStringList::Iterator it = skinList.begin(); it != skinList.end(); ++it ){ for ( TQStringList::Iterator it = skinList.begin(); it != skinList.end(); ++it ){

Write Preview
Loading…
Cancel
Save