diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:33 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:25:33 -0600 |
commit | 604bf3f969d880708ea9a1affce0b304c29e6ff5 (patch) | |
tree | e8fad7142f5d23041b1c9e6c2a1d0d8c814b0ebe /plugins/infowidget | |
parent | 93f5eb31173901d14b4376614f89d43973ddd45b (diff) | |
download | ktorrent-604bf3f969d880708ea9a1affce0b304c29e6ff5.tar.gz ktorrent-604bf3f969d880708ea9a1affce0b304c29e6ff5.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'plugins/infowidget')
-rw-r--r-- | plugins/infowidget/fileview.cpp | 2 | ||||
-rw-r--r-- | plugins/infowidget/floatspinbox.cpp | 4 | ||||
-rw-r--r-- | plugins/infowidget/floatspinbox.h | 2 | ||||
-rw-r--r-- | plugins/infowidget/infowidgetplugin.cpp | 16 | ||||
-rw-r--r-- | plugins/infowidget/infowidgetprefpage.cpp | 2 | ||||
-rw-r--r-- | plugins/infowidget/iwfiletreeitem.cpp | 2 | ||||
-rw-r--r-- | plugins/infowidget/localefloatvalidator.cpp | 2 | ||||
-rw-r--r-- | plugins/infowidget/peerview.cpp | 8 | ||||
-rw-r--r-- | plugins/infowidget/statustab.cpp | 2 | ||||
-rw-r--r-- | plugins/infowidget/trackerview.cpp | 2 |
10 files changed, 21 insertions, 21 deletions
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<kt::TorrentInterface*>(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("<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(); 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)); |