Browse Source

Rename many classes and header files to avoid conflicts with KDE4

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:
107 107
 	CSwordVerseKey m_lowerBound;
108 108
 	CSwordVerseKey m_upperBound;
109 109
 
110
-	TQStringList* m_bookList; //This booklist is cached
110
+	TQStringList* m_bookList; //This bootdelist is cached
111 111
 	TQString m_cachedLocale;
112 112
 	short int m_hasOT;
113 113
 	short int m_hasNT;

+ 3
- 3
bibletime/bibletime.cpp View File

@@ -41,14 +41,14 @@
41 41
 
42 42
 //KDE includes
43 43
 #include <tdeversion.h>
44
-#include <kaction.h>
44
+#include <tdeaction.h>
45 45
 #include <kapplication.h>
46 46
 #include <tdeconfig.h>
47 47
 #include <kcmdlineargs.h>
48 48
 #include <klocale.h>
49
-#include <kaccel.h>
49
+#include <tdeaccel.h>
50 50
 #include <kmenubar.h>
51
-#include <ktoolbar.h>
51
+#include <tdetoolbar.h>
52 52
 #include <krandomsequence.h>
53 53
 
54 54
 using namespace Profile;

+ 1
- 1
bibletime/bibletime.h View File

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

+ 4
- 4
bibletime/bibletime_init.cpp View File

@@ -48,8 +48,8 @@
48 48
 
49 49
 //KDE includes
50 50
 #include <kaboutdata.h>
51
-#include <kaccel.h>
52
-#include <kaction.h>
51
+#include <tdeaccel.h>
52
+#include <tdeaction.h>
53 53
 #include <kapplication.h>
54 54
 #include <tdeconfigbase.h>
55 55
 #include <tdeversion.h>
@@ -59,9 +59,9 @@
59 59
 #include <kmenubar.h>
60 60
 #include <kstddirs.h>
61 61
 #include <kstdaction.h>
62
-#include <ktoolbar.h>
62
+#include <tdetoolbar.h>
63 63
 #include <klocale.h>
64
-#include <kpopupmenu.h>
64
+#include <tdepopupmenu.h>
65 65
 #include <tdeversion.h>
66 66
 
67 67
 //Sword includes

+ 2
- 2
bibletime/bibletime_slots.cpp View File

@@ -42,7 +42,7 @@
42 42
 #include <tqinputdialog.h>
43 43
 
44 44
 //KDE includes
45
-#include <kaction.h>
45
+#include <tdeaction.h>
46 46
 #include <kapplication.h>
47 47
 #include <kaboutkde.h>
48 48
 #include <kaboutdialog.h>
@@ -54,7 +54,7 @@
54 54
 #include <kglobal.h>
55 55
 #include <klocale.h>
56 56
 #include <kedittoolbar.h>
57
-#include <kpopupmenu.h>
57
+#include <tdepopupmenu.h>
58 58
 #include <khelpmenu.h>
59 59
 #include <ktip.h>
60 60
 

+ 1
- 1
bibletime/bibletimeinterface.h View File

@@ -18,7 +18,7 @@
18 18
 
19 19
 //KDE includes
20 20
 #include <dcopobject.h>
21
-#include <kmainwindowiface.h>
21
+#include <tdemainwindowiface.h>
22 22
 
23 23
 /** DCOP interface definition for BibleTime.
24 24
 * 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 @@
28 28
 #include <tdeversion.h>
29 29
 #include <kapplication.h>
30 30
 #if TDE_VERSION >= 0x030200
31
-#include <kactioncollection.h>
31
+#include <tdeactioncollection.h>
32 32
 #else
33
-#include <kaction.h>
33
+#include <tdeaction.h>
34 34
 #endif
35 35
 #include <tdeconfig.h>
36 36
 #include <kcharsets.h>
37 37
 #include <kglobal.h>
38 38
 #include <klocale.h>
39
-#include <kaccel.h>
39
+#include <tdeaccel.h>
40 40
 #include <kstaticdeleter.h>
41 41
 
42 42
 #include <tdehtml_settings.h>

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

@@ -34,7 +34,7 @@
34 34
 
35 35
 //KDE includes
36 36
 #include <klocale.h>
37
-#include <klistview.h>
37
+#include <tdelistview.h>
38 38
 #include <kiconloader.h>
39 39
 
40 40
 namespace BookshelfManager {

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

@@ -19,7 +19,7 @@
19 19
 #include "config.h"
20 20
 
21 21
 //KDE includes
22
-#include <kpopupmenu.h>
22
+#include <tdepopupmenu.h>
23 23
 #include <kapplication.h>
24 24
 #include <klocale.h>
25 25
 

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

@@ -58,9 +58,9 @@
58 58
 #include <kiconloader.h>
59 59
 #include <ktabctl.h>
60 60
 #include <kapp.h>
61
-#include <klistbox.h>
61
+#include <tdelistbox.h>
62 62
 #include <kkeydialog.h>
63
-#include <kaction.h>
63
+#include <tdeaction.h>
64 64
 #include <tdeconfigbase.h>
65 65
 #include <tdeconfig.h>
66 66
 

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

@@ -28,8 +28,8 @@
28 28
 
29 29
 //KDE includes
30 30
 #include <kdialogbase.h>
31
-#include <kfontdialog.h>
32
-#include <kaccel.h>
31
+#include <tdefontdialog.h>
32
+#include <tdeaccel.h>
33 33
 #include <kcolorbutton.h>
34 34
 #include <kapp.h>
35 35
 #include <klocale.h>

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

@@ -20,7 +20,7 @@
20 20
 #include <tqmap.h>
21 21
 
22 22
 //KDE includes
23
-#include <klistview.h>
23
+#include <tdelistview.h>
24 24
 
25 25
 class CSwordModuleInfo;
26 26
 class CSwordBackend;

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

@@ -20,12 +20,12 @@
20 20
 #include <tqtooltip.h>
21 21
 
22 22
 //KDE includes
23
-#include <kaction.h>
24
-#include <ktoolbar.h>
23
+#include <tdeaction.h>
24
+#include <tdetoolbar.h>
25 25
 #include <klocale.h>
26
-#include <kfontcombo.h>
26
+#include <tdefontcombo.h>
27 27
 #include <kcolorbutton.h>
28
-#include <kpopupmenu.h>
28
+#include <tdepopupmenu.h>
29 29
 
30 30
 CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent)
31 31
 : CPlainWriteDisplay(parentWindow,parent) {

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

@@ -20,7 +20,7 @@
20 20
 //TQt includes
21 21
 
22 22
 //KDE includes
23
-#include <kaction.h>
23
+#include <tdeaction.h>
24 24
 #include <klocale.h>
25 25
 
26 26
 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 @@
34 34
 #include <tqtimer.h>
35 35
 
36 36
 //KDE includes
37
-#include <kaccel.h>
37
+#include <tdeaccel.h>
38 38
 #include <klocale.h>
39
-#include <kpopupmenu.h>
39
+#include <tdepopupmenu.h>
40 40
 
41 41
 using namespace Profile;
42 42
 

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

@@ -22,7 +22,7 @@
22 22
 #include <tqwidget.h>
23 23
 
24 24
 //KDE includes
25
-#include <kaction.h>
25
+#include <tdeaction.h>
26 26
 
27 27
 
28 28
 class CTransliterationButton;

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

@@ -27,7 +27,7 @@
27 27
 #include <tqsplitter.h>
28 28
 
29 29
 //KDE includes
30
-#include <kaction.h>
30
+#include <tdeaction.h>
31 31
 #include <klocale.h>
32 32
 #include <tdeversion.h>
33 33
 

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

@@ -21,7 +21,7 @@
21 21
 #include <tqtooltip.h>
22 22
 
23 23
 //KDE includes
24
-#include <kpopupmenu.h>
24
+#include <tdepopupmenu.h>
25 25
 #include <klocale.h>
26 26
 
27 27
 

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

@@ -20,7 +20,7 @@
20 20
 #include <tqdict.h>
21 21
 
22 22
 //KDE includes
23
-#include <ktoolbarbutton.h>
23
+#include <tdetoolbarbutton.h>
24 24
 
25 25
 class TDEPopupMenu;
26 26
 

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

@@ -24,10 +24,10 @@
24 24
 //TQt includes
25 25
 
26 26
 //KDE includes
27
-#include <kaction.h>
28
-#include <kaccel.h>
27
+#include <tdeaction.h>
28
+#include <tdeaccel.h>
29 29
 #include <klocale.h>
30
-#include <kpopupmenu.h>
30
+#include <tdepopupmenu.h>
31 31
 
32 32
 using namespace Profile;
33 33
 

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

@@ -43,7 +43,7 @@
43 43
 
44 44
 //KDE includes
45 45
 #include <tdeversion.h>
46
-#include <kaccel.h>
46
+#include <tdeaccel.h>
47 47
 #include <klocale.h>
48 48
 
49 49
 using namespace Profile;

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

@@ -28,7 +28,7 @@
28 28
 #include <tqwidget.h>
29 29
 
30 30
 //KDE includes
31
-#include <kmainwindow.h>
31
+#include <tdemainwindow.h>
32 32
 
33 33
 
34 34
 //Forward declarations

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

@@ -20,7 +20,7 @@
20 20
 //TQt includes
21 21
 
22 22
 //KDE includes
23
-#include <kaction.h>
23
+#include <tdeaction.h>
24 24
 #include <klocale.h>
25 25
 
26 26
 using namespace Profile;

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

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

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

@@ -19,7 +19,7 @@
19 19
 #include <tqwidget.h>
20 20
 
21 21
 //KDE includes
22
-#include <kaction.h>
22
+#include <tdeaction.h>
23 23
 
24 24
 class CSwordKey;
25 25
 class CSwordLDKey;

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

@@ -24,7 +24,7 @@
24 24
 #include <tqhbox.h>
25 25
 
26 26
 //KDE includes
27
-#include <ktoolbar.h>
27
+#include <tdetoolbar.h>
28 28
 
29 29
 /**
30 30
   * @author The BibleTime team

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

@@ -21,8 +21,8 @@
21 21
 #include <tqtoolbutton.h>
22 22
 
23 23
 //KDE includes
24
-#include <ktoolbarbutton.h>
25
-#include <kpopupmenu.h>
24
+#include <tdetoolbarbutton.h>
25
+#include <tdepopupmenu.h>
26 26
 
27 27
 class TDEPopupMenu;
28 28
 class CModuleChooserBar;

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

@@ -21,8 +21,8 @@
21 21
 #include <tqregexp.h>
22 22
 
23 23
 //KDE includes
24
-#include <kaction.h>
25
-#include <kaccel.h>
24
+#include <tdeaction.h>
25
+#include <tdeaccel.h>
26 26
 #include <klocale.h>
27 27
 #include <kmessagebox.h>
28 28
 

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

@@ -27,10 +27,10 @@
27 27
 #include "util/cresmgr.h"
28 28
 
29 29
 //KDE includes
30
-#include <kpopupmenu.h>
31
-#include <kaction.h>
32
-#include <kaccel.h>
33
-#include <kstdaccel.h>
30
+#include <tdepopupmenu.h>
31
+#include <tdeaction.h>
32
+#include <tdeaccel.h>
33
+#include <tdestdaccel.h>
34 34
 #include <klocale.h>
35 35
 
36 36
 using namespace Profile;

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

@@ -30,7 +30,7 @@
30 30
 #include <tqstringlist.h>
31 31
 
32 32
 //KDE includes
33
-#include <klistview.h>
33
+#include <tdelistview.h>
34 34
 
35 35
 class CSwordKey;
36 36
 class CSwordBookModuleInfo;

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

@@ -21,7 +21,7 @@
21 21
 #include <tqdom.h>
22 22
 
23 23
 //KDE includes
24
-#include <klistview.h>
24
+#include <tdelistview.h>
25 25
 
26 26
 class TDEConfig;
27 27
 class CFolderBase;

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

@@ -36,7 +36,7 @@
36 36
 //KDE includes
37 37
 #include <klocale.h>
38 38
 #include <kstandarddirs.h>
39
-#include <kpopupmenu.h>
39
+#include <tdepopupmenu.h>
40 40
 #include <kmessagebox.h>
41 41
 #include <kglobalsettings.h>
42 42
 

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

@@ -26,8 +26,8 @@
26 26
 #include <tqtooltip.h>
27 27
 
28 28
 //KDE includes
29
-#include <kaction.h>
30
-#include <klistview.h>
29
+#include <tdeaction.h>
30
+#include <tdelistview.h>
31 31
 
32 32
 class CSearchDialog;
33 33
 

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

@@ -14,7 +14,7 @@
14 14
 #include <tqframe.h>
15 15
 #include <tqcheckbox.h>
16 16
 #include <tqheader.h>
17
-#include <klistview.h>
17
+#include <tdelistview.h>
18 18
 #include <tqpushbutton.h>
19 19
 #include <tqlayout.h>
20 20
 #include <tqtooltip.h>

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

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

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

@@ -33,7 +33,7 @@
33 33
 //KDE includes
34 34
 #include <kdialog.h>
35 35
 #include <kdialogbase.h>
36
-#include <klistview.h>
36
+#include <tdelistview.h>
37 37
 
38 38
 namespace Search {
39 39
 	namespace Options {

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

@@ -23,8 +23,8 @@
23 23
 
24 24
 //KDE includes
25 25
 #include <klocale.h>
26
-#include <kaction.h>
27
-#include <kpopupmenu.h>
26
+#include <tdeaction.h>
27
+#include <tdepopupmenu.h>
28 28
 
29 29
 
30 30
 namespace Search {

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

@@ -19,7 +19,7 @@
19 19
 //TQt includes
20 20
 
21 21
 //KDE includes
22
-#include <klistview.h>
22
+#include <tdelistview.h>
23 23
 
24 24
 //forward declarations
25 25
 class TQLabel;

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

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

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

@@ -33,7 +33,7 @@
33 33
 //KDE includes
34 34
 #include <kdialog.h>
35 35
 #include <kdialogbase.h>
36
-#include <klistview.h>
36
+#include <tdelistview.h>
37 37
 
38 38
 
39 39
 class TQTextEdit;

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

@@ -25,7 +25,7 @@
25 25
 #include <tqvgroupbox.h>
26 26
 
27 27
 //KDE includes
28
-#include <klistview.h>
28
+#include <tdelistview.h>
29 29
 
30 30
 //forward declarations
31 31
 class TQLabel;

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

@@ -22,8 +22,8 @@
22 22
 
23 23
 //KDE includes
24 24
 #include <klocale.h>
25
-#include <kaction.h>
26
-#include <kpopupmenu.h>
25
+#include <tdeaction.h>
26
+#include <tdepopupmenu.h>
27 27
 
28 28
 namespace Search {
29 29
 	namespace Result {

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

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

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

@@ -15,7 +15,7 @@
15 15
 
16 16
 #include <tqmap.h>
17 17
 
18
-#include <klistview.h>
18
+#include <tdelistview.h>
19 19
 
20 20
 namespace util {
21 21
 

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

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

Loading…
Cancel
Save