diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:42 -0600 |
commit | 63bcbec9a09626ba09945de06b3eb74f50f3b228 (patch) | |
tree | 205df87b7ca9a12d3295653c8e4a0dd7283ea03a /kbabel/kbabeldict/kbabeldictbox.cpp | |
parent | cfe9ce987a45dd734b924ee4596946227a50609e (diff) | |
download | tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.tar.gz tdesdk-63bcbec9a09626ba09945de06b3eb74f50f3b228.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/kbabeldict/kbabeldictbox.cpp')
-rw-r--r-- | kbabel/kbabeldict/kbabeldictbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index 239801d3..fa483d85 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -372,7 +372,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) rcConfig.setGroup("SearchEngine"); TQStringList appList = rcConfig.readListEntry("Applications"); - KInstance *inst = KGlobal::instance(); + TDEInstance *inst = KGlobal::instance(); if(inst && !appList.isEmpty() && !appList.contains(inst->instanceName())) { continue; @@ -1230,7 +1230,7 @@ void KBabelDictBox::about() { KAboutContainer *page = aboutDlg->addScrolledContainerPage(e->name()); - const KAboutData *aboutData = e->about(); + const TDEAboutData *aboutData = e->about(); if(aboutData) { |