Browse Source

Rename many classes and header files to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
df031ab196
45 changed files with 72 additions and 72 deletions
  1. 1
    1
      bibletime/backend/cswordbiblemoduleinfo.h
  2. 3
    3
      bibletime/bibletime.cpp
  3. 1
    1
      bibletime/bibletime.h
  4. 4
    4
      bibletime/bibletime_init.cpp
  5. 2
    2
      bibletime/bibletime_slots.cpp
  6. 1
    1
      bibletime/bibletimeinterface.h
  7. 3
    3
      bibletime/frontend/cbtconfig.cpp
  8. 1
    1
      bibletime/frontend/cmanageindiceswidget.cpp
  9. 1
    1
      bibletime/frontend/cmdiarea.cpp
  10. 2
    2
      bibletime/frontend/coptionsdialog.cpp
  11. 2
    2
      bibletime/frontend/coptionsdialog.h
  12. 1
    1
      bibletime/frontend/cswordsetupmodulelistview.h
  13. 4
    4
      bibletime/frontend/display/chtmlwritedisplay.cpp
  14. 1
    1
      bibletime/frontend/display/cplainwritedisplay.cpp
  15. 2
    2
      bibletime/frontend/displaywindow/cbiblereadwindow.cpp
  16. 1
    1
      bibletime/frontend/displaywindow/cbiblereadwindow.h
  17. 1
    1
      bibletime/frontend/displaywindow/cbookreadwindow.cpp
  18. 1
    1
      bibletime/frontend/displaywindow/cbuttons.cpp
  19. 1
    1
      bibletime/frontend/displaywindow/cbuttons.h
  20. 3
    3
      bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
  21. 1
    1
      bibletime/frontend/displaywindow/cdisplaywindow.cpp
  22. 1
    1
      bibletime/frontend/displaywindow/cdisplaywindow.h
  23. 1
    1
      bibletime/frontend/displaywindow/chtmlwritewindow.cpp
  24. 4
    4
      bibletime/frontend/displaywindow/clexiconreadwindow.cpp
  25. 1
    1
      bibletime/frontend/displaywindow/clexiconreadwindow.h
  26. 1
    1
      bibletime/frontend/displaywindow/cmodulechooserbar.h
  27. 2
    2
      bibletime/frontend/displaywindow/cmodulechooserbutton.h
  28. 2
    2
      bibletime/frontend/displaywindow/cplainwritewindow.cpp
  29. 4
    4
      bibletime/frontend/displaywindow/creadwindow.cpp
  30. 1
    1
      bibletime/frontend/keychooser/cbooktreechooser.h
  31. 1
    1
      bibletime/frontend/mainindex/cindexitem.h
  32. 1
    1
      bibletime/frontend/mainindex/cmainindex.cpp
  33. 2
    2
      bibletime/frontend/mainindex/cmainindex.h
  34. 1
    1
      bibletime/frontend/manageindicesform.cpp
  35. 1
    1
      bibletime/frontend/manageindicesform.ui
  36. 1
    1
      bibletime/frontend/searchdialog/cmodulechooser.h
  37. 2
    2
      bibletime/frontend/searchdialog/cmoduleresultview.cpp
  38. 1
    1
      bibletime/frontend/searchdialog/cmoduleresultview.h
  39. 1
    1
      bibletime/frontend/searchdialog/crangechooser.h
  40. 1
    1
      bibletime/frontend/searchdialog/csearchanalysis.h
  41. 1
    1
      bibletime/frontend/searchdialog/csearchdialogpages.h
  42. 2
    2
      bibletime/frontend/searchdialog/csearchresultview.cpp
  43. 1
    1
      bibletime/frontend/searchdialog/csearchresultview.h
  44. 1
    1
      bibletime/frontend/util/csortlistviewitem.h
  45. 1
    1
      bibletime/util/cresmgr.h

+ 1
- 1
bibletime/backend/cswordbiblemoduleinfo.h View File

@@ -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;

+ 3
- 3
bibletime/bibletime.cpp View File

@@ -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;

+ 1
- 1
bibletime/bibletime.h View File

@@ -24,7 +24,7 @@
#include "backend/cswordmoduleinfo.h"

//KDE includes
#include <kmainwindow.h>
#include <tdemainwindow.h>

//forward: BT classes
class CMDIArea;

+ 4
- 4
bibletime/bibletime_init.cpp View File

@@ -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

+ 2
- 2
bibletime/bibletime_slots.cpp View File

@@ -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>


+ 1
- 1
bibletime/bibletimeinterface.h View File

@@ -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"

+ 3
- 3
bibletime/frontend/cbtconfig.cpp View File

@@ -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>

+ 1
- 1
bibletime/frontend/cmanageindiceswidget.cpp View File

@@ -34,7 +34,7 @@

//KDE includes
#include <klocale.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kiconloader.h>

namespace BookshelfManager {

+ 1
- 1
bibletime/frontend/cmdiarea.cpp View File

@@ -19,7 +19,7 @@
#include "config.h"

//KDE includes
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kapplication.h>
#include <klocale.h>


+ 2
- 2
bibletime/frontend/coptionsdialog.cpp View File

@@ -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>


+ 2
- 2
bibletime/frontend/coptionsdialog.h View File

@@ -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>

+ 1
- 1
bibletime/frontend/cswordsetupmodulelistview.h View File

@@ -20,7 +20,7 @@
#include <tqmap.h>

//KDE includes
#include <klistview.h>
#include <tdelistview.h>

class CSwordModuleInfo;
class CSwordBackend;

+ 4
- 4
bibletime/frontend/display/chtmlwritedisplay.cpp View File

@@ -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) {

+ 1
- 1
bibletime/frontend/display/cplainwritedisplay.cpp View File

@@ -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) {

+ 2
- 2
bibletime/frontend/displaywindow/cbiblereadwindow.cpp View File

@@ -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;


+ 1
- 1
bibletime/frontend/displaywindow/cbiblereadwindow.h View File

@@ -22,7 +22,7 @@
#include <tqwidget.h>

//KDE includes
#include <kaction.h>
#include <tdeaction.h>


class CTransliterationButton;

+ 1
- 1
bibletime/frontend/displaywindow/cbookreadwindow.cpp View File

@@ -27,7 +27,7 @@
#include <tqsplitter.h>

//KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
#include <tdeversion.h>


+ 1
- 1
bibletime/frontend/displaywindow/cbuttons.cpp View File

@@ -21,7 +21,7 @@
#include <tqtooltip.h>

//KDE includes
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <klocale.h>



+ 1
- 1
bibletime/frontend/displaywindow/cbuttons.h View File

@@ -20,7 +20,7 @@
#include <tqdict.h>

//KDE includes
#include <ktoolbarbutton.h>
#include <tdetoolbarbutton.h>

class TDEPopupMenu;


+ 3
- 3
bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp View File

@@ -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;


+ 1
- 1
bibletime/frontend/displaywindow/cdisplaywindow.cpp View File

@@ -43,7 +43,7 @@

//KDE includes
#include <tdeversion.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <klocale.h>

using namespace Profile;

+ 1
- 1
bibletime/frontend/displaywindow/cdisplaywindow.h View File

@@ -28,7 +28,7 @@
#include <tqwidget.h>

//KDE includes
#include <kmainwindow.h>
#include <tdemainwindow.h>


//Forward declarations

+ 1
- 1
bibletime/frontend/displaywindow/chtmlwritewindow.cpp View File

@@ -20,7 +20,7 @@
//TQt includes

//KDE includes
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>

using namespace Profile;

+ 4
- 4
bibletime/frontend/displaywindow/clexiconreadwindow.cpp View File

@@ -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()) );

+ 1
- 1
bibletime/frontend/displaywindow/clexiconreadwindow.h View File

@@ -19,7 +19,7 @@
#include <tqwidget.h>

//KDE includes
#include <kaction.h>
#include <tdeaction.h>

class CSwordKey;
class CSwordLDKey;

+ 1
- 1
bibletime/frontend/displaywindow/cmodulechooserbar.h View File

@@ -24,7 +24,7 @@
#include <tqhbox.h>

//KDE includes
#include <ktoolbar.h>
#include <tdetoolbar.h>

/**
* @author The BibleTime team

+ 2
- 2
bibletime/frontend/displaywindow/cmodulechooserbutton.h View File

@@ -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;

+ 2
- 2
bibletime/frontend/displaywindow/cplainwritewindow.cpp View File

@@ -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>


+ 4
- 4
bibletime/frontend/displaywindow/creadwindow.cpp View File

@@ -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;

+ 1
- 1
bibletime/frontend/keychooser/cbooktreechooser.h View File

@@ -30,7 +30,7 @@
#include <tqstringlist.h>

//KDE includes
#include <klistview.h>
#include <tdelistview.h>

class CSwordKey;
class CSwordBookModuleInfo;

+ 1
- 1
bibletime/frontend/mainindex/cindexitem.h View File

@@ -21,7 +21,7 @@
#include <tqdom.h>

//KDE includes
#include <klistview.h>
#include <tdelistview.h>

class TDEConfig;
class CFolderBase;

+ 1
- 1
bibletime/frontend/mainindex/cmainindex.cpp View File

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


+ 2
- 2
bibletime/frontend/mainindex/cmainindex.h View File

@@ -26,8 +26,8 @@
#include <tqtooltip.h>

//KDE includes
#include <kaction.h>
#include <klistview.h>
#include <tdeaction.h>
#include <tdelistview.h>

class CSearchDialog;


+ 1
- 1
bibletime/frontend/manageindicesform.cpp View File

@@ -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>

+ 1
- 1
bibletime/frontend/manageindicesform.ui View File

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

+ 1
- 1
bibletime/frontend/searchdialog/cmodulechooser.h View File

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

namespace Search {
namespace Options {

+ 2
- 2
bibletime/frontend/searchdialog/cmoduleresultview.cpp View File

@@ -23,8 +23,8 @@

//KDE includes
#include <klocale.h>
#include <kaction.h>
#include <kpopupmenu.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>


namespace Search {

+ 1
- 1
bibletime/frontend/searchdialog/cmoduleresultview.h View File

@@ -19,7 +19,7 @@
//TQt includes

//KDE includes
#include <klistview.h>
#include <tdelistview.h>

//forward declarations
class TQLabel;

+ 1
- 1
bibletime/frontend/searchdialog/crangechooser.h View File

@@ -31,7 +31,7 @@
//KDE includes
#include <kdialog.h>
#include <kdialogbase.h>
#include <klistview.h>
#include <tdelistview.h>

//forward declarations
class CSearchAnalysisItem;

+ 1
- 1
bibletime/frontend/searchdialog/csearchanalysis.h View File

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


class TQTextEdit;

+ 1
- 1
bibletime/frontend/searchdialog/csearchdialogpages.h View File

@@ -25,7 +25,7 @@
#include <tqvgroupbox.h>

//KDE includes
#include <klistview.h>
#include <tdelistview.h>

//forward declarations
class TQLabel;

+ 2
- 2
bibletime/frontend/searchdialog/csearchresultview.cpp View File

@@ -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 {

+ 1
- 1
bibletime/frontend/searchdialog/csearchresultview.h View File

@@ -16,7 +16,7 @@
#include "backend/cswordmoduleinfo.h"

//KDE includes
#include <klistview.h>
#include <tdelistview.h>

//forward declarations
class TQLabel;

+ 1
- 1
bibletime/frontend/util/csortlistviewitem.h View File

@@ -15,7 +15,7 @@

#include <tqmap.h>

#include <klistview.h>
#include <tdelistview.h>

namespace util {


+ 1
- 1
bibletime/util/cresmgr.h View File

@@ -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