summaryrefslogtreecommitdiffstats
path: root/kcontrol/kicker/main.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:15:55 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /kcontrol/kicker/main.h
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kicker/main.h')
-rw-r--r--kcontrol/kicker/main.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h
index 97de653b5..bbc567273 100644
--- a/kcontrol/kicker/main.h
+++ b/kcontrol/kicker/main.h
@@ -24,7 +24,7 @@
#include "extensionInfo.h"
class TQComboBox;
-class KAboutData;
+class TDEAboutData;
class KDirWatch;
class KickerConfig : public TQObject, public DCOPObject
@@ -46,7 +46,7 @@ public:
void restartKicker();
TQString quickHelp() const;
- KAboutData *aboutData();
+ TDEAboutData *aboutData();
int currentPanelIndex() const { return m_currentPanelIndex; }