summaryrefslogtreecommitdiffstats
path: root/kcontrol/kcontrol/toplevel.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/toplevel.h
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kcontrol/toplevel.h')
-rw-r--r--kcontrol/kcontrol/toplevel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h
index 8cc4a7a67..1a7e1735f 100644
--- a/kcontrol/kcontrol/toplevel.h
+++ b/kcontrol/kcontrol/toplevel.h
@@ -100,7 +100,7 @@ private:
* against a module with no about data
* we construct one for him
**/
- KAboutData *dummyAbout;
+ TDEAboutData *dummyAbout;
};
#endif