From 6ec5cc8d82b29c330def669cf20534cadd2cf29e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 23:57:47 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- lib/kofficecore/KoApplication.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/kofficecore/KoApplication.cpp') 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" ); -- cgit v1.2.3