Browse Source

Rename additional header files to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
20adf64e6b
61 changed files with 83 additions and 83 deletions
  1. 1
    1
      bibletime/backend/bt_osishtml.cpp
  2. 1
    1
      bibletime/backend/cdisplaytemplatemgr.cpp
  3. 1
    1
      bibletime/backend/cdisplaytemplatemgr.h
  4. 1
    1
      bibletime/backend/chtmlexportrendering.cpp
  5. 1
    1
      bibletime/backend/clanguagemgr.cpp
  6. 1
    1
      bibletime/backend/cswordbackend.cpp
  7. 1
    1
      bibletime/backend/cswordlexiconmoduleinfo.cpp
  8. 2
    2
      bibletime/backend/cswordmoduleinfo.cpp
  9. 1
    1
      bibletime/backend/ctextrendering.cpp
  10. 2
    2
      bibletime/bibletime.cpp
  11. 3
    3
      bibletime/bibletime_init.cpp
  12. 3
    3
      bibletime/bibletime_slots.cpp
  13. 3
    3
      bibletime/frontend/btinstallmgr.cpp
  14. 2
    2
      bibletime/frontend/cbtconfig.cpp
  15. 1
    1
      bibletime/frontend/cexportmanager.cpp
  16. 1
    1
      bibletime/frontend/cinfodisplay.cpp
  17. 1
    1
      bibletime/frontend/cinputdialog.cpp
  18. 1
    1
      bibletime/frontend/cmanageindiceswidget.cpp
  19. 1
    1
      bibletime/frontend/cmdiarea.cpp
  20. 1
    1
      bibletime/frontend/cmoduleindexdialog.cpp
  21. 2
    2
      bibletime/frontend/coptionsdialog.cpp
  22. 1
    1
      bibletime/frontend/coptionsdialog.h
  23. 1
    1
      bibletime/frontend/cprofile.cpp
  24. 2
    2
      bibletime/frontend/cswordsetupdialog.cpp
  25. 1
    1
      bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
  26. 1
    1
      bibletime/frontend/cswordsetupmodulelistview.cpp
  27. 1
    1
      bibletime/frontend/display/cdisplay.cpp
  28. 1
    1
      bibletime/frontend/display/chtmlreaddisplay.cpp
  29. 1
    1
      bibletime/frontend/display/chtmlwritedisplay.cpp
  30. 1
    1
      bibletime/frontend/display/cplainwritedisplay.cpp
  31. 1
    1
      bibletime/frontend/display/creaddisplay.cpp
  32. 1
    1
      bibletime/frontend/displaywindow/cbiblereadwindow.cpp
  33. 1
    1
      bibletime/frontend/displaywindow/cbookreadwindow.cpp
  34. 1
    1
      bibletime/frontend/displaywindow/cbuttons.cpp
  35. 1
    1
      bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
  36. 1
    1
      bibletime/frontend/displaywindow/cdisplaywindow.cpp
  37. 1
    1
      bibletime/frontend/displaywindow/chtmlwritewindow.cpp
  38. 1
    1
      bibletime/frontend/displaywindow/clexiconreadwindow.cpp
  39. 2
    2
      bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
  40. 2
    2
      bibletime/frontend/displaywindow/cplainwritewindow.cpp
  41. 1
    1
      bibletime/frontend/displaywindow/creadwindow.cpp
  42. 2
    2
      bibletime/frontend/displaywindow/cwritewindow.cpp
  43. 1
    1
      bibletime/frontend/keychooser/cbiblekeychooser.cpp
  44. 2
    2
      bibletime/frontend/keychooser/ckeyreferencewidget.cpp
  45. 1
    1
      bibletime/frontend/keychooser/clexiconkeychooser.cpp
  46. 1
    1
      bibletime/frontend/keychooser/crefselectdialog.cpp
  47. 1
    1
      bibletime/frontend/mainindex/cindexitem.cpp
  48. 3
    3
      bibletime/frontend/mainindex/cmainindex.cpp
  49. 1
    1
      bibletime/frontend/manageindicesform.cpp
  50. 1
    1
      bibletime/frontend/searchdialog/cmodulechooser.cpp
  51. 1
    1
      bibletime/frontend/searchdialog/cmoduleresultview.cpp
  52. 1
    1
      bibletime/frontend/searchdialog/crangechooser.cpp
  53. 1
    1
      bibletime/frontend/searchdialog/csearchanalysis.cpp
  54. 1
    1
      bibletime/frontend/searchdialog/csearchdialog.cpp
  55. 2
    2
      bibletime/frontend/searchdialog/csearchdialogpages.cpp
  56. 1
    1
      bibletime/frontend/searchdialog/csearchresultview.cpp
  57. 1
    1
      bibletime/frontend/searchdialog/searchoptionsform.cpp
  58. 1
    1
      bibletime/frontend/searchdialog/searchresultsform.cpp
  59. 2
    2
      bibletime/main.cpp
  60. 2
    2
      bibletime/util/cresmgr.cpp
  61. 3
    3
      bibletime/util/ctoolclass.cpp

+ 1
- 1
bibletime/backend/bt_osishtml.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <utilxml.h>
29 29
 
30 30
 //KDE includes
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 
33 33
 //TQt includes
34 34
 #include <tqstring.h>

+ 1
- 1
bibletime/backend/cdisplaytemplatemgr.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <tqfileinfo.h>
28 28
 
29 29
 //KDE includes
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <kstandarddirs.h>
32 32
 
33 33
 #include <iostream>

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

@@ -21,7 +21,7 @@
21 21
 #include <tqstringlist.h>
22 22
 
23 23
 //KDE includes
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 
26 26
 /**
27 27
  * Manages the display templates used in the filters and display classes.

+ 1
- 1
bibletime/backend/chtmlexportrendering.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include "util/scoped_resource.h"
25 25
 
26 26
 //KDE includes
27
-#include <klocale.h>
27
+#include <tdelocale.h>
28 28
 
29 29
 namespace Rendering {
30 30
 

+ 1
- 1
bibletime/backend/clanguagemgr.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include <tqptrlist.h>
22 22
 
23 23
 //KDE includes
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 
26 26
 //initialize static language list
27 27
 CLanguageMgr::LanguageList CLanguageMgr::m_langList;

+ 1
- 1
bibletime/backend/cswordbackend.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <tqfileinfo.h>
38 38
 
39 39
 //KDE includes
40
-#include <klocale.h>
40
+#include <tdelocale.h>
41 41
 #include <kstringhandler.h>
42 42
 
43 43
 //Sword includes

+ 1
- 1
bibletime/backend/cswordlexiconmoduleinfo.cpp View File

@@ -21,7 +21,7 @@
21 21
 //Sword includes
22 22
 #include <swmodule.h>
23 23
 
24
-#include <kglobal.h>
24
+#include <tdeglobal.h>
25 25
 #include <kstandarddirs.h>
26 26
 
27 27
 //STL includes

+ 2
- 2
bibletime/backend/cswordmoduleinfo.cpp View File

@@ -33,8 +33,8 @@
33 33
 #include <tqfileinfo.h>
34 34
 
35 35
 //KDE includes
36
-#include <klocale.h>
37
-#include <kglobal.h>
36
+#include <tdelocale.h>
37
+#include <tdeglobal.h>
38 38
 #include <kstandarddirs.h>
39 39
 #include <tdeconfig.h>
40 40
 

+ 1
- 1
bibletime/backend/ctextrendering.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <tqregexp.h>
29 29
 
30 30
 //KDE includes
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <kurl.h>
33 33
 
34 34
 using namespace Rendering;

+ 2
- 2
bibletime/bibletime.cpp View File

@@ -45,9 +45,9 @@
45 45
 #include <tdeapplication.h>
46 46
 #include <tdeconfig.h>
47 47
 #include <tdecmdlineargs.h>
48
-#include <klocale.h>
48
+#include <tdelocale.h>
49 49
 #include <tdeaccel.h>
50
-#include <kmenubar.h>
50
+#include <tdemenubar.h>
51 51
 #include <tdetoolbar.h>
52 52
 #include <krandomsequence.h>
53 53
 

+ 3
- 3
bibletime/bibletime_init.cpp View File

@@ -53,14 +53,14 @@
53 53
 #include <tdeapplication.h>
54 54
 #include <tdeconfigbase.h>
55 55
 #include <tdeversion.h>
56
-#include <kglobal.h>
56
+#include <tdeglobal.h>
57 57
 #include <khelpmenu.h>
58 58
 #include <kiconloader.h>
59
-#include <kmenubar.h>
59
+#include <tdemenubar.h>
60 60
 #include <kstddirs.h>
61 61
 #include <kstdaction.h>
62 62
 #include <tdetoolbar.h>
63
-#include <klocale.h>
63
+#include <tdelocale.h>
64 64
 #include <tdepopupmenu.h>
65 65
 #include <tdeversion.h>
66 66
 

+ 3
- 3
bibletime/bibletime_slots.cpp View File

@@ -49,10 +49,10 @@
49 49
 #include <kbugreport.h>
50 50
 #include <tdeaboutapplication.h>
51 51
 #include <kstandarddirs.h>
52
-#include <kmenubar.h>
52
+#include <tdemenubar.h>
53 53
 #include <tdeaboutdata.h>
54
-#include <kglobal.h>
55
-#include <klocale.h>
54
+#include <tdeglobal.h>
55
+#include <tdelocale.h>
56 56
 #include <kedittoolbar.h>
57 57
 #include <tdepopupmenu.h>
58 58
 #include <khelpmenu.h>

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

@@ -18,12 +18,12 @@
18 18
 
19 19
 //KDE includes
20 20
 #include <tdeapplication.h>
21
-#include <kglobal.h>
22
-#include <klocale.h>
21
+#include <tdeglobal.h>
22
+#include <tdelocale.h>
23 23
 #include <kstandarddirs.h>
24 24
 #include <kprocess.h>
25 25
 #include <tdeconfig.h>
26
-#include <kmessagebox.h>
26
+#include <tdemessagebox.h>
27 27
 
28 28
 //Sword includes
29 29
 #include <filemgr.h>

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

@@ -34,8 +34,8 @@
34 34
 #endif
35 35
 #include <tdeconfig.h>
36 36
 #include <kcharsets.h>
37
-#include <kglobal.h>
38
-#include <klocale.h>
37
+#include <tdeglobal.h>
38
+#include <tdelocale.h>
39 39
 #include <tdeaccel.h>
40 40
 #include <kstaticdeleter.h>
41 41
 

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

@@ -33,7 +33,7 @@
33 33
 //KDE includes
34 34
 #include <kprogress.h>
35 35
 #include <tdefiledialog.h>
36
-#include <klocale.h>
36
+#include <tdelocale.h>
37 37
 #include <tdeapplication.h>
38 38
 
39 39
 //Sword includes

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

@@ -38,7 +38,7 @@
38 38
 #include <tqregexp.h>
39 39
 
40 40
 //KDE includes
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 #include <kstdaction.h>
43 43
 
44 44
 

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

@@ -20,7 +20,7 @@
20 20
 #include <tqlayout.h>
21 21
 
22 22
 //KDE includes
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 #include <kseparator.h>
25 25
 
26 26
 CInputDialog::CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *parent, const char *name, const bool modal ) : KDialog(parent,name,modal) {

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

@@ -33,7 +33,7 @@
33 33
 #include <tqcheckbox.h>
34 34
 
35 35
 //KDE includes
36
-#include <klocale.h>
36
+#include <tdelocale.h>
37 37
 #include <tdelistview.h>
38 38
 #include <kiconloader.h>
39 39
 

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

@@ -21,7 +21,7 @@
21 21
 //KDE includes
22 22
 #include <tdepopupmenu.h>
23 23
 #include <tdeapplication.h>
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 
26 26
 //QT includes
27 27
 #include <tqobjectlist.h>

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

@@ -20,7 +20,7 @@
20 20
 //KDE includes
21 21
 #include <tdeapplication.h>
22 22
 #include <kprogress.h>
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 
25 25
 CModuleIndexDialog* CModuleIndexDialog::getInstance() {
26 26
 	static CModuleIndexDialog* instance = 0;

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

@@ -49,8 +49,8 @@
49 49
 
50 50
 //KDE includes
51 51
 #include <kapp.h>
52
-#include <klocale.h>
53
-#include <kglobal.h>
52
+#include <tdelocale.h>
53
+#include <tdeglobal.h>
54 54
 #include <kstandarddirs.h>
55 55
 #include <kkeydialog.h>
56 56
 #include <tdehtml_part.h>

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

@@ -32,7 +32,7 @@
32 32
 #include <tdeaccel.h>
33 33
 #include <kcolorbutton.h>
34 34
 #include <kapp.h>
35
-#include <klocale.h>
35
+#include <tdelocale.h>
36 36
 
37 37
 class TQHBox;
38 38
 class TQCheckBox;

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

@@ -20,7 +20,7 @@
20 20
 
21 21
 //KDE includes
22 22
 #include <kstandarddirs.h>
23
-#include <klocale.h>
23
+#include <tdelocale.h>
24 24
 
25 25
 #define CURRENT_SYNTAX_VERSION 2
26 26
 

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

@@ -39,10 +39,10 @@
39 39
 #include <tdeconfig.h>
40 40
 #include <kdirselectdialog.h>
41 41
 #include <keditlistbox.h>
42
-#include <klocale.h>
42
+#include <tdelocale.h>
43 43
 #include <kstandarddirs.h>
44 44
 #include <kiconloader.h>
45
-#include <kmessagebox.h>
45
+#include <tdemessagebox.h>
46 46
 #include <kprogress.h>
47 47
 #include <kurl.h>
48 48
 

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

@@ -23,7 +23,7 @@
23 23
 #include <tqfileinfo.h>
24 24
 
25 25
 
26
-#include <klocale.h>
26
+#include <tdelocale.h>
27 27
 #include <kdirselectdialog.h>
28 28
 
29 29
 namespace BookshelfManager {

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

@@ -22,7 +22,7 @@
22 22
 #include <tqtooltip.h>
23 23
 
24 24
 //KDE includes
25
-#include <klocale.h>
25
+#include <tdelocale.h>
26 26
 #include <kiconloader.h>
27 27
 
28 28
 using namespace sword;

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

@@ -27,7 +27,7 @@
27 27
 //KDE includes
28 28
 #include <tdeapplication.h>
29 29
 #include <tdefiledialog.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 
32 32
 
33 33
 CDisplayConnections::CDisplayConnections( CDisplay* display ) : m_display(display) {}

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

@@ -43,7 +43,7 @@
43 43
 //KDE includes
44 44
 #include <tdeapplication.h>
45 45
 #include <tdehtmlview.h>
46
-#include <kglobalsettings.h>
46
+#include <tdeglobalsettings.h>
47 47
 #include <tdehtml_events.h>
48 48
 
49 49
 #include <dom/dom2_range.h>

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

@@ -22,7 +22,7 @@
22 22
 //KDE includes
23 23
 #include <tdeaction.h>
24 24
 #include <tdetoolbar.h>
25
-#include <klocale.h>
25
+#include <tdelocale.h>
26 26
 #include <tdefontcombo.h>
27 27
 #include <kcolorbutton.h>
28 28
 #include <tdepopupmenu.h>

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

@@ -21,7 +21,7 @@
21 21
 
22 22
 //KDE includes
23 23
 #include <tdeaction.h>
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 
26 26
 CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent) : TQTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {
27 27
 	setTextFormat(TQt::PlainText);

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

@@ -32,7 +32,7 @@
32 32
 #include <tqpopupmenu.h>
33 33
 
34 34
 //KDE includes
35
-#include <klocale.h>
35
+#include <tdelocale.h>
36 36
 
37 37
 CReadDisplay::CReadDisplay(CReadWindow* readWindow) :
38 38
 CDisplay(readWindow),

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

@@ -35,7 +35,7 @@
35 35
 
36 36
 //KDE includes
37 37
 #include <tdeaccel.h>
38
-#include <klocale.h>
38
+#include <tdelocale.h>
39 39
 #include <tdepopupmenu.h>
40 40
 
41 41
 using namespace Profile;

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

@@ -28,7 +28,7 @@
28 28
 
29 29
 //KDE includes
30 30
 #include <tdeaction.h>
31
-#include <klocale.h>
31
+#include <tdelocale.h>
32 32
 #include <tdeversion.h>
33 33
 
34 34
 using namespace Profile;

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

@@ -22,7 +22,7 @@
22 22
 
23 23
 //KDE includes
24 24
 #include <tdepopupmenu.h>
25
-#include <klocale.h>
25
+#include <tdelocale.h>
26 26
 
27 27
 
28 28
 // CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *parent, const char *name )

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

@@ -26,7 +26,7 @@
26 26
 //KDE includes
27 27
 #include <tdeaction.h>
28 28
 #include <tdeaccel.h>
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 #include <tdepopupmenu.h>
31 31
 
32 32
 using namespace Profile;

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

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

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

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

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

@@ -31,7 +31,7 @@
31 31
 //KDE includes
32 32
 #include <tdeaccel.h>
33 33
 #include <tdetoolbar.h>
34
-#include <klocale.h>
34
+#include <tdelocale.h>
35 35
 #include <tdepopupmenu.h>
36 36
 #include <tdeversion.h>
37 37
 // #include <tdeactionclasses.h>

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

@@ -23,8 +23,8 @@
23 23
 #include <tqvaluelist.h>
24 24
 
25 25
 //KDE includes
26
-#include <klocale.h>
27
-#include <kglobal.h>
26
+#include <tdelocale.h>
27
+#include <tdeglobal.h>
28 28
 #include <kiconloader.h>
29 29
 
30 30
 CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name )

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

@@ -23,8 +23,8 @@
23 23
 //KDE includes
24 24
 #include <tdeaction.h>
25 25
 #include <tdeaccel.h>
26
-#include <klocale.h>
27
-#include <kmessagebox.h>
26
+#include <tdelocale.h>
27
+#include <tdemessagebox.h>
28 28
 
29 29
 using namespace Profile;
30 30
 

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

@@ -31,7 +31,7 @@
31 31
 #include <tdeaction.h>
32 32
 #include <tdeaccel.h>
33 33
 #include <tdestdaccel.h>
34
-#include <klocale.h>
34
+#include <tdelocale.h>
35 35
 
36 36
 using namespace Profile;
37 37
 

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

@@ -17,8 +17,8 @@
17 17
 #include "frontend/cprofilewindow.h"
18 18
 
19 19
 //KDE includes
20
-#include <kmessagebox.h>
21
-#include <klocale.h>
20
+#include <tdemessagebox.h>
21
+#include <tdelocale.h>
22 22
 
23 23
 using namespace Profile;
24 24
 

+ 1
- 1
bibletime/frontend/keychooser/cbiblekeychooser.cpp View File

@@ -26,7 +26,7 @@
26 26
 #include <tqpushbutton.h>
27 27
 
28 28
 //KDE includes
29
-#include <klocale.h>
29
+#include <tdelocale.h>
30 30
 
31 31
 CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name )
32 32
 : CKeyChooser(modules, key, parent, name),

+ 2
- 2
bibletime/frontend/keychooser/ckeyreferencewidget.cpp View File

@@ -25,9 +25,9 @@
25 25
 #include <tqpixmap.h>
26 26
 #include <tqapplication.h>
27 27
 #include <kcompletion.h>
28
-#include <kglobalsettings.h>
28
+#include <tdeglobalsettings.h>
29 29
 #include <tdecompletionbox.h>
30
-#include <klocale.h>
30
+#include <tdelocale.h>
31 31
 #include <kpushbutton.h>
32 32
 #include <kguiitem.h>
33 33
 

+ 1
- 1
bibletime/frontend/keychooser/clexiconkeychooser.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <tqlistbox.h>
30 30
 
31 31
 //KDE includes
32
-#include <klocale.h>
32
+#include <tdelocale.h>
33 33
 
34 34
 CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name )
35 35
 : CKeyChooser(modules, key, parent, name),

+ 1
- 1
bibletime/frontend/keychooser/crefselectdialog.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include "backend/cswordversekey.h"
22 22
 
23 23
 //KDE includes
24
-#include <klocale.h>
24
+#include <tdelocale.h>
25 25
 
26 26
 
27 27
 //CRefSelectDialog::CRefSelectDialog(TQWidget *parent)

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

@@ -42,7 +42,7 @@
42 42
 
43 43
 //KDE includes
44 44
 #include <tdeconfig.h>
45
-#include <klocale.h>
45
+#include <tdelocale.h>
46 46
 #include <tdefiledialog.h>
47 47
 #include <kiconloader.h>
48 48
 #include <kstandarddirs.h>

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

@@ -34,11 +34,11 @@
34 34
 #include <tqregexp.h>
35 35
 
36 36
 //KDE includes
37
-#include <klocale.h>
37
+#include <tdelocale.h>
38 38
 #include <kstandarddirs.h>
39 39
 #include <tdepopupmenu.h>
40
-#include <kmessagebox.h>
41
-#include <kglobalsettings.h>
40
+#include <tdemessagebox.h>
41
+#include <tdeglobalsettings.h>
42 42
 
43 43
 using namespace Printing;
44 44
 

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

@@ -1,5 +1,5 @@
1 1
 #include <kdialog.h>
2
-#include <klocale.h>
2
+#include <tdelocale.h>
3 3
 /****************************************************************************
4 4
 ** Form implementation generated from reading ui file './manageindicesform.ui'
5 5
 **

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

@@ -38,7 +38,7 @@
38 38
 //KDE includes
39 39
 #include <tdeapplication.h>
40 40
 #include <tdefiledialog.h>
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 #include <kiconloader.h>
43 43
 
44 44
 namespace Search {

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

@@ -22,7 +22,7 @@
22 22
 //TQt includes
23 23
 
24 24
 //KDE includes
25
-#include <klocale.h>
25
+#include <tdelocale.h>
26 26
 #include <tdeaction.h>
27 27
 #include <tdepopupmenu.h>
28 28
 

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

@@ -38,7 +38,7 @@
38 38
 //KDE includes
39 39
 #include <tdeapplication.h>
40 40
 #include <tdefiledialog.h>
41
-#include <klocale.h>
41
+#include <tdelocale.h>
42 42
 #include <kiconloader.h>
43 43
 
44 44
 namespace Search {

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

@@ -39,7 +39,7 @@
39 39
 //KDE includes
40 40
 #include <tdeapplication.h>
41 41
 #include <tdefiledialog.h>
42
-#include <klocale.h>
42
+#include <tdelocale.h>
43 43
 #include <kiconloader.h>
44 44
 
45 45
 namespace Search {

+ 1
- 1
bibletime/frontend/searchdialog/csearchdialog.cpp View File

@@ -42,7 +42,7 @@
42 42
 //KDE includes
43 43
 #include <tdeapplication.h>
44 44
 #include <tdefiledialog.h>
45
-#include <klocale.h>
45
+#include <tdelocale.h>
46 46
 #include <kiconloader.h>
47 47
 
48 48
 namespace Search {

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

@@ -35,10 +35,10 @@
35 35
 #include <tqeventloop.h>
36 36
 
37 37
 //KDE includes
38
-#include <klocale.h>
38
+#include <tdelocale.h>
39 39
 #include <kcombobox.h>
40 40
 #include <kiconloader.h>
41
-#include <kmessagebox.h>
41
+#include <tdemessagebox.h>
42 42
 #include <kprogress.h>
43 43
 #include <tdeapplication.h>
44 44
 

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

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

+ 1
- 1
bibletime/frontend/searchdialog/searchoptionsform.cpp View File

@@ -1,5 +1,5 @@
1 1
 #include <kdialog.h>
2
-#include <klocale.h>
2
+#include <tdelocale.h>
3 3
 /****************************************************************************
4 4
 ** Form implementation generated from reading ui file './searchoptionsform.ui'
5 5
 **

+ 1
- 1
bibletime/frontend/searchdialog/searchresultsform.cpp View File

@@ -1,5 +1,5 @@
1 1
 #include <kdialog.h>
2
-#include <klocale.h>
2
+#include <tdelocale.h>
3 3
 /****************************************************************************
4 4
 ** Form implementation generated from reading ui file './searchresultsform.ui'
5 5
 **

+ 2
- 2
bibletime/main.cpp View File

@@ -36,12 +36,12 @@
36 36
 //KDE includes
37 37
 #include <tdecmdlineargs.h>
38 38
 #include <kcrash.h>
39
-#include <kglobal.h>
39
+#include <tdeglobal.h>
40 40
 #include <tdeapplication.h>
41 41
 #include <kstandarddirs.h>
42 42
 #include <kinstance.h>
43 43
 #include <tdeaboutdata.h>
44
-#include <klocale.h>
44
+#include <tdelocale.h>
45 45
 
46 46
 bool showDebugMessages = false;
47 47
 BibleTime* bibletime_ptr = 0;

+ 2
- 2
bibletime/util/cresmgr.cpp View File

@@ -15,8 +15,8 @@
15 15
 #include "backend/cswordbackend.h"
16 16
 
17 17
 //KDE includes
18
-#include <kglobal.h>
19
-#include <klocale.h>
18
+#include <tdeglobal.h>
19
+#include <tdelocale.h>
20 20
 
21 21
 namespace CResMgr {
22 22
 	namespace modules {

+ 3
- 3
bibletime/util/ctoolclass.cpp View File

@@ -24,11 +24,11 @@
24 24
 #include <tqregexp.h>
25 25
 
26 26
 //KDE includes
27
-#include <klocale.h>
28
-#include <kglobal.h>
27
+#include <tdelocale.h>
28
+#include <tdeglobal.h>
29 29
 #include <kiconloader.h>
30 30
 #include <kstandarddirs.h>
31
-#include <kmessagebox.h>
31
+#include <tdemessagebox.h>
32 32
 #include <kurl.h>
33 33
 #include <tdefiledialog.h>
34 34
 #include <tdeapplication.h>

Loading…
Cancel
Save