Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 47bca8a908
commit 15ef96dbfb

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

@ -25,7 +25,7 @@
#include "widgetblockstack.h"
#include "encodingselector_impl.h"
#include <klistview.h>
#include <tdelistview.h>
#include <kglobalsettings.h>
#include <kglobal.h>
#include <klocale.h>
@ -35,7 +35,7 @@
#include <kdialogbase.h>
#include <kapp.h>
#include <ktextbrowser.h>
#include <klistviewsearchline.h>
#include <tdelistviewsearchline.h>
#include <tqpixmap.h>
#include <tqpainter.h>

@ -21,7 +21,7 @@
#define FILELISTVIEWITEM_H
#include "svnitem.h"
#include <klistview.h>
#include <tdelistview.h>
#include <tqdatetime.h>
#include <tqptrlist.h>
#include "svnqttypes.hpp"

@ -1,7 +1,7 @@
#ifndef _PROPERTYITEM_H
#define _PROPERTYITEM_H
#include <klistview.h>
#include <tdelistview.h>
class PropertiesDlg;
class Propertylist;

@ -20,7 +20,7 @@
#ifndef PROPERTYLIST_H
#define PROPERTYLIST_H
#include <klistview.h>
#include <tdelistview.h>
#include "svnqttypes.hpp"
/**

@ -34,7 +34,7 @@
#include <kprogress.h>
#include <klocale.h>
#include <kapp.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kmdcodec.h>
#include <kmessagebox.h>

@ -21,7 +21,7 @@
#define OPENCONTEXTMENU_H
#include <ktrader.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kurl.h>
#include <tqpopupmenu.h>
#include <tqmap.h>

@ -68,7 +68,7 @@
#include <tdeio/job.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tdeio/netaccess.h>
#include <kstandarddirs.h>
#include <ktrader.h>

@ -470,9 +470,9 @@
<includehint>kpushbutton.h</includehint>
<includehint>revisionbuttonimpl.h</includehint>
<includehint>revisionbuttonimpl.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>ktextbrowser.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

@ -24,7 +24,7 @@
#include "svnactions.h"
#include "revisionbuttonimpl.h"
#include <klistview.h>
#include <tdelistview.h>
#include <ktextbrowser.h>
#include <kpushbutton.h>
#include <kglobal.h>

@ -45,8 +45,8 @@
#include <kiconloader.h>
#include <kdirwatch.h>
#include <klocale.h>
#include <kactioncollection.h>
#include <kshortcut.h>
#include <tdeactioncollection.h>
#include <tdeshortcut.h>
#include <kmessagebox.h>
#include <kdirselectdialog.h>
#include <klineedit.h>

@ -25,7 +25,7 @@
#include "status.hpp"
#include "client.hpp"
#include <klistview.h>
#include <tdelistview.h>
#include <kurl.h>
#include <ktrader.h>
#include <tqmap.h>

@ -34,7 +34,7 @@
#include <kiconloader.h>
#include <tdeversion.h>
#include <kstatusbar.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <tdeio/netaccess.h>
#include <tdefiledialog.h>
#include <tdeconfig.h>
@ -43,11 +43,11 @@
#include <kurlrequesterdlg.h>
#include <khelpmenu.h>
#include <kmenubar.h>
#include <kpopupmenu.h>
#include <kactionclasses.h>
#include <tdepopupmenu.h>
#include <tdeactionclasses.h>
#include <kmessagebox.h>
#include <kstdaccel.h>
#include <kaction.h>
#include <tdestdaccel.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kstandarddirs.h>
#include <kbookmarkmanager.h>
@ -91,11 +91,11 @@ tdesvn::tdesvn()
m_BookmarksActionmenu->setDelayed(false);
m_BookmarksActionmenu->setEnabled(true);
m_Bookmarkactions = new TDEActionCollection( this );
m_Bookmarkactions->setHighlightingEnabled( true );
connectActionCollection( m_Bookmarkactions );
m_Bookmartdeactions = new TDEActionCollection( this );
m_Bookmartdeactions->setHighlightingEnabled( true );
connectActionCollection( m_Bookmartdeactions );
m_pBookmarkMenu = new KBookmarkMenu(m_BookmarkManager,this,m_BookmarksActionmenu->popupMenu(),m_Bookmarkactions,true);
m_pBookmarkMenu = new KBookmarkMenu(m_BookmarkManager,this,m_BookmarksActionmenu->popupMenu(),m_Bookmartdeactions,true);
// m_BookmarksActionmenu->plug(menuBar());
// this routine will find and load our Part. it finds the Part by
// name which is a bad idea usually.. but it's alright in this

@ -102,7 +102,7 @@ private:
TQString m_bookmarkFile;
KBookmarkManager * m_BookmarkManager;
TDEActionMenu* m_BookmarksActionmenu;
TDEActionCollection*m_Bookmarkactions;
TDEActionCollection*m_Bookmartdeactions;
KBookmarkMenu * m_pBookmarkMenu;
KParts::ReadOnlyPart *m_part;
TDEToggleAction *m_statusbarAction;

@ -34,7 +34,7 @@
#include "helpers/sshagent.h"
#include <kinstance.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <tdefiledialog.h>
#include <kdebug.h>

@ -52,8 +52,8 @@
#include <klocale.h>
#include <ktextbrowser.h>
#include <kdebug.h>
#include <kactioncollection.h>
#include <kshortcut.h>
#include <tdeactioncollection.h>
#include <tdeshortcut.h>
#include <kdialog.h>
#include <kdialogbase.h>
#include <kprogress.h>

Loading…
Cancel
Save