From 7ff7bcc7ea84846c0e4dd51a4589300aea74acf5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:00:08 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- src/kvilib/tal/kvi_tal_application.cpp | 4 ++-- src/kvilib/tal/kvi_tal_application_kde.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/kvilib/tal') diff --git a/src/kvilib/tal/kvi_tal_application.cpp b/src/kvilib/tal/kvi_tal_application.cpp index a637c676..b372dfaa 100644 --- a/src/kvilib/tal/kvi_tal_application.cpp +++ b/src/kvilib/tal/kvi_tal_application.cpp @@ -33,14 +33,14 @@ // ../tal/kvi_tal_application.cpp:31: warning: `__base_ctor' is deprecated // (declared at /opt/kde/include/kapplication.h:198) // - // The KApplication constructor has been declared as deprecated + // The TDEApplication constructor has been declared as deprecated // in favor of a complexier initialization that uses TDECmdLineArgs // and can't be abstracted easily. // The other constructors are not "old" and "stable" enough // to be safely used at this time. We'll rethink this when KDE 4 is out. KviTalApplication::KviTalApplication(int &argc,char ** argv) - : KApplication(argc,argv,"kvirc") + : TDEApplication(argc,argv,"kvirc") { diff --git a/src/kvilib/tal/kvi_tal_application_kde.h b/src/kvilib/tal/kvi_tal_application_kde.h index ee6e653c..c9118509 100644 --- a/src/kvilib/tal/kvi_tal_application_kde.h +++ b/src/kvilib/tal/kvi_tal_application_kde.h @@ -26,7 +26,7 @@ #include -class KVILIB_API KviTalApplication : public KApplication +class KVILIB_API KviTalApplication : public TDEApplication { Q_OBJECT -- cgit v1.2.1