summaryrefslogtreecommitdiffstats
path: root/kpf/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:48:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:48:31 -0600
commitc48e769eb275917717e2b55eb869f7e559293ac8 (patch)
tree8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kpf/src
parent8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff)
downloadtdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz
tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kpf/src')
-rw-r--r--kpf/src/Applet.cpp8
-rw-r--r--kpf/src/BandwidthGraph.cpp6
-rw-r--r--kpf/src/DirectoryLister.cpp2
-rw-r--r--kpf/src/PropertiesDialogPlugin.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index 04a355c6..217128a5 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -72,7 +72,7 @@ extern "C"
{
kpf::blockSigPipe();
- KGlobal::locale()->insertCatalogue("kpf");
+ TDEGlobal::locale()->insertCatalogue("kpf");
return new KPF::Applet
(
@@ -372,11 +372,11 @@ namespace KPF
TQPixmap px;
if (width() > 48)
- px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 48);
+ px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 48);
else if (width() > 32)
- px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 32);
+ px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 32);
else if (width() > 16)
- px = KGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 16);
+ px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 16);
else
return;
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index d5a26233..ba02e69d 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -144,11 +144,11 @@ namespace KPF
buffer_.resize(size());
if ( width() > 48 )
- bgPix_ = KGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 48 );
+ bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 48 );
else if ( width() > 32 )
- bgPix_ = KGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 32 );
+ bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 32 );
else if ( width() > 16 )
- bgPix_ = KGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 16 );
+ bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 16 );
else
bgPix_.fill( this, TQPoint( 0, 0 ) );
diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp
index 6aec78d7..c0b0a503 100644
--- a/kpf/src/DirectoryLister.cpp
+++ b/kpf/src/DirectoryLister.cpp
@@ -117,7 +117,7 @@ namespace KPF
<< "background-color: "
<< colorToCSS
(
- KGlobalSettings::calculateAlternateBackgroundColor
+ TDEGlobalSettings::calculateAlternateBackgroundColor
(pal.color(TQPalette::Normal, TQColorGroup::Base))
)
<< "; "
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index 8cf14a7c..d3a0a7c9 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -661,7 +661,7 @@ namespace KPF
{
TQString noWarningKey("DoNotWarnAboutSharingDirectoriesViaHTTP");
- KConfig * config(KGlobal::config());
+ KConfig * config(TDEGlobal::config());
if (config->readBoolEntry(noWarningKey, false))
return true;