Rename KAbout to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 73bac86911
commit 407231a4d7

@ -1280,7 +1280,7 @@ void MainWindow::slotOpenAboutApp()
{ {
if (!about_app) 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())); connect(about_app, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished()));
} }
@ -1296,7 +1296,7 @@ void MainWindow::slotOpenAboutKDE()
{ {
if (!about_kde) 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())); connect(about_kde, TQT_SIGNAL(hidden()), TQT_TQOBJECT(this), TQT_SLOT(slotDialogFinished()));
} }

@ -45,8 +45,8 @@
#define CONFIG_FILE "yakuakerc" #define CONFIG_FILE "yakuakerc"
class KAboutApplication; class TDEAboutApplication;
class KAboutKDE; class TDEAboutKDE;
class MainWindow : public TDEMainWindow, virtual public DCOPInterface class MainWindow : public TDEMainWindow, virtual public DCOPInterface
{ {
@ -217,8 +217,8 @@ class MainWindow : public TDEMainWindow, virtual public DCOPInterface
KDialogBase* first_run_dialog; KDialogBase* first_run_dialog;
KAboutApplication* about_app; TDEAboutApplication* about_app;
KAboutKDE* about_kde; TDEAboutKDE* about_kde;
private slots: private slots:

Loading…
Cancel
Save