Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 8d6262f12e
commit 6b23c84fe5

@ -23,7 +23,7 @@
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
@ -32,7 +32,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kiconeffect.h> #include <kiconeffect.h>
#include <knotifyclient.h> #include <knotifyclient.h>
#include <kshortcut.h> #include <tdeshortcut.h>
#include <kkeynative.h> #include <kkeynative.h>
#include <kdemacros.h> #include <kdemacros.h>
#include <kprocess.h> #include <kprocess.h>

@ -52,7 +52,7 @@
#include <tdeio/job.h> #include <tdeio/job.h>
#include <tdeio/netaccess.h> #include <tdeio/netaccess.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <twin.h> #include <twin.h>

@ -34,10 +34,10 @@
// include files for KDE // include files for KDE
#include <kapplication.h> #include <kapplication.h>
#include <kmainwindow.h> #include <tdemainwindow.h>
#include <kdockwidget.h> #include <kdockwidget.h>
#include <kaction.h> #include <tdeaction.h>
#include <kaccel.h> #include <tdeaccel.h>
#include <knuminput.h> #include <knuminput.h>
/** /**

@ -47,7 +47,7 @@
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kstdguiitem.h> #include <kstdguiitem.h>
#include <knuminput.h> #include <knuminput.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>
//#include <arts/soundserver.h> //#include <arts/soundserver.h>

@ -19,7 +19,7 @@
#include "configwizard.h" #include "configwizard.h"
#include <tqlayout.h> #include <tqlayout.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <klistview.h> #include <tdelistview.h>
#include <klocale.h> #include <klocale.h>
#include <kapplication.h> #include <kapplication.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -27,7 +27,7 @@
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kprinter.h> #include <kprinter.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
// application specific includes // application specific includes

@ -28,9 +28,9 @@
// include files for KDE // include files for KDE
#include <kapplication.h> #include <kapplication.h>
#include <kmainwindow.h> #include <tdemainwindow.h>
#include <kaccel.h> #include <tdeaccel.h>
#include <kaction.h> #include <tdeaction.h>
#include <kurl.h> #include <kurl.h>
// forward declaration of the KMouth classes // forward declaration of the KMouth classes

@ -23,9 +23,9 @@
#include <tqptrstack.h> #include <tqptrstack.h>
#include <klocale.h> #include <klocale.h>
#include <kaction.h> #include <tdeaction.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <ktoolbar.h> #include <tdetoolbar.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <tdeio/netaccess.h> #include <tdeio/netaccess.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>

@ -22,7 +22,7 @@
#include <tqdragobject.h> #include <tqdragobject.h>
#include <tqxml.h> #include <tqxml.h>
#include <kaction.h> #include <tdeaction.h>
#include <kprinter.h> #include <kprinter.h>
class KURL; class KURL;

@ -30,11 +30,11 @@
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
// include files for KDE // include files for KDE
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <klocale.h> #include <klocale.h>
#include <kaction.h> #include <tdeaction.h>
#include <kapplication.h> #include <kapplication.h>
#include <klistview.h> #include <tdelistview.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kguiitem.h> #include <kguiitem.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -23,7 +23,7 @@
#include <tqbuttongroup.h> #include <tqbuttongroup.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <kmainwindow.h> #include <tdemainwindow.h>
#include <klineedit.h> #include <klineedit.h>
#include <kkeybutton.h> #include <kkeybutton.h>
#include <kurl.h> #include <kurl.h>

@ -17,10 +17,10 @@
#include <klocale.h> #include <klocale.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kaction.h> #include <tdeaction.h>
#include <kstdaccel.h> #include <tdestdaccel.h>
#include <kshortcutlist.h> #include <tdeshortcutlist.h>
#include <kactionshortcutlist.h> #include <tdeactionshortcutlist.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -19,8 +19,8 @@
#define PHRASETREE_H #define PHRASETREE_H
#include <tqpixmap.h> #include <tqpixmap.h>
#include <kshortcut.h> #include <tdeshortcut.h>
#include <klistview.h> #include <tdelistview.h>
class PhraseBook; class PhraseBook;
class PhraseShortcutRequest; class PhraseShortcutRequest;

@ -24,7 +24,7 @@
#include <tqclipboard.h> #include <tqclipboard.h>
// include files for KDE // include files for KDE
#include <klistbox.h> #include <tdelistbox.h>
#include <klineedit.h> #include <klineedit.h>
#include <kaudioplayer.h> #include <kaudioplayer.h>
#include <kcursor.h> #include <kcursor.h>

@ -19,7 +19,7 @@
#define PHRASELIST_H #define PHRASELIST_H
// include files for KDE // include files for KDE
#include <klistbox.h> #include <tdelistbox.h>
#include <klineedit.h> #include <klineedit.h>
#include <kprinter.h> #include <kprinter.h>

@ -24,7 +24,7 @@
#include <tqtextcodec.h> #include <tqtextcodec.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <klistview.h> #include <tdelistview.h>
#include <klineedit.h> #include <klineedit.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <klocale.h> #include <klocale.h>

@ -287,7 +287,7 @@
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
<includehint>kinputdialog.h</includehint> <includehint>kinputdialog.h</includehint>
</includehints> </includehints>
</UI> </UI>

@ -20,7 +20,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqlineedit.h> #include <tqlineedit.h>
#include <klistview.h> #include <tdelistview.h>
#include <klineedit.h> #include <klineedit.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <klocale.h> #include <klocale.h>

@ -156,6 +156,6 @@
</Q_SLOTS> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
</includehints> </includehints>
</UI> </UI>

@ -25,7 +25,7 @@
#include <tqmap.h> #include <tqmap.h>
// KDE includes // KDE includes
#include <klistview.h> #include <tdelistview.h>
typedef TQValueList<int> ParameterList_type; typedef TQValueList<int> ParameterList_type;
typedef TQMap<TQString, ParameterList_type> EffectConfig_type; typedef TQMap<TQString, ParameterList_type> EffectConfig_type;

@ -18,8 +18,8 @@
#include <tqxml.h> #include <tqxml.h>
// KDE includes // KDE includes
#include <kaction.h> #include <tdeaction.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
//forward declarations //forward declarations
class ContextMenuHandler; class ContextMenuHandler;

@ -19,7 +19,7 @@
#include <tqvaluelist.h> #include <tqvaluelist.h>
// KDE includes // KDE includes
#include <klistview.h> #include <tdelistview.h>
// App specific includes // App specific includes
#include "Types.h" #include "Types.h"

@ -17,8 +17,8 @@
// KDE includes // KDE includes
#include <kurl.h> #include <kurl.h>
#include <klistview.h> #include <tdelistview.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
// App specific includes // App specific includes
#include "Types.h" #include "Types.h"

@ -31,7 +31,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <kmenubar.h> #include <kmenubar.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kstdaction.h> #include <kstdaction.h>

@ -30,10 +30,10 @@ using namespace std;
// include files for KDE // include files for KDE
#include <kapplication.h> #include <kapplication.h>
#include <kmainwindow.h> #include <tdemainwindow.h>
#include <kaccel.h> #include <tdeaccel.h>
#include <kaction.h> #include <tdeaction.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <kurl.h> #include <kurl.h>
#include <dcopobject.h> #include <dcopobject.h>
#include <kbookmarkmanager.h> #include <kbookmarkmanager.h>

@ -25,8 +25,8 @@
// KDE includes // KDE includes
#include <kapplication.h> #include <kapplication.h>
#include <ksystemtray.h> #include <ksystemtray.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kaction.h> #include <tdeaction.h>
#include <kmenubar.h> #include <kmenubar.h>
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kiconloader.h> #include <kiconloader.h>

@ -26,7 +26,7 @@
#include <tdetexteditor/editinterface.h> #include <tdetexteditor/editinterface.h>
#include <tdetexteditor/selectioninterface.h> #include <tdetexteditor/selectioninterface.h>
#include <kaction.h> #include <tdeaction.h>
#include <klocale.h> #include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kapplication.h> #include <kapplication.h>

@ -34,7 +34,7 @@
// KDE includes. // KDE includes.
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <klistview.h> #include <tdelistview.h>
#include <klineedit.h> #include <klineedit.h>
#include <kdialog.h> #include <kdialog.h>
#include <kdialogbase.h> #include <kdialogbase.h>

@ -35,7 +35,7 @@
// KDE includes. // KDE includes.
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <klistview.h> #include <tdelistview.h>
#include <klineedit.h> #include <klineedit.h>
#include <kdialog.h> #include <kdialog.h>
#include <kdialogbase.h> #include <kdialogbase.h>

@ -466,7 +466,7 @@
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -37,7 +37,7 @@
// KDE includes. // KDE includes.
#include <dcopclient.h> #include <dcopclient.h>
#include <klistview.h> #include <tdelistview.h>
#include <tdeparts/componentfactory.h> #include <tdeparts/componentfactory.h>
#include <klineedit.h> #include <klineedit.h>
#include <kurlrequester.h> #include <kurlrequester.h>

@ -1897,18 +1897,18 @@
<layoutdefaults spacing="6" margin="6"/> <layoutdefaults spacing="6" margin="6"/>
<includehints> <includehints>
<includehint>tdecmodule.h</includehint> <includehint>tdecmodule.h</includehint>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

@ -29,7 +29,7 @@
#include <tdeconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <klistview.h> #include <tdelistview.h>
#include <kiconloader.h> #include <kiconloader.h>
// KTTS includes // KTTS includes

@ -57,6 +57,6 @@
</customwidgets> </customwidgets>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
</includehints> </includehints>
</UI> </UI>

@ -31,7 +31,7 @@
#include <kinstance.h> #include <kinstance.h>
#include <klocale.h> #include <klocale.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klistview.h> #include <tdelistview.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdebug.h> #include <kdebug.h>
#include <kencodingfiledialog.h> #include <kencodingfiledialog.h>

@ -34,7 +34,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <ksystemtray.h> #include <ksystemtray.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <tdeversion.h> #include <tdeversion.h>

@ -34,7 +34,7 @@
#include <kcombobox.h> #include <kcombobox.h>
#include <ktrader.h> #include <ktrader.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <klistview.h> #include <tdelistview.h>
#include <klineedit.h> #include <klineedit.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kdebug.h> #include <kdebug.h>

@ -567,6 +567,6 @@
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
</includehints> </includehints>
</UI> </UI>

Loading…
Cancel
Save