Rename many classes and header files to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent 9791ea5701
commit df031ab196

@ -107,7 +107,7 @@ private:
CSwordVerseKey m_lowerBound;
CSwordVerseKey m_upperBound;
TQStringList* m_bookList; //This booklist is cached
TQStringList* m_bookList; //This bootdelist is cached
TQString m_cachedLocale;
short int m_hasOT;
short int m_hasNT;

@ -41,14 +41,14 @@
//KDE includes
#include <tdeversion.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kcmdlineargs.h>
#include <klocale.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <kmenubar.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <krandomsequence.h>
using namespace Profile;

@ -24,7 +24,7 @@
#include "backend/cswordmoduleinfo.h"
//KDE includes
#include <kmainwindow.h>
#include <tdemainwindow.h>
//forward: BT classes
class CMDIArea;

@ -48,8 +48,8 @@
//KDE includes
#include <kaboutdata.h>
#include <kaccel.h>
#include <kaction.h>
#include <tdeaccel.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfigbase.h>
#include <tdeversion.h>
@ -59,9 +59,9 @@
#include <kmenubar.h>
#include <kstddirs.h>
#include <kstdaction.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tdeversion.h>
//Sword includes

@ -42,7 +42,7 @@
#include <tqinputdialog.h>
//KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kaboutkde.h>
#include <kaboutdialog.h>
@ -54,7 +54,7 @@
#include <kglobal.h>
#include <klocale.h>
#include <kedittoolbar.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <khelpmenu.h>
#include <ktip.h>

@ -18,7 +18,7 @@
//KDE includes
#include <dcopobject.h>
#include <kmainwindowiface.h>
#include <tdemainwindowiface.h>
/** DCOP interface definition for BibleTime.
* This is the interface definition for BibleTime's DCOP client interface. The main window class "BibleTime"

@ -28,15 +28,15 @@
#include <tdeversion.h>
#include <kapplication.h>
#if TDE_VERSION >= 0x030200
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#else
#include <kaction.h>
#include <tdeaction.h>
#endif
#include <tdeconfig.h>
#include <kcharsets.h>
#include <kglobal.h>
#include <klocale.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <kstaticdeleter.h>
#include <tdehtml_settings.h>

@ -34,7 +34,7 @@
//KDE includes
#include <klocale.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kiconloader.h>
namespace BookshelfManager {

@ -19,7 +19,7 @@
#include "config.h"
//KDE includes
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kapplication.h>
#include <klocale.h>

@ -58,9 +58,9 @@
#include <kiconloader.h>
#include <ktabctl.h>
#include <kapp.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <kkeydialog.h>
#include <kaction.h>
#include <tdeaction.h>
#include <tdeconfigbase.h>
#include <tdeconfig.h>

@ -28,8 +28,8 @@
//KDE includes
#include <kdialogbase.h>
#include <kfontdialog.h>
#include <kaccel.h>
#include <tdefontdialog.h>
#include <tdeaccel.h>
#include <kcolorbutton.h>
#include <kapp.h>
#include <klocale.h>

@ -20,7 +20,7 @@
#include <tqmap.h>
//KDE includes
#include <klistview.h>
#include <tdelistview.h>
class CSwordModuleInfo;
class CSwordBackend;

@ -20,12 +20,12 @@
#include <tqtooltip.h>
//KDE includes
#include <kaction.h>
#include <ktoolbar.h>
#include <tdeaction.h>
#include <tdetoolbar.h>
#include <klocale.h>
#include <kfontcombo.h>
#include <tdefontcombo.h>
#include <kcolorbutton.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent)
: CPlainWriteDisplay(parentWindow,parent) {

@ -20,7 +20,7 @@
//TQt includes
//KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent) : TQTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {

@ -34,9 +34,9 @@
#include <tqtimer.h>
//KDE includes
#include <kaccel.h>
#include <tdeaccel.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
using namespace Profile;

@ -22,7 +22,7 @@
#include <tqwidget.h>
//KDE includes
#include <kaction.h>
#include <tdeaction.h>
class CTransliterationButton;

@ -27,7 +27,7 @@
#include <tqsplitter.h>
//KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
#include <tdeversion.h>

@ -21,7 +21,7 @@
#include <tqtooltip.h>
//KDE includes
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <klocale.h>

@ -20,7 +20,7 @@
#include <tqdict.h>
//KDE includes
#include <ktoolbarbutton.h>
#include <tdetoolbarbutton.h>
class TDEPopupMenu;

@ -24,10 +24,10 @@
//TQt includes
//KDE includes
#include <kaction.h>
#include <kaccel.h>
#include <tdeaction.h>
#include <tdeaccel.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
using namespace Profile;

@ -43,7 +43,7 @@
//KDE includes
#include <tdeversion.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <klocale.h>
using namespace Profile;

@ -28,7 +28,7 @@
#include <tqwidget.h>
//KDE includes
#include <kmainwindow.h>
#include <tdemainwindow.h>
//Forward declarations

@ -20,7 +20,7 @@
//TQt includes
//KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
using namespace Profile;

@ -29,12 +29,12 @@
//TQt includes
//KDE includes
#include <kaccel.h>
#include <ktoolbar.h>
#include <tdeaccel.h>
#include <tdetoolbar.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tdeversion.h>
// #include <kactionclasses.h>
// #include <tdeactionclasses.h>
CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name) : CReadWindow(moduleList, parent,name) {
setKey( CSwordKey::createInstance(moduleList.first()) );

@ -19,7 +19,7 @@
#include <tqwidget.h>
//KDE includes
#include <kaction.h>
#include <tdeaction.h>
class CSwordKey;
class CSwordLDKey;

@ -24,7 +24,7 @@
#include <tqhbox.h>
//KDE includes
#include <ktoolbar.h>
#include <tdetoolbar.h>
/**
* @author The BibleTime team

@ -21,8 +21,8 @@
#include <tqtoolbutton.h>
//KDE includes
#include <ktoolbarbutton.h>
#include <kpopupmenu.h>
#include <tdetoolbarbutton.h>
#include <tdepopupmenu.h>
class TDEPopupMenu;
class CModuleChooserBar;

@ -21,8 +21,8 @@
#include <tqregexp.h>
//KDE includes
#include <kaction.h>
#include <kaccel.h>
#include <tdeaction.h>
#include <tdeaccel.h>
#include <klocale.h>
#include <kmessagebox.h>

@ -27,10 +27,10 @@
#include "util/cresmgr.h"
//KDE includes
#include <kpopupmenu.h>
#include <kaction.h>
#include <kaccel.h>
#include <kstdaccel.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <tdeaccel.h>
#include <tdestdaccel.h>
#include <klocale.h>
using namespace Profile;

@ -30,7 +30,7 @@
#include <tqstringlist.h>
//KDE includes
#include <klistview.h>
#include <tdelistview.h>
class CSwordKey;
class CSwordBookModuleInfo;

@ -21,7 +21,7 @@
#include <tqdom.h>
//KDE includes
#include <klistview.h>
#include <tdelistview.h>
class TDEConfig;
class CFolderBase;

@ -36,7 +36,7 @@
//KDE includes
#include <klocale.h>
#include <kstandarddirs.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <kglobalsettings.h>

@ -26,8 +26,8 @@
#include <tqtooltip.h>
//KDE includes
#include <kaction.h>
#include <klistview.h>
#include <tdeaction.h>
#include <tdelistview.h>
class CSearchDialog;

@ -14,7 +14,7 @@
#include <tqframe.h>
#include <tqcheckbox.h>
#include <tqheader.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <tqtooltip.h>

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

@ -33,7 +33,7 @@
//KDE includes
#include <kdialog.h>
#include <kdialogbase.h>
#include <klistview.h>
#include <tdelistview.h>
namespace Search {
namespace Options {

@ -23,8 +23,8 @@
//KDE includes
#include <klocale.h>
#include <kaction.h>
#include <kpopupmenu.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
namespace Search {

@ -19,7 +19,7 @@
//TQt includes
//KDE includes
#include <klistview.h>
#include <tdelistview.h>
//forward declarations
class TQLabel;

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

@ -33,7 +33,7 @@
//KDE includes
#include <kdialog.h>
#include <kdialogbase.h>
#include <klistview.h>
#include <tdelistview.h>
class TQTextEdit;

@ -25,7 +25,7 @@
#include <tqvgroupbox.h>
//KDE includes
#include <klistview.h>
#include <tdelistview.h>
//forward declarations
class TQLabel;

@ -22,8 +22,8 @@
//KDE includes
#include <klocale.h>
#include <kaction.h>
#include <kpopupmenu.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
namespace Search {
namespace Result {

@ -16,7 +16,7 @@
#include "backend/cswordmoduleinfo.h"
//KDE includes
#include <klistview.h>
#include <tdelistview.h>
//forward declarations
class TQLabel;

@ -15,7 +15,7 @@
#include <tqmap.h>
#include <klistview.h>
#include <tdelistview.h>
namespace util {

@ -17,7 +17,7 @@
#include <tqkeysequence.h>
//KDE includes
#include <kshortcut.h>
#include <tdeshortcut.h>
/** Provides static functions to easily access the Tooltip texts for all the frontend parts.
* @author The BibleTime team

Loading…
Cancel
Save