TDE
/
bibletime
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename many classes and header files to avoid conflicts with KDE4

Browse Source
r14.0.x
Timothy Pearson 11 years ago
parent 9791ea5701
commit df031ab196
45 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File

2
bibletime/backend/cswordbiblemoduleinfo.h
Unescape View File

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

6
bibletime/bibletime.cpp
Unescape View File

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

2
bibletime/bibletime.h
Unescape View File

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

8
bibletime/bibletime_init.cpp
Unescape View File

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

4
bibletime/bibletime_slots.cpp
Unescape View File

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

2
bibletime/bibletimeinterface.h
Unescape View File

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

6
bibletime/frontend/cbtconfig.cpp
Unescape View File

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

2
bibletime/frontend/cmanageindiceswidget.cpp
Unescape View File

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

2
bibletime/frontend/cmdiarea.cpp
Unescape View File

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

4
bibletime/frontend/coptionsdialog.cpp
Unescape View File

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

4
bibletime/frontend/coptionsdialog.h
Unescape View File

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

2
bibletime/frontend/cswordsetupmodulelistview.h
Unescape View File

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

8
bibletime/frontend/display/chtmlwritedisplay.cpp
Unescape View File

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

2
bibletime/frontend/display/cplainwritedisplay.cpp
Unescape View File

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

4
bibletime/frontend/displaywindow/cbiblereadwindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/cbiblereadwindow.h
Unescape View File

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

2
bibletime/frontend/displaywindow/cbookreadwindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/cbuttons.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/cbuttons.h
Unescape View File

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

6
bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/cdisplaywindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/cdisplaywindow.h
Unescape View File

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

2
bibletime/frontend/displaywindow/chtmlwritewindow.cpp
Unescape View File

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

8
bibletime/frontend/displaywindow/clexiconreadwindow.cpp
Unescape View File

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

2
bibletime/frontend/displaywindow/clexiconreadwindow.h
Unescape View File

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

2
bibletime/frontend/displaywindow/cmodulechooserbar.h
Unescape View File

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

4
bibletime/frontend/displaywindow/cmodulechooserbutton.h
Unescape View File

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

4
bibletime/frontend/displaywindow/cplainwritewindow.cpp
Unescape View File

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

8
bibletime/frontend/displaywindow/creadwindow.cpp
Unescape View File

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

2
bibletime/frontend/keychooser/cbooktreechooser.h
Unescape View File

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

2
bibletime/frontend/mainindex/cindexitem.h
Unescape View File

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

2
bibletime/frontend/mainindex/cmainindex.cpp
Unescape View File

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

4
bibletime/frontend/mainindex/cmainindex.h
Unescape View File

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

2
bibletime/frontend/manageindicesform.cpp
Unescape View File

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

2
bibletime/frontend/manageindicesform.ui
Unescape View File

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

2
bibletime/frontend/searchdialog/cmodulechooser.h
Unescape View File

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

4
bibletime/frontend/searchdialog/cmoduleresultview.cpp
Unescape View File

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

2
bibletime/frontend/searchdialog/cmoduleresultview.h
Unescape View File

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

2
bibletime/frontend/searchdialog/crangechooser.h
Unescape View File

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

2
bibletime/frontend/searchdialog/csearchanalysis.h
Unescape View File

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

2
bibletime/frontend/searchdialog/csearchdialogpages.h
Unescape View File

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

4
bibletime/frontend/searchdialog/csearchresultview.cpp
Unescape View File

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

2
bibletime/frontend/searchdialog/csearchresultview.h
Unescape View File

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

2
bibletime/frontend/util/csortlistviewitem.h
Unescape View File

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

2
bibletime/util/cresmgr.h
Unescape View File

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

Write Preview
Loading…
Cancel
Save