summaryrefslogtreecommitdiffstats
path: root/kcontrol/kcontrol/modules.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 /kcontrol/kcontrol/modules.h
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kcontrol/modules.h')
-rw-r--r--kcontrol/kcontrol/modules.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index bcdc7d7e4..fc5406fa6 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -27,7 +27,7 @@
template<class ConfigModule> class TQPtrList;
class TQStringList;
-class KAboutData;
+class TDEAboutData;
class KCModule;
class ProxyWidget;
class KProcess;
@@ -50,7 +50,7 @@ public:
bool isActive() { return _module != 0; };
ProxyWidget *module();
- const KAboutData *aboutData() const;
+ const TDEAboutData *aboutData() const;
public slots: