summaryrefslogtreecommitdiffstats
path: root/kcontrol/kcontrol/proxywidget.cpp
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/proxywidget.cpp
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kcontrol/proxywidget.cpp')
-rw-r--r--kcontrol/kcontrol/proxywidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index a385d859e..7e3f30de4 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -320,7 +320,7 @@ void ProxyWidget::clientChanged(bool state)
emit changed(state);
}
-const KAboutData *ProxyWidget::aboutData() const
+const TDEAboutData *ProxyWidget::aboutData() const
{
return _client->aboutData();
}