diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:57:47 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:57:47 -0600 |
commit | 6ec5cc8d82b29c330def669cf20534cadd2cf29e (patch) | |
tree | 7e66b929b5455837f22ea54ed91fc9af6f64f7bf /lib/kofficecore/KoApplication.cpp | |
parent | 68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (diff) | |
download | koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.tar.gz koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficecore/KoApplication.cpp')
-rw-r--r-- | lib/kofficecore/KoApplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp index 5346ff0ab..47861558c 100644 --- a/lib/kofficecore/KoApplication.cpp +++ b/lib/kofficecore/KoApplication.cpp @@ -56,7 +56,7 @@ public: }; KoApplication::KoApplication() - : KApplication( initHack() ) + : TDEApplication( initHack() ) { d = new KoApplicationPrivate; @@ -70,7 +70,7 @@ KoApplication::KoApplication() m_starting = true; } -// This gets called before entering KApplication::KApplication +// This gets called before entering TDEApplication::TDEApplication bool KoApplication::initHack() { TDECmdLineArgs::addCmdLineOptions( options, I18N_NOOP("KOffice"), "koffice", "kde" ); |