Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 257013fc4a
commit b76bd9c218

@ -3,7 +3,7 @@
#include "k9config.h" #include "k9config.h"
#include <tqlayout.h> #include <tqlayout.h>
#include <tqslider.h> #include <tqslider.h>
#include <kselect.h> #include <tdeselect.h>
#include "k9mplayer.h" #include "k9mplayer.h"
#include <tqcombobox.h> #include <tqcombobox.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -16,12 +16,12 @@
#include <tqlistview.h> #include <tqlistview.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <tqcombobox.h> #include <tqcombobox.h>
#include <kselect.h> #include <tdeselect.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include "kcombobox.h" #include "kcombobox.h"
#include "kselect.h" #include "tdeselect.h"
/* /*
* Constructs a import as a child of 'parent', with the * Constructs a import as a child of 'parent', with the

@ -202,6 +202,6 @@
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>kselect.h</includehint> <includehint>tdeselect.h</includehint>
</includehints> </includehints>
</UI> </UI>

@ -24,7 +24,7 @@
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kselect.h> #include <tdeselect.h>
#include "k9processlist.h" #include "k9processlist.h"
k9Import::k9Import(TQWidget* parent, const char* name,k9CdDrives *_drives) k9Import::k9Import(TQWidget* parent, const char* name,k9CdDrives *_drives)

@ -18,7 +18,7 @@
#include "k9newdvd.h" #include "k9newdvd.h"
#include <tqwmatrix.h> #include <tqwmatrix.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <kfontdialog.h> #include <tdefontdialog.h>
#include "k9menubutton.h" #include "k9menubutton.h"
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>

@ -17,8 +17,8 @@
#include "k9config.h" #include "k9config.h"
#include <tdeversion.h> #include <tdeversion.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaccel.h> #include <tdestdaccel.h>
#include <kaction.h> #include <tdeaction.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kdockwidget.h> #include <kdockwidget.h>
#include <tdemdidefines.h> #include <tdemdidefines.h>

@ -33,7 +33,7 @@
#include "k9updatefactor.h" #include "k9updatefactor.h"
#include "k9haldevice.h" #include "k9haldevice.h"
#include "k9titleencopt.h" #include "k9titleencopt.h"
#include <kselect.h> #include <tdeselect.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <tqtextbrowser.h> #include <tqtextbrowser.h>
#include <tqapplication.h> #include <tqapplication.h>

@ -21,7 +21,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <kmainwindow.h> #include <tdemainwindow.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <tqevent.h> #include <tqevent.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>

@ -12,7 +12,7 @@
#include <tqvariant.h> #include <tqvariant.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kselect.h> #include <tdeselect.h>
#include <tqheader.h> #include <tqheader.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <kcombobox.h> #include <kcombobox.h>
@ -21,7 +21,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include "kselect.h" #include "tdeselect.h"
#include "kcombobox.h" #include "kcombobox.h"
#include "klineedit.h" #include "klineedit.h"
#include "kpushbutton.h" #include "kpushbutton.h"

@ -418,7 +418,7 @@
</Q_SLOTS> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>kselect.h</includehint> <includehint>tdeselect.h</includehint>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -417,7 +417,7 @@
<includehints> <includehints>
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kselect.h</includehint> <includehint>tdeselect.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
</includehints> </includehints>

@ -15,7 +15,7 @@
#include <tqcombobox.h> #include <tqcombobox.h>
#include <knuminput.h> #include <knuminput.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <kfontdialog.h> #include <tdefontdialog.h>
k9prefAuthor::k9prefAuthor(TQWidget* parent, const char* name, WFlags fl) k9prefAuthor::k9prefAuthor(TQWidget* parent, const char* name, WFlags fl)
: prefAuthor(parent,name,fl) : prefAuthor(parent,name,fl)

Loading…
Cancel
Save