From 4c097708c4cc24f3b8e4c21f14644f5715767d47 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:40:51 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- konq-plugins/fsview/fsview_part.cpp | 2 +- konq-plugins/fsview/inode.cpp | 10 +++++----- konq-plugins/fsview/main.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'konq-plugins/fsview') diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 3a913ec..5bef896 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -185,7 +185,7 @@ void FSViewPart::slotSettingsChanged(int category) TQObject::disconnect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), _ext,TQT_SLOT(selected(TreeMapItem*))); - if (KGlobalSettings::singleClick()) + if (TDEGlobalSettings::singleClick()) TQObject::connect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), _ext,TQT_SLOT(selected(TreeMapItem*))); else diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index 6f5073c..d12f495 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -327,19 +327,19 @@ TQString Inode::text(int i) const if (s < 1000) text = TQString("%1 B").arg((int)(s+.5)); else if (s < 10 * 1024) - text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.005,2)); + text = TQString("%1 kB").arg(TDEGlobal::locale()->formatNumber(s/1024+.005,2)); else if (s < 100 * 1024) - text = TQString("%1 kB").arg(KGlobal::locale()->formatNumber(s/1024+.05,1)); + text = TQString("%1 kB").arg(TDEGlobal::locale()->formatNumber(s/1024+.05,1)); else if (s < 1000 * 1024) text = TQString("%1 kB").arg((int)(s/1024+.5)); else if (s < 10 * 1024 * 1024) - text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.005,2)); + text = TQString("%1 MB").arg(TDEGlobal::locale()->formatNumber(s/1024/1024+.005,2)); else if (s < 100 * 1024 * 1024) - text = TQString("%1 MB").arg(KGlobal::locale()->formatNumber(s/1024/1024+.05,1)); + text = TQString("%1 MB").arg(TDEGlobal::locale()->formatNumber(s/1024/1024+.05,1)); else if (s < 1000 * 1024 * 1024) text = TQString("%1 MB").arg((int)(s/1024/1024+.5)); else - text = TQString("%1 GB").arg(KGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); + text = TQString("%1 GB").arg(TDEGlobal::locale()->formatNumber(s/1024/1024/1024+.005,2)); if (_sizeEstimation>0) text += "+"; return text; diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index f2f2daf..ec24f6d 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char* argv[]) TDECmdLineArgs::addCmdLineOptions(options); TDEApplication a; - KConfigGroup gconfig(KGlobal::config(), TQCString("General")); + KConfigGroup gconfig(TDEGlobal::config(), TQCString("General")); TQString path = gconfig.readPathEntry("Path", "."); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); -- cgit v1.2.1