Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 037f63ff07
commit 7a5d9e94f1

@ -42,9 +42,9 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <ktoolbarbutton.h> #include <tdetoolbarbutton.h>
#include <kaction.h> #include <tdeaction.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <tdeconfigdialog.h> #include <tdeconfigdialog.h>
// plugin specific includes // plugin specific includes

@ -30,11 +30,11 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <tqwidgetstack.h> #include <tqwidgetstack.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <ktoolbar.h> #include <tdetoolbar.h>
#include <tdehtml_part.h> #include <tdehtml_part.h>
// KDE includes // KDE includes
#include <kaction.h> #include <tdeaction.h>
#include <tdeparts/dockmainwindow.h> #include <tdeparts/dockmainwindow.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>
#include <tdeparts/factory.h> #include <tdeparts/factory.h>
@ -88,7 +88,7 @@ private:
protected: protected:
/** /**
* The main plugin widget. Contains a klistview and a ktoolbox objects * The main plugin widget. Contains a tdelistview and a tdetoolbox objects
*/ */
smb4kWidget *widget; smb4kWidget *widget;

@ -31,7 +31,7 @@
#endif #endif
// KDE includes // KDE includes
#include <klistview.h> #include <tdelistview.h>
// forward declarations // forward declarations
class Smb4KNetworkBrowserItem; class Smb4KNetworkBrowserItem;

@ -29,10 +29,10 @@
// KDE includes // KDE includes
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kaction.h> #include <tdeaction.h>
#include <kshortcut.h> #include <tdeshortcut.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdeversion.h> #include <tdeversion.h>

@ -32,7 +32,7 @@
#endif #endif
// KDE includes // KDE includes
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <tdeparts/part.h> #include <tdeparts/part.h>
#include <tdeparts/factory.h> #include <tdeparts/factory.h>

@ -34,7 +34,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
// KDE includes // KDE includes
#include <klistview.h> #include <tdelistview.h>
// application specific includes // application specific includes
#include "../core/smb4knetworkitems.h" #include "../core/smb4knetworkitems.h"

@ -39,7 +39,7 @@
#include <knuminput.h> #include <knuminput.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kuser.h> #include <kuser.h>
#include <klistview.h> #include <tdelistview.h>
#include <kpushbutton.h> #include <kpushbutton.h>
// System includes // System includes

@ -28,7 +28,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
// KDE includes // KDE includes
#include <klistview.h> #include <tdelistview.h>
#include <klineedit.h> #include <klineedit.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -29,14 +29,14 @@
// KDE includes // KDE includes
#include <klocale.h> #include <klocale.h>
#include <kaction.h> #include <tdeaction.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <kaccel.h> #include <tdeaccel.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kapplication.h> #include <kapplication.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
// application specific includes // application specific includes
#include "smb4kbookmarkeditor.h" #include "smb4kbookmarkeditor.h"
@ -216,7 +216,7 @@ void Smb4KBookmarkEditor::slotCancelClicked()
for ( TDEActionPtrList::Iterator it = list.begin(); it != list.end(); ++it ) for ( TDEActionPtrList::Iterator it = list.begin(); it != list.end(); ++it )
{ {
m_collection->kaccel()->remove( (*it)->name() ); m_collection->tdeaccel()->remove( (*it)->name() );
m_collection->remove( *it ); m_collection->remove( *it );
} }
} }

@ -32,8 +32,8 @@
// KDE includes // KDE includes
#include <kdialogbase.h> #include <kdialogbase.h>
#include <klistview.h> #include <tdelistview.h>
#include <kactioncollection.h> #include <tdeactioncollection.h>
/** /**
* This is the bookmark editor of Smb4K. * This is the bookmark editor of Smb4K.

@ -33,7 +33,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kdebug.h> #include <kdebug.h>
#include <ktoolbarbutton.h> #include <tdetoolbarbutton.h>
// application specific includes // application specific includes
#include "smb4kpreviewdialog.h" #include "smb4kpreviewdialog.h"

@ -36,7 +36,7 @@
// KDE includes // KDE includes
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kiconview.h> #include <kiconview.h>
#include <ktoolbar.h> #include <tdetoolbar.h>
#include <kcombobox.h> #include <kcombobox.h>
// application specific includes // application specific includes

@ -30,12 +30,12 @@
#include <klocale.h> #include <klocale.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
#include <kaction.h> #include <tdeaction.h>
#include <kshortcut.h> #include <tdeshortcut.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
// application specific includes // application specific includes
#include "smb4ksharesiconview_part.h" #include "smb4ksharesiconview_part.h"

@ -31,7 +31,7 @@
#endif #endif
// KDE includes // KDE includes
#include <klistview.h> #include <tdelistview.h>
#include <kurldrag.h> #include <kurldrag.h>
// forward declarations // forward declarations

@ -33,12 +33,12 @@
#include <klocale.h> #include <klocale.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <klocale.h> #include <klocale.h>
#include <kaction.h> #include <tdeaction.h>
#include <kshortcut.h> #include <tdeshortcut.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
// application specific includes // application specific includes
#include "smb4kshareslistview_part.h" #include "smb4kshareslistview_part.h"

@ -35,7 +35,7 @@
#include <tqpalette.h> #include <tqpalette.h>
// KDE includes // KDE includes
#include <klistview.h> #include <tdelistview.h>
#include <kiconloader.h> #include <kiconloader.h>
// application specific includes // application specific includes

@ -35,8 +35,8 @@
#include <tqstring.h> #include <tqstring.h>
// KDE includes // KDE includes
#include <klistview.h> #include <tdelistview.h>
#include <ktoolbar.h> #include <tdetoolbar.h>
// forward declarations // forward declarations
class Smb4KHostItem; class Smb4KHostItem;

@ -33,7 +33,7 @@
#endif #endif
// TQt includes // TQt includes
#include <klistview.h> #include <tdelistview.h>
// application specific includes // application specific includes
#include "../core/smb4knetworkitems.h" #include "../core/smb4knetworkitems.h"

@ -34,11 +34,11 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <klocale.h> #include <klocale.h>
#include <kprogress.h> #include <kprogress.h>
#include <tdeconfigdialog.h> #include <tdeconfigdialog.h>
#include <kaccel.h> #include <tdeaccel.h>
// application specific includes // application specific includes
#include "smb4k.h" #include "smb4k.h"

@ -31,7 +31,7 @@
#endif #endif
// KDE includes // KDE includes
#include <kaction.h> #include <tdeaction.h>
#include <tdeparts/dockmainwindow.h> #include <tdeparts/dockmainwindow.h>
// Forward declarations // Forward declarations

@ -33,8 +33,8 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kpopupmenu.h> #include <tdepopupmenu.h>
#include <kaction.h> #include <tdeaction.h>
#include <klibloader.h> #include <klibloader.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <tdeconfigdialog.h> #include <tdeconfigdialog.h>

@ -32,7 +32,7 @@
// KDE includes // KDE includes
#include <ksystemtray.h> #include <ksystemtray.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
class Smb4KSystemTray : public KSystemTray class Smb4KSystemTray : public KSystemTray
{ {

Loading…
Cancel
Save