Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 9aa2a73641
commit abef44c4d6

@ -15,7 +15,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name ) FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name )

@ -21,7 +21,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kstdaccel.h> #include <tdestdaccel.h>
#include <tqaccel.h> #include <tqaccel.h>
#include <tqapplication.h> #include <tqapplication.h>

@ -11,7 +11,7 @@
#ifndef ITEMSELECTOR_H #ifndef ITEMSELECTOR_H
#define ITEMSELECTOR_H #define ITEMSELECTOR_H
#include <klistview.h> #include <tdelistview.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqstring.h> #include <tqstring.h>

@ -172,7 +172,7 @@
<includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>klistview.h</includehint> <includehint>tdelistview.h</includehint>
<includehint>keditlistbox.h</includehint> <includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
</includehints> </includehints>

@ -18,7 +18,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqcursor.h> #include <tqcursor.h>
#include <tqevent.h> #include <tqevent.h>

@ -11,7 +11,7 @@
#include "plvitem.h" #include "plvitem.h"
#include "variant.h" #include "variant.h"
#include <klistview.h> #include <tdelistview.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqvariant.h> #include <tqvariant.h>

@ -11,7 +11,7 @@
#ifndef PLVITEM_H #ifndef PLVITEM_H
#define PLVITEM_H #define PLVITEM_H
#include <klistview.h> #include <tdelistview.h>
#include <tqstring.h> #include <tqstring.h>
#include <tqguardedptr.h> #include <tqguardedptr.h>
#include <tqobject.h> #include <tqobject.h>

@ -11,7 +11,7 @@
#ifndef PROPERTIESLISTVIEW_H #ifndef PROPERTIESLISTVIEW_H
#define PROPERTIESLISTVIEW_H #define PROPERTIESLISTVIEW_H
#include <klistview.h> #include <tdelistview.h>
#include <tqmap.h> #include <tqmap.h>
class CNItemGroup; class CNItemGroup;

@ -14,7 +14,7 @@
#ifndef SYMBOLVIEWER_H #ifndef SYMBOLVIEWER_H
#define SYMBOLVIEWER_H #define SYMBOLVIEWER_H
#include <klistview.h> #include <tdelistview.h>
#include <tqguardedptr.h> #include <tqguardedptr.h>
class KComboBox; class KComboBox;

@ -17,7 +17,7 @@
#include <kglobal.h> #include <kglobal.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name ) ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name )
: ItemView( icnDocument, viewContainer, viewAreaId, name ) : ItemView( icnDocument, viewContainer, viewAreaId, name )

@ -30,7 +30,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kprinter.h> #include <kprinter.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqclipboard.h> #include <tqclipboard.h>

@ -25,7 +25,7 @@
#include <klineedit.h> #include <klineedit.h>
#include <knuminput.h> #include <knuminput.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <ktoolbar.h> #include <tdetoolbar.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>

@ -19,10 +19,10 @@
#include "ktechlab.h" #include "ktechlab.h"
#include "core/ktlconfig.h" #include "core/ktlconfig.h"
#include <kaccel.h> #include <tdeaccel.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <cmath> #include <cmath>

@ -2,7 +2,7 @@
Copyright (C) 2005 Christoph Cullmann <cullmann@kde.org> Copyright (C) 2005 Christoph Cullmann <cullmann@kde.org>
Copyright (C) 2002, 2003 Joseph Wenninger <jowenn@kde.org> Copyright (C) 2002, 2003 Joseph Wenninger <jowenn@kde.org>
GUIClient partly based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> GUIClient partly based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -28,7 +28,7 @@
#include <klocale.h> #include <klocale.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
namespace KateMDI { namespace KateMDI {
@ -108,7 +108,7 @@ GUIClient::GUIClient ( MainWindow *mw )
connect( m_mw->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), connect( m_mw->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ),
this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) );
if (actionCollection()->kaccel()==0) if (actionCollection()->tdeaccel()==0)
actionCollection()->setWidget(m_mw); actionCollection()->setWidget(m_mw);

@ -39,7 +39,7 @@
#include <tqtoolbutton.h> #include <tqtoolbutton.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kaccel.h> #include <tdeaccel.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
@ -49,7 +49,7 @@
#include <kkeydialog.h> #include <kkeydialog.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ktabwidget.h> #include <ktabwidget.h>
#include <kurldrag.h> #include <kurldrag.h>

@ -11,7 +11,7 @@
#include "recentfilesaction.h" #include "recentfilesaction.h"
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurl.h> #include <kurl.h>

@ -11,10 +11,10 @@
#ifndef RECENTFILESACTION_H #ifndef RECENTFILESACTION_H
#define RECENTFILESACTION_H #define RECENTFILESACTION_H
#include <kactionclasses.h> #include <tdeactionclasses.h>
/** /**
Taken mainly from tdelibs/tdeui/kactionclasses.[cpp/h], author Michael Koch. Taken mainly from tdelibs/tdeui/tdeactionclasses.[cpp/h], author Michael Koch.
Adapted to work around strange bug occuring. Adapted to work around strange bug occuring.
*/ */
class RecentFilesAction : public TDESelectAction class RecentFilesAction : public TDESelectAction

@ -30,7 +30,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <tqapplication.h> #include <tqapplication.h>

Loading…
Cancel
Save