summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-07 10:55:09 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-07 10:55:09 -0600
commit19fe7a9e854df403f0d3b880a728e118d8969ff3 (patch)
tree9d6dd4266e1749cba15aa33feea7cfcfd2a4fe3a
parent7065b83d5db5a97df7cfd9a55681f808512691e8 (diff)
downloadkima-19fe7a9e854df403f0d3b880a728e118d8969ff3.tar.gz
kima-19fe7a9e854df403f0d3b880a728e118d8969ff3.zip
Rename KAbout to avoid conflicts with KDE4
-rw-r--r--src/kima.cpp2
-rw-r--r--src/kima.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kima.cpp b/src/kima.cpp
index fd872df..30859b3 100644
--- a/src/kima.cpp
+++ b/src/kima.cpp
@@ -202,7 +202,7 @@ void Kima::about() {
aboutData->addCredit("Peter Avramucz");
aboutData->addCredit("Oskar Ellström");
aboutData->addCredit("Uğur Çetin");
- mAboutDialog = new KAboutApplication(aboutData, this, "aboutApp", false);
+ mAboutDialog = new TDEAboutApplication(aboutData, this, "aboutApp", false);
}
mAboutDialog->show();
}
diff --git a/src/kima.h b/src/kima.h
index ddb688c..a86acd5 100644
--- a/src/kima.h
+++ b/src/kima.h
@@ -39,7 +39,7 @@
// Forward Declarations
class FlowLayout;
-class KAboutApplication;
+class TDEAboutApplication;
class TDEPopupMenu;
class TDESelectAction;
class TQMouseEvent;
@@ -193,7 +193,7 @@ private:
FlowLayout* mLayout;
mutable int mCachedWFH;
mutable int mCachedHeight;
- KAboutApplication* mAboutDialog;
+ TDEAboutApplication* mAboutDialog;
TDEPopupMenu* mMenu;
KDialogBase* mPrefsDlg;
Prefs* mPrefs;