summaryrefslogtreecommitdiffstats
path: root/drkonqi/krashconf.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /drkonqi/krashconf.h
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'drkonqi/krashconf.h')
-rw-r--r--drkonqi/krashconf.h4
1 files changed, 2 insertions, 2 deletions
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;