From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:15:55 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 drkonqi/crashtest.cpp   | 4 ++--
 drkonqi/drbugreport.cpp | 2 +-
 drkonqi/drbugreport.h   | 4 ++--
 drkonqi/krashconf.cpp   | 2 +-
 drkonqi/krashconf.h     | 4 ++--
 drkonqi/main.cpp        | 4 ++--
 drkonqi/toplevel.h      | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'drkonqi')

diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp
index a0aae0347..57f055420 100644
--- a/drkonqi/crashtest.cpp
+++ b/drkonqi/crashtest.cpp
@@ -68,10 +68,10 @@ void level1(int t)
 
 int main(int argc, char *argv[])
 {
-  KAboutData aboutData("crashtext", "Crash Test for DrKonqi",
+  TDEAboutData aboutData("crashtext", "Crash Test for DrKonqi",
                        "1.1",
                        "Crash Test for DrKonqi",
-                       KAboutData::License_GPL,
+                       TDEAboutData::License_GPL,
                        "(c) 2000-2002 David Faure, Waldo Bastian");
 
   TDECmdLineArgs::init(argc, argv, &aboutData);
diff --git a/drkonqi/drbugreport.cpp b/drkonqi/drbugreport.cpp
index 3ec731b01..924f83e28 100644
--- a/drkonqi/drbugreport.cpp
+++ b/drkonqi/drbugreport.cpp
@@ -35,7 +35,7 @@
 #include "drbugreport.h"
 
 DrKBugReport::DrKBugReport(TQWidget *parent, bool modal,
-                           const KAboutData *aboutData)
+                           const TDEAboutData *aboutData)
   : KBugReport(parent, modal, aboutData)
 {
 }
diff --git a/drkonqi/drbugreport.h b/drkonqi/drbugreport.h
index d1e98e028..a76740416 100644
--- a/drkonqi/drbugreport.h
+++ b/drkonqi/drbugreport.h
@@ -28,7 +28,7 @@
 #ifndef DRBUGREPORT_H
 #define DRBUGREPORT_H
 
-class KAboutData;
+class TDEAboutData;
 
 #include <kbugreport.h>
 
@@ -41,7 +41,7 @@ public:
    * Constructor.
    */
   DrKBugReport(TQWidget *parent = 0, bool modal = true,
-               const KAboutData *aboutData = 0);
+               const TDEAboutData *aboutData = 0);
 
 public:
   /**
diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp
index 1e22bbbd9..38e8c84cc 100644
--- a/drkonqi/krashconf.cpp
+++ b/drkonqi/krashconf.cpp
@@ -74,7 +74,7 @@ void KrashConfig :: readConfig()
     programname.setStr(I18N_NOOP("unknown"));
   // leak some memory... Well. It's only done once anyway :-)
   const char * progname = tqstrdup(programname);
-  m_aboutData = new KAboutData(args->getOption("appname"),
+  m_aboutData = new TDEAboutData(args->getOption("appname"),
                                progname,
                                args->getOption("appversion"),
                                0, 0, 0, 0, 0,
diff --git a/drkonqi/krashconf.h b/drkonqi/krashconf.h
index 236083f76..f20c395f0 100644
--- a/drkonqi/krashconf.h
+++ b/drkonqi/krashconf.h
@@ -70,7 +70,7 @@ public:
   bool showDebugger() const { return m_showdebugger && !m_debugger.isNull(); };
   bool showBugReport() const { return m_showbugreport; };
   bool disableChecks() const { return m_disablechecks; };
-  const KAboutData *aboutData() const { return m_aboutData; }
+  const TDEAboutData *aboutData() const { return m_aboutData; }
   TQString execName() const { return m_execname; }
 
   void expandString(TQString &str, bool shell, const TQString &tempFile = TQString::null) const;
@@ -84,7 +84,7 @@ private:
   void readConfig();
 
 private:
-  KAboutData *m_aboutData;
+  TDEAboutData *m_aboutData;
   int m_pid;
   int m_signalnum;
   bool m_showdebugger;
diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp
index 8e40ea8bb..e65c63632 100644
--- a/drkonqi/main.cpp
+++ b/drkonqi/main.cpp
@@ -68,11 +68,11 @@ int main( int argc, char* argv[] )
   setenv("TDE_DEBUG", "true", 1);
   unsetenv("SESSION_MANAGER");
 
-  KAboutData aboutData( "drkonqi",
+  TDEAboutData aboutData( "drkonqi",
                         I18N_NOOP("The TDE Crash Handler"),
                         version,
                         description,
-                        KAboutData::License_BSD,
+                        TDEAboutData::License_BSD,
                         "(C) 2012, The Trinity Desktop Project");
   aboutData.addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");
   aboutData.addAuthor("Hans Petter Bieker", 0, "bieker@kde.org");
diff --git a/drkonqi/toplevel.h b/drkonqi/toplevel.h
index e6854bab5..e6d1b84cb 100644
--- a/drkonqi/toplevel.h
+++ b/drkonqi/toplevel.h
@@ -30,7 +30,7 @@
 #ifndef TOPLEVEL_H
 #define TOPLEVEL_H
 
-class KAboutData;
+class TDEAboutData;
 class KrashConfig;
 class DrKBugReport;
 
-- 
cgit v1.2.3