TDE
/
krename
Watch 7
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 10 Wiki Activity
Browse Source

Rename additional header files to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
e78e0dd6c9
commit
9a89a60c56
30 changed files with 46 additions and 46 deletions
Split View Show Diff Stats
  1. 1
    1
      krename/ProgressDialog.cpp
  2. 1
    1
      krename/batchrenamer.cpp
  3. 2
    2
      krename/commandplugin.cpp
  4. 1
    1
      krename/confdialog.cpp
  5. 1
    1
      krename/coorddialog.cpp
  6. 1
    1
      krename/dateplugin.cpp
  7. 1
    1
      krename/datetime.cpp
  8. 2
    2
      krename/dsdirselectdialog.cpp
  9. 2
    2
      krename/encodingplugin.cpp
  10. 1
    1
      krename/fileoperation.cpp
  11. 1
    1
      krename/fileplugin.cpp
  12. 1
    1
      krename/guimodeselector.cpp
  13. 1
    1
      krename/helpdialog.cpp
  14. 1
    1
      krename/kmyhistorycombo.cpp
  15. 1
    1
      krename/kmylistbox.cpp
  16. 1
    1
      krename/kmylistview.cpp
  17. 4
    4
      krename/krenameimpl.cpp
  18. 2
    2
      krename/main.cpp
  19. 1
    1
      krename/mydirplugin.cpp
  20. 1
    1
      krename/myinputdialog.cpp
  21. 1
    1
      krename/numberdialog.cpp
  22. 1
    1
      krename/permission.cpp
  23. 1
    1
      krename/pictureplugin.cpp
  24. 2
    2
      krename/profiledlg.cpp
  25. 2
    2
      krename/replacedialog.cpp
  26. 1
    1
      krename/semantic.cache
  27. 4
    4
      krename/tabs.cpp
  28. 1
    1
      krename/translitplugin.h
  29. 2
    2
      krename/undodialog.cpp
  30. 4
    4
      krename/wizard.cpp

+ 1
- 1
krename/ProgressDialog.cpp View File 

@@ -25,7 +25,7 @@
25 25 
 #include <tdeapplication.h>
26 26 
 #include <kiconloader.h>
27 27 
 #include <tdelistview.h>
28 
-#include <klocale.h>
28 
+#include <tdelocale.h>
29 29 
 #include <tdepopupmenu.h>
30 30 
 #include <kpushbutton.h>
31 31 
 #include <krun.h>

+ 1
- 1
krename/batchrenamer.cpp View File 

@@ -40,7 +40,7 @@
40 40 
 #include <tdeapplication.h>
41 41 
 #include <tdeio/job.h>
42 42 
 #include <tdeio/netaccess.h>
43 
-#include <klocale.h>
43 
+#include <tdelocale.h>
44 44
45 45 
 // Own includes
46 46 
 #include "ProgressDialog.h"

+ 2
- 2
krename/commandplugin.cpp View File 

@@ -26,10 +26,10 @@
26 26 
 #include <tdeapplication.h>
27 27 
 #include <tdeconfig.h>
28 28 
 #include <kiconloader.h>
29 
-#include <klocale.h>
29 
+#include <tdelocale.h>
30 30 
 #include <klineedit.h>
31 31 
 #include <tdelistbox.h>
32 
-#include <kmessagebox.h>
32 
+#include <tdemessagebox.h>
33 33 
 #include <kpushbutton.h>
34 34 
 #include <kprocess.h>
35 35

+ 1
- 1
krename/confdialog.cpp View File 

@@ -27,7 +27,7 @@
27 27
28 28 
 // KDE includes
29 29 
 #include <kiconloader.h>
30 
-#include <klocale.h>
30 
+#include <tdelocale.h>
31 31
32 32 
 ConfDialog::ConfDialog( TQWidget* parent, const char* name )
33 33 
     :  KDialogBase( KDialogBase::IconList, "KRename",

+ 1
- 1
krename/coorddialog.cpp View File 

@@ -26,7 +26,7 @@
26 26
27 27 
 // KDE includes
28 28 
 #include <tdeapplication.h>
29 
-#include <klocale.h>
29 
+#include <tdelocale.h>
30 30
31 31 
 DSLineEdit::DSLineEdit( TQWidget* parent, const char* name )
32 32 
     : KLineEdit( parent, name )

+ 1
- 1
krename/dateplugin.cpp View File 

@@ -22,7 +22,7 @@
22 22 
 // KDE includes
23 23 
 #include <tdefileitem.h>
24 24 
 #include <tdeio/netaccess.h>
25 
-#include <klocale.h>
25 
+#include <tdelocale.h>
26 26
27 27 
 DatePlugin::DatePlugin()
28 28 
  : FilePlugin(0)

+ 1
- 1
krename/datetime.cpp View File 

@@ -29,7 +29,7 @@
29 29 
 #include <kiconloader.h>
30 30 
 #include <kdatepik.h>
31 31 
 #include <knuminput.h>
32 
-#include <klocale.h>
32 
+#include <tdelocale.h>
33 33
34 34 
 // OS includes
35 35 
 #include <stdio.h>

+ 2
- 2
krename/dsdirselectdialog.cpp View File 

@@ -26,8 +26,8 @@
26 26 
 #include <tqvbox.h>
27 27
28 28 
 // KDE includes
29 
-#include <kdiroperator.h>
30 
-#include <klocale.h>
29 
+#include <tdediroperator.h>
30 
+#include <tdelocale.h>
31 31 
 #include <kurlcombobox.h>
32 32
33 33 
 DSDirSelectDialog::DSDirSelectDialog( TQWidget* parent )

+ 2
- 2
krename/encodingplugin.cpp View File 

@@ -29,8 +29,8 @@
29 29 
 #include <tdeapplication.h>
30 30 
 #include <kcombobox.h>
31 31 
 #include <kiconloader.h>
32 
-#include <klocale.h>
33 
-#include <kmessagebox.h>
32 
+#include <tdelocale.h>
33 
+#include <tdemessagebox.h>
34 34
35 35 
 const TQString EncodingPlugin::getName() const
36 36 
 {

+ 1
- 1
krename/fileoperation.cpp View File 

@@ -17,7 +17,7 @@
17 17
18 18 
 // KDE includes
19 19 
 #include <tdeapplication.h>
20 
-#include <klocale.h>
20 
+#include <tdelocale.h>
21 21 
 #include <tdeio/netaccess.h>
22 22 
 #include <tdeio/job.h>
23 23

+ 1
- 1
krename/fileplugin.cpp View File 

@@ -28,7 +28,7 @@
28 28 
 #include <tdefilemetainfo.h>
29 29 
 #include <klineedit.h>
30 30 
 #include <tdelistbox.h>
31 
-#include <klocale.h>
31 
+#include <tdelocale.h>
32 32 
 #include <kiconloader.h>
33 33 
 #include <kpushbutton.h>
34 34

+ 1
- 1
krename/guimodeselector.cpp View File 

@@ -25,7 +25,7 @@
25 25 
 #include <tqradiobutton.h>
26 26
27 27 
 // KDE includes
28 
-#include <klocale.h>
28 
+#include <tdelocale.h>
29 29
30 30 
 GUIModeSelector::GUIModeSelector()
31 31 
 {

+ 1
- 1
krename/helpdialog.cpp View File 

@@ -23,7 +23,7 @@
23 23 
 #include <tqlineedit.h>
24 24
25 25 
 // KDE includes
26 
-#include <klocale.h>
26 
+#include <tdelocale.h>
27 27 
 #include <tdelistview.h>
28 28 
 #include <kpushbutton.h>
29 29 
 #include <kstdguiitem.h>

+ 1
- 1
krename/kmyhistorycombo.cpp View File 

@@ -23,7 +23,7 @@
23 23
24 24 
 #include <tdeapplication.h>
25 25 
 #include <tdeconfig.h>
26 
-#include <klocale.h>
26 
+#include <tdelocale.h>
27 27
28 28 
 #include <tqpopupmenu.h>
29 29 
 #include <tqtimer.h>

+ 1
- 1
krename/kmylistbox.cpp View File 

@@ -27,7 +27,7 @@
27 27 
 #include <tdeapplication.h>
28 28 
 #include <kdirlister.h>
29 29 
 #include <kiconloader.h>
30 
-#include <klocale.h>
30 
+#include <tdelocale.h>
31 31 
 #include <tdeio/previewjob.h>
32 32 
 #include <tdeio/netaccess.h>
33 33 
 #include <tqptrlist.h>

+ 1
- 1
krename/kmylistview.cpp View File 

@@ -20,7 +20,7 @@
20 20
21 21 
 // KDE includes
22 22 
 #include <kiconloader.h>
23 
-#include <klocale.h>
23 
+#include <tdelocale.h>
24 24 
 #include <tdepopupmenu.h>
25 25 
 #include <krun.h>
26 26

+ 4
- 4
krename/krenameimpl.cpp View File 

@@ -47,12 +47,12 @@
47 47 
 #include <tdefileitem.h>
48 48 
 #include <khelpmenu.h>
49 49 
 #include <kiconloader.h>
50 
-#include <kmessagebox.h>
51 
-#include <kmenubar.h>
50 
+#include <tdemessagebox.h>
51 
+#include <tdemenubar.h>
52 52 
 #include <tdepopupmenu.h>
53 53 
 #include <kurlrequester.h>
54 
-#include <ktempfile.h>
55 
-#include <klocale.h>
54 
+#include <tdetempfile.h>
55 
+#include <tdelocale.h>
56 56 
 #include <tdeio/netaccess.h>
57 57
58 58 
 // QT includes

+ 2
- 2
krename/main.cpp View File 

@@ -25,8 +25,8 @@
25 25 
 #include <tdecmdlineargs.h>
26 26 
 #include <tdeconfig.h>
27 27 
 #include <kimageio.h>
28 
-#include <klocale.h>
29 
-#include <kmessagebox.h>
28 
+#include <tdelocale.h>
29 
+#include <tdemessagebox.h>
30 30
31 31 
 // Own includes
32 32 
 #include "wizard.h"

+ 1
- 1
krename/mydirplugin.cpp View File 

@@ -22,7 +22,7 @@
22 22 
 #include <tdeapplication.h>
23 23 
 #include <kiconloader.h>
24 24 
 #include <tdefiledialog.h>
25 
-#include <klocale.h>
25 
+#include <tdelocale.h>
26 26
27 27 
 // QT includes
28 28 
 #include <tqlabel.h>

+ 1
- 1
krename/myinputdialog.cpp View File 

@@ -19,7 +19,7 @@
19 19
20 20 
 #include <klineedit.h>
21 21 
 #include <kpushbutton.h>
22 
-#include <klocale.h>
22 
+#include <tdelocale.h>
23 23 
 #include <tqlabel.h>
24 24 
 #include <tqlayout.h>
25 25 
 #include <tqtooltip.h>

+ 1
- 1
krename/numberdialog.cpp View File 

@@ -26,7 +26,7 @@
26 26 
 // KDE includes
27 27 
 #include <tdeapplication.h>
28 28 
 #include <tdeconfig.h>
29 
-#include <klocale.h>
29 
+#include <tdelocale.h>
30 30 
 #include <kpushbutton.h>
31 31 
 #include <tqcheckbox.h>
32 32

+ 1
- 1
krename/permission.cpp View File 

@@ -27,7 +27,7 @@
27 27 
 #include <tdeapplication.h>
28 28 
 #include <kcombobox.h>
29 29 
 #include <kiconloader.h>
30 
-#include <klocale.h>
30 
+#include <tdelocale.h>
31 31
32 32 
 // OS includes
33 33 
 #include <stdio.h>

+ 1
- 1
krename/pictureplugin.cpp View File 

@@ -22,7 +22,7 @@
22 22
23 23 
 // KDE includes
24 24 
 #include <tdeapplication.h>
25 
-#include <klocale.h>
25 
+#include <tdelocale.h>
26 26
27 27 
 PicturePlugin::PicturePlugin()
28 28 
     : FilePlugin( 0 )

+ 2
- 2
krename/profiledlg.cpp View File 

@@ -27,8 +27,8 @@
27 27 
 #include <kiconloader.h>
28 28 
 #include <kinputdialog.h>
29 29 
 #include <tdelistbox.h>
30 
-#include <klocale.h>
31 
-#include <kmessagebox.h>
30 
+#include <tdelocale.h>
31 
+#include <tdemessagebox.h>
32 32 
 #include <kpushbutton.h>
33 33 
 #include <kstandarddirs.h>
34 34 
 #include <kurlrequester.h>

+ 2
- 2
krename/replacedialog.cpp View File 

@@ -28,9 +28,9 @@
28 28 
 // KDE includes
29 29 
 #include <tdeapplication.h>
30 30 
 #include <tdeconfig.h>
31 
-#include <klocale.h>
31 
+#include <tdelocale.h>
32 32 
 #include <tdelistview.h>
33 
-#include <kmessagebox.h>
33 
+#include <tdemessagebox.h>
34 34 
 #include <tdeparts/componentfactory.h>
35 35 
 #include <kpushbutton.h>
36 36 
 #include <kregexpeditorinterface.h>

+ 1
- 1
krename/semantic.cache
File diff suppressed because it is too large
View File


+ 4
- 4
krename/tabs.cpp View File 

@@ -27,11 +27,11 @@
27 27 
 // KDE includes
28 28 
 #include <tdeapplication.h>
29 29 
 #include <kiconloader.h>
30 
-#include <klocale.h>
31 
-#include <kmenubar.h>
32 
-#include <kmessagebox.h>
30 
+#include <tdelocale.h>
31 
+#include <tdemenubar.h>
32 
+#include <tdemessagebox.h>
33 33 
 #include <kpushbutton.h>
34 
-#include <kstartupinfo.h>
34 
+#include <tdestartupinfo.h>
35 35
36 36 
 tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name )
37 37 
     : TQDialog(parent,name)

+ 1
- 1
krename/translitplugin.h View File 

@@ -26,7 +26,7 @@
26 26 
 // KDE includes
27 27 
 #include <tdeapplication.h>
28 28 
 #include <kiconloader.h>
29 
-#include <klocale.h>
29 
+#include <tdelocale.h>
30 30 
 #include <kcombobox.h>
31 31 
 // #include <kdebug.h>
32 32

+ 2
- 2
krename/undodialog.cpp View File 

@@ -23,8 +23,8 @@
23 23
24 24 
 // KDE includes
25 25 
 #include <tdefiledialog.h>
26 
-#include <klocale.h>
27 
-#include <kmessagebox.h>
26 
+#include <tdelocale.h>
27 
+#include <tdemessagebox.h>
28 28 
 #include <kprocess.h>
29 29 
 #include <ktextbrowser.h>
30 30 
 #include <kurlrequester.h>

+ 4
- 4
krename/wizard.cpp View File 

@@ -22,10 +22,10 @@
22 22 
 // KDE includes
23 23 
 #include <tdeapplication.h>
24 24 
 #include <kiconloader.h>
25 
-#include <klocale.h>
26 
-#include <kmenubar.h>
27 
-#include <kmessagebox.h>
28 
-#include <kstartupinfo.h>
25 
+#include <tdelocale.h>
26 
+#include <tdemenubar.h>
27 
+#include <tdemessagebox.h>
28 
+#include <tdestartupinfo.h>
29 29
30 30 
 // TQt includes
31 31 
 #include <tqlabel.h>

Write Preview
Loading…
Cancel
Save