Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent d9056e4cfc
commit 6630d485e9

@ -30,7 +30,7 @@
#include <kdebug.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqtimer.h>
#include <tqcursor.h>
#include <tqvaluelist.h>

@ -71,11 +71,11 @@ KMoonDlg::KMoonDlg(int a, bool n, bool m, TQWidget *parent, const char *name)
connect(hemitoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleHemi()));
masktoggle = new TQPushButton(hbox2);
masktoggle->setText(mask ? i18n("Switch Masking Off") :
mastdetoggle = new TQPushButton(hbox2);
mastdetoggle->setText(mask ? i18n("Switch Masking Off") :
i18n("Switch Masking On"));
connect(masktoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask()));
connect(mastdetoggle, TQT_SIGNAL(clicked()), TQT_SLOT(toggleMask()));
topLayout->addWidget(vbox);
moon = new MoonWidget(page, "preview");
@ -107,7 +107,7 @@ void KMoonDlg::toggleHemi() {
void KMoonDlg::toggleMask() {
moon->setMask(!moon->mask());
mask = moon->mask();
masktoggle->setText(mask ? i18n("Switch Masking Off") :
mastdetoggle->setText(mask ? i18n("Switch Masking Off") :
i18n("Switch Masking On"));
}

@ -44,7 +44,7 @@ class KMoonDlg : public KDialogBase {
bool north;
bool mask;
TQPushButton *hemitoggle;
TQPushButton *masktoggle;
TQPushButton *mastdetoggle;
private slots:
void help();

@ -44,9 +44,9 @@
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <twin.h>
#include <X11/Xlib.h>

@ -47,9 +47,9 @@
#include <knotifyclient.h>
#include <knuminput.h>
#include <kseparator.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kdialogbase.h>
#include <kaction.h>
#include <tdeaction.h>
#include <knotifydialog.h>
#include "tealist.h"

@ -23,7 +23,7 @@
#include <klocale.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tdeconfig.h>
#include <ksettings/dialog.h>
#include <ksettings/dispatcher.h>

@ -255,7 +255,7 @@
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

@ -26,7 +26,7 @@
#include <tdeconfig.h>
#include <kdialog.h>
#include <kglobal.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kpushbutton.h>
#include <kstandarddirs.h>

@ -30,7 +30,7 @@
** Bug reports and questions can be sent to kde-devel@kde.org
*/
#include <kuniqueapplication.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
class MapWidget;

Loading…
Cancel
Save