Rename many classes and header files to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent 5920e96087
commit 577ac5a237

@ -88,7 +88,7 @@ Q_OBJECT, make sure you include the .moc file, not the .h.
// KDE
#include <kiconview.h>
#include <klistview.h>
#include <tdelistview.h>
// Local
#include "aclass.h"

@ -31,17 +31,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqvbox.h>
// KDE
#include <kaction.h>
#include <kactioncollection.h>
#include <tdeaction.h>
#include <tdeactioncollection.h>
#include <kbookmarkmanager.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <kiconloader.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kmimetype.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kurl.h>
#include <kurldrag.h>

@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqobject.h>
// KDE
#include <klistview.h>
#include <tdelistview.h>
#include <kurl.h>
class TQDragMoveEvent;

@ -21,11 +21,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
// KDE
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tdeversion.h>
#include <kstdaccel.h>
#include <tdestdaccel.h>
#include <kstdguiitem.h>
// Local

@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// KDE
#include <kaboutdata.h>
#include <kaccel.h>
#include <kaction.h>
#include <tdeaccel.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kbookmarkmanager.h>
#include <kbookmarkmenu.h>
@ -47,18 +47,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tdeio/netaccess.h>
#include <kkeydialog.h>
#include <klargefile.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kpropsdlg.h>
#include <kprotocolinfo.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <kstdaccel.h>
#include <tdestdaccel.h>
#include <kstdaction.h>
#include <ktoolbarlabelaction.h>
#include <tdetoolbarlabelaction.h>
#include <kurlcompletion.h>
#include <kurlpixmapprovider.h>
#include <kprinter.h>

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqptrlist.h>
// KDE
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <kurl.h>
// Local

@ -106,6 +106,6 @@
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
</includehints>
</UI>

@ -22,7 +22,7 @@ Copyright 2000-2004 Aur
#define EXTERNALTOOLACTION_H
// KDE
#include <kaction.h>
#include <tdeaction.h>
#include <kurl.h>
class KService;

@ -21,11 +21,11 @@ Copyright 2000-2004 Aur
#include "externaltoolcontext.moc"
// KDE
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <krun.h>
#include <kservice.h>

@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kiconloader.h>
#include <kimageio.h>
#include <klineedit.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <krun.h>

@ -360,7 +360,7 @@ You can use keywords in the Command field:
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kurllabel.h</includehint>
<includehint>kicondialog.h</includehint>
<includehint>kurllabel.h</includehint>
@ -368,6 +368,6 @@ You can use keywords in the Command field:
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

@ -32,7 +32,7 @@ class TQKeyEvent;
#include <tqdir.h>
// KDE includes
#include <klistview.h>
#include <tdelistview.h>
#include <kmimetyperesolver.h>
// Our includes

@ -25,7 +25,7 @@
#define FILEDETAILVIEWITEM_H
// KDE includes
#include <klistview.h>
#include <tdelistview.h>
#include <tdefileitem.h>
namespace Gwenview {

@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqwidgetstack.h>
// KDE
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kcombobox.h>
#include <kdebug.h>
@ -39,13 +39,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kiconeffect.h>
#include <kiconloader.h>
#include <kimageio.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kpropertiesdialog.h>
#include <kprotocolinfo.h>
#include <kstdaction.h>
#include <ktoolbar.h>
#include <ktoolbarlabelaction.h>
#include <tdetoolbar.h>
#include <tdetoolbarlabelaction.h>
#include <kurldrag.h>
#include <tdeio/job.h>
#include <tdeio/file.h>

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define FULLSCREENBAR_H
// KDE
#include <ktoolbar.h>
#include <tdetoolbar.h>
class TQResizeEvent;
class TQShowEvent;

@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqvaluevector.h>
// KDE
#include <kaction.h>
#include <tdeaction.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeversion.h>

@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqwidgetstack.h>
// KDE
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <tdemediaplayer/player.h>
#include <kmimetype.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kuserprofile.h>
#include <tdeparts/componentfactory.h>
#include <kxmlguibuilder.h>

@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqobject.h>
// KDE
#include <kaction.h>
#include <tdeaction.h>
// Local
#include "libgwenview_export.h"

@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "imageviewtools.h"
// KDE
#include <kaction.h>
#include <tdeaction.h>
#include <kdebug.h>
#include <klocale.h>
#include <kstandarddirs.h>

@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kdebug.h>
#include <tdeversion.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kicontheme.h>
#include <kiconloader.h>
#include <klocale.h>

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tqfile.h>
#include <tqpoint.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>

Loading…
Cancel
Save