summaryrefslogtreecommitdiffstats
path: root/src/kreplacements
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:20:19 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:20:19 -0600
commit672c9c39de40e4da2849acbacf0b943dd26a31ac (patch)
tree4e7c5dc2fdb4ad4a5965f155d637469539f5756f /src/kreplacements
parentf6fa7358bce15f669048effe68b8fb77ed6ffb58 (diff)
downloadkdiff3-672c9c39de40e4da2849acbacf0b943dd26a31ac.tar.gz
kdiff3-672c9c39de40e4da2849acbacf0b943dd26a31ac.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/kreplacements')
-rw-r--r--src/kreplacements/kreplacements.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index ca172c6..bebe96c 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -410,7 +410,7 @@ public:
KEditToolbar( int ){}
};
-class KGlobal
+class TDEGlobal
{
public:
static KConfig* config() { return 0; }