summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-07 11:00:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-07 11:00:21 -0600
commit407231a4d7ddf6b8e83644c6b57a87c86d853647 (patch)
treeadeb2e7e2a7b6d9f19ed1efe0de3b6f68fd007cd
parent73bac86911d0ab94b7630211f6fd321e27115c21 (diff)
downloadyakuake-407231a4d7ddf6b8e83644c6b57a87c86d853647.tar.gz
yakuake-407231a4d7ddf6b8e83644c6b57a87c86d853647.zip
Rename KAbout to avoid conflicts with KDE4
-rw-r--r--yakuake/src/main_window.cpp4
-rw-r--r--yakuake/src/main_window.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp
index 288f560..87ff760 100644
--- a/yakuake/src/main_window.cpp
+++ b/yakuake/src/main_window.cpp
@@ -1280,7 +1280,7 @@ void MainWindow::slotOpenAboutApp()
{
if (!about_app)
{
- about_app = new KAboutApplication(this, "About Yakuake");
+ about_app = new TDEAboutApplication(this, "About Yakuake");
connect(about_app, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished()));
}
@@ -1296,7 +1296,7 @@ void MainWindow::slotOpenAboutKDE()
{
if (!about_kde)
{
- about_kde = new KAboutKDE(this, "About KDE");
+ about_kde = new TDEAboutKDE(this, "About KDE");
connect(about_kde, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished()));
}
diff --git a/yakuake/src/main_window.h b/yakuake/src/main_window.h
index 3e88ef3..dcfa3a9 100644
--- a/yakuake/src/main_window.h
+++ b/yakuake/src/main_window.h
@@ -45,8 +45,8 @@
#define CONFIG_FILE "yakuakerc"
-class KAboutApplication;
-class KAboutKDE;
+class TDEAboutApplication;
+class TDEAboutKDE;
class MainWindow : public TDEMainWindow, virtual public DCOPInterface
{
@@ -217,8 +217,8 @@ class MainWindow : public TDEMainWindow, virtual public DCOPInterface
KDialogBase* first_run_dialog;
- KAboutApplication* about_app;
- KAboutKDE* about_kde;
+ TDEAboutApplication* about_app;
+ TDEAboutKDE* about_kde;
private slots: