summaryrefslogtreecommitdiffstats
path: root/src/kreplacements/kreplacements.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:54:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:54:46 -0600
commitfe52f645fd58a8c0309a37360507c1b13361a348 (patch)
treed89a335f7e9331a367e66b388e2e29cbf40be159 /src/kreplacements/kreplacements.cpp
parentc8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7 (diff)
downloadkdiff3-fe52f645fd58a8c0309a37360507c1b13361a348.tar.gz
kdiff3-fe52f645fd58a8c0309a37360507c1b13361a348.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src/kreplacements/kreplacements.cpp')
-rw-r--r--src/kreplacements/kreplacements.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
index 084faf6..9b20e49 100644
--- a/src/kreplacements/kreplacements.cpp
+++ b/src/kreplacements/kreplacements.cpp
@@ -978,9 +978,9 @@ bool TDECmdLineArgs::isSet(const TQString& s)
}
///////////////////
-KApplication* kapp;
+TDEApplication* kapp;
-KApplication::KApplication()
+TDEApplication::TDEApplication()
: TQApplication( s_argc,s_argv )
{
kapp = this;
@@ -1109,22 +1109,22 @@ KApplication::KApplication()
}
}
-KConfig* KApplication::config()
+KConfig* TDEApplication::config()
{
return &m_config;
}
-bool KApplication::isRestored()
+bool TDEApplication::isRestored()
{
return false;
}
-KApplication* KApplication::kApplication()
+TDEApplication* TDEApplication::kApplication()
{
return kapp;
}
-KIconLoader* KApplication::iconLoader()
+KIconLoader* TDEApplication::iconLoader()
{
return &m_iconLoader;
}
@@ -1150,7 +1150,7 @@ KActionCollection* KParts::Part::actionCollection()
return 0;
}
-KApplication* KParts::Part::instance()
+TDEApplication* KParts::Part::instance()
{
return kapp;
}