Browse Source

Rename many classes and header files to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
d318087925
100 changed files with 151 additions and 151 deletions
  1. 5
    5
      akregator/src/actionmanagerimpl.cpp
  2. 5
    5
      akregator/src/akregator_part.cpp
  3. 2
    2
      akregator/src/akregator_view.cpp
  4. 1
    1
      akregator/src/articlelistview.h
  5. 1
    1
      akregator/src/articleviewer.cpp
  6. 1
    1
      akregator/src/feeditem.cpp
  7. 1
    1
      akregator/src/feedlistview.h
  8. 1
    1
      akregator/src/folderitem.cpp
  9. 1
    1
      akregator/src/frame.cpp
  10. 1
    1
      akregator/src/mainwindow.cpp
  11. 3
    3
      akregator/src/pageviewer.cpp
  12. 4
    4
      akregator/src/settings_appearance.ui
  13. 1
    1
      akregator/src/simplenodeselector.cpp
  14. 1
    1
      akregator/src/tabwidget.cpp
  15. 1
    1
      akregator/src/tagaction.cpp
  16. 1
    1
      akregator/src/tagaction.h
  17. 1
    1
      akregator/src/tagfolderitem.cpp
  18. 1
    1
      akregator/src/tagnodeitem.cpp
  19. 1
    1
      akregator/src/trayicon.cpp
  20. 1
    1
      akregator/src/treenodeitem.h
  21. 2
    2
      akregator/src/viewer.cpp
  22. 3
    3
      certmanager/certmanager.cpp
  23. 1
    1
      certmanager/certmanager.h
  24. 2
    2
      certmanager/conf/appearanceconfigwidget.cpp
  25. 1
    1
      certmanager/customactions.cpp
  26. 1
    1
      certmanager/customactions.h
  27. 1
    1
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  28. 1
    1
      certmanager/kwatchgnupg/kwatchgnupgmainwin.h
  29. 2
    2
      certmanager/lib/ui/backendconfigwidget.cpp
  30. 1
    1
      certmanager/lib/ui/cryptoconfigdialog.cpp
  31. 1
    1
      certmanager/lib/ui/keylistview.h
  32. 1
    1
      kaddressbook/CMakeLists.txt
  33. 1
    1
      kaddressbook/Makefile.am
  34. 2
    2
      kaddressbook/addresseditwidget.cpp
  35. 1
    1
      kaddressbook/addresseeeditorwidget.cpp
  36. 1
    1
      kaddressbook/customfieldswidget.cpp
  37. 1
    1
      kaddressbook/distributionlistpicker.cpp
  38. 1
    1
      kaddressbook/editors/imeditorbase.ui
  39. 1
    1
      kaddressbook/editors/imeditorwidget.h
  40. 1
    1
      kaddressbook/emaileditwidget.cpp
  41. 1
    1
      kaddressbook/extensionmanager.cpp
  42. 2
    2
      kaddressbook/features/distributionlistngwidget.cpp
  43. 1
    1
      kaddressbook/features/distributionlistngwidget.h
  44. 1
    1
      kaddressbook/features/distributionlistwidget.cpp
  45. 1
    1
      kaddressbook/features/distributionlistwidget.h
  46. 1
    1
      kaddressbook/features/resourceselection.h
  47. 2
    2
      kaddressbook/filtereditdialog.cpp
  48. 1
    1
      kaddressbook/geowidget.cpp
  49. 1
    1
      kaddressbook/imeditwidget.cpp
  50. 1
    1
      kaddressbook/interfaces/xxport.cpp
  51. 3
    3
      kaddressbook/kabcore.cpp
  52. 1
    1
      kaddressbook/kaddressbook_part.cpp
  53. 2
    2
      kaddressbook/kaddressbootdemain.cpp
  54. 2
    2
      kaddressbook/kaddressbootdemain.h
  55. 1
    1
      kaddressbook/kcmconfigs/addhostdialog.cpp
  56. 1
    1
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  57. 1
    1
      kaddressbook/kcmconfigs/ldapoptionswidget.cpp
  58. 1
    1
      kaddressbook/main.cpp
  59. 2
    2
      kaddressbook/nameeditdialog.cpp
  60. 1
    1
      kaddressbook/phoneeditwidget.cpp
  61. 1
    1
      kaddressbook/printing/detailledstyle.cpp
  62. 1
    1
      kaddressbook/viewmanager.cpp
  63. 1
    1
      kaddressbook/views/colorlistbox.h
  64. 1
    1
      kaddressbook/views/configurecardviewdialog.cpp
  65. 1
    1
      kaddressbook/views/contactlistview.h
  66. 1
    1
      kalarm/birthdaydlg.cpp
  67. 1
    1
      kalarm/birthdaydlg.h
  68. 1
    1
      kalarm/daemon.h
  69. 1
    1
      kalarm/eventlistviewbase.h
  70. 1
    1
      kalarm/fontcolour.h
  71. 2
    2
      kalarm/functions.cpp
  72. 5
    5
      kalarm/mainwindow.cpp
  73. 1
    1
      kalarm/mainwindowbase.h
  74. 1
    1
      kalarm/messagewin.cpp
  75. 1
    1
      kalarm/templatedlg.cpp
  76. 1
    1
      kalarm/templatelistview.h
  77. 2
    2
      kalarm/templatemenuaction.cpp
  78. 1
    1
      kalarm/templatemenuaction.h
  79. 2
    2
      kalarm/traywindow.cpp
  80. 3
    3
      kandy/src/kandy.cpp
  81. 1
    1
      kandy/src/kandy.h
  82. 1
    1
      kandy/src/kandyprefsdialog.cpp
  83. 3
    3
      kandy/src/mobilemain.cpp
  84. 1
    1
      kandy/src/mobilemain.h
  85. 1
    1
      karm/CMakeLists.txt
  86. 2
    2
      karm/Makefile.am
  87. 3
    3
      karm/karm_part.cpp
  88. 3
    3
      karm/mainwindow.cpp
  89. 1
    1
      karm/taskview.h
  90. 1
    1
      karm/taskviewwhatsthis.cpp
  91. 1
    1
      karm/taskviewwhatsthis.h
  92. 3
    3
      karm/tdeaccelmenuwatch.cpp
  93. 5
    5
      karm/tdeaccelmenuwatch.h
  94. 2
    2
      karm/tray.cpp
  95. 1
    1
      karm/tray.h
  96. 1
    1
      kgantt/kgantt/KGantt.h
  97. 1
    1
      kgantt/kgantt/xQGanttBarViewPort.cpp
  98. 2
    2
      kgantt/kgantt/xQGanttBarViewPort.h
  99. 2
    2
      kitchensync/src/mainwidget.cpp
  100. 0
    0
      kitchensync/src/mainwindow.cpp

+ 5
- 5
akregator/src/actionmanagerimpl.cpp View File

@@ -23,11 +23,11 @@
23 23
 */
24 24
 
25 25
 #include <tqwidget.h>
26
-#include <kaction.h>
27
-#include <kactioncollection.h>
26
+#include <tdeaction.h>
27
+#include <tdeactioncollection.h>
28 28
 #include <klocale.h>
29
-#include <kpopupmenu.h>
30
-#include <kshortcut.h>
29
+#include <tdepopupmenu.h>
30
+#include <tdeshortcut.h>
31 31
 #include <kxmlguifactory.h>
32 32
 
33 33
 #include <tqmap.h>
@@ -55,7 +55,7 @@
55 55
 #include "treenode.h"
56 56
 #include "treenodevisitor.h"
57 57
 #include "tabwidget.h"
58
-#include "kstdaccel.h"
58
+#include "tdestdaccel.h"
59 59
 
60 60
 
61 61
 

+ 5
- 5
akregator/src/akregator_part.cpp View File

@@ -24,9 +24,9 @@
24 24
 */
25 25
 #include <dcopclient.h>
26 26
 #include <kaboutdata.h>
27
-#include <kaction.h>
28
-#include <kactionclasses.h>
29
-#include <kactioncollection.h>
27
+#include <tdeaction.h>
28
+#include <tdeactionclasses.h>
29
+#include <tdeactioncollection.h>
30 30
 #include <kapplication.h>
31 31
 #include <tdeconfig.h>
32 32
 #include <tdeconfigdialog.h>
@@ -34,11 +34,11 @@
34 34
 #include <kglobalsettings.h>
35 35
 #include <tdehtmldefaults.h>
36 36
 #include <kinstance.h>
37
-#include <kmainwindow.h>
37
+#include <tdemainwindow.h>
38 38
 #include <kmessagebox.h>
39 39
 #include <knotifyclient.h>
40 40
 #include <knotifydialog.h>
41
-#include <kpopupmenu.h>
41
+#include <tdepopupmenu.h>
42 42
 #include <kservice.h>
43 43
 #include <kstandarddirs.h>
44 44
 #include <kstdaction.h>

+ 2
- 2
akregator/src/akregator_view.cpp View File

@@ -58,7 +58,7 @@
58 58
 #include "treenodevisitor.h"
59 59
 #include "notificationmanager.h"
60 60
 
61
-#include <kaction.h>
61
+#include <tdeaction.h>
62 62
 #include <kapplication.h>
63 63
 #include <kcharsets.h>
64 64
 #include <kcombobox.h>
@@ -72,7 +72,7 @@
72 72
 #include <kiconloader.h>
73 73
 #include <kinputdialog.h>
74 74
 #include <klineedit.h>
75
-#include <klistview.h>
75
+#include <tdelistview.h>
76 76
 #include <klocale.h>
77 77
 #include <kmessagebox.h>
78 78
 #include <kpassdlg.h>

+ 1
- 1
akregator/src/articlelistview.h View File

@@ -24,7 +24,7 @@
24 24
 #ifndef AKREGATORARTICLELISTVIEW_H
25 25
 #define AKREGATORARTICLELISTVIEW_H
26 26
 
27
-#include <klistview.h>
27
+#include <tdelistview.h>
28 28
 
29 29
 class TQKeyEvent;
30 30
 class TQDragObject;

+ 1
- 1
akregator/src/articleviewer.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <tqscrollview.h>
28 28
 #include <tqvaluelist.h>
29 29
 
30
-#include <kaction.h>
30
+#include <tdeaction.h>
31 31
 #include <kapplication.h>
32 32
 #include <kdebug.h>
33 33
 #include <kglobalsettings.h>

+ 1
- 1
akregator/src/feeditem.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include "feeditem.h"
28 28
 
29 29
 #include <tqpopupmenu.h>
30
-#include <kaction.h>
30
+#include <tdeaction.h>
31 31
 #include <kdebug.h>
32 32
 #include <kiconloader.h>
33 33
 #include <tqstring.h>

+ 1
- 1
akregator/src/feedlistview.h View File

@@ -24,7 +24,7 @@
24 24
 #ifndef AKREGATORFEEDLISTVIEW_H
25 25
 #define AKREGATORFEEDLISTVIEW_H
26 26
 
27
-#include <klistview.h>
27
+#include <tdelistview.h>
28 28
 #include <kurl.h>
29 29
 
30 30
 namespace Akregator

+ 1
- 1
akregator/src/folderitem.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include "treenode.h"
29 29
 
30 30
 #include <tqpopupmenu.h>
31
-#include <kaction.h>
31
+#include <tdeaction.h>
32 32
 #include <kiconloader.h>
33 33
 
34 34
 namespace Akregator {

+ 1
- 1
akregator/src/frame.cpp View File

@@ -25,7 +25,7 @@
25 25
 #include <tqregexp.h>
26 26
 #include <tqstylesheet.h>
27 27
 
28
-#include <kactioncollection.h>
28
+#include <tdeactioncollection.h>
29 29
 #include <kdebug.h>
30 30
 #include <klocale.h>
31 31
 #include <tdeparts/browserextension.h>

+ 1
- 1
akregator/src/mainwindow.cpp View File

@@ -30,7 +30,7 @@
30 30
 
31 31
 #include <dcopclient.h>
32 32
 
33
-#include <kaction.h>
33
+#include <tdeaction.h>
34 34
 #include <kapplication.h>
35 35
 #include <tdeconfig.h>
36 36
 #include <kdebug.h>

+ 3
- 3
akregator/src/pageviewer.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include "pageviewer.h"
30 30
 #include "viewer.h"
31 31
 
32
-#include <kaction.h>
32
+#include <tdeaction.h>
33 33
 #include <kapplication.h>
34 34
 #include <kbookmark.h>
35 35
 #include <kbookmarkmanager.h>
@@ -39,9 +39,9 @@
39 39
 #include <tdehtmlview.h>
40 40
 #include <kiconloader.h>
41 41
 #include <klocale.h>
42
-#include <kpopupmenu.h>
42
+#include <tdepopupmenu.h>
43 43
 #include <kstandarddirs.h>
44
-#include <kstdaccel.h>
44
+#include <tdestdaccel.h>
45 45
 #include <tdeparts/browserinterface.h>
46 46
 
47 47
 #include <tqclipboard.h>

+ 4
- 4
akregator/src/settings_appearance.ui View File

@@ -238,13 +238,13 @@
238 238
 <includehints>
239 239
     <includehint>knuminput.h</includehint>
240 240
     <includehint>knuminput.h</includehint>
241
-    <includehint>kfontcombo.h</includehint>
241
+    <includehint>tdefontcombo.h</includehint>
242 242
     <includehint>klineedit.h</includehint>
243
-    <includehint>kfontcombo.h</includehint>
243
+    <includehint>tdefontcombo.h</includehint>
244 244
     <includehint>klineedit.h</includehint>
245
-    <includehint>kfontcombo.h</includehint>
245
+    <includehint>tdefontcombo.h</includehint>
246 246
     <includehint>klineedit.h</includehint>
247
-    <includehint>kfontcombo.h</includehint>
247
+    <includehint>tdefontcombo.h</includehint>
248 248
     <includehint>klineedit.h</includehint>
249 249
 </includehints>
250 250
 </UI>

+ 1
- 1
akregator/src/simplenodeselector.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include "treenode.h"
29 29
 #include "treenodevisitor.h"
30 30
 
31
-#include <klistview.h>
31
+#include <tdelistview.h>
32 32
 #include <klocale.h>
33 33
 
34 34
 #include <tqlayout.h>

+ 1
- 1
akregator/src/tabwidget.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <kdebug.h>
39 39
 #include <ktabwidget.h>
40 40
 #include <ktabbar.h>
41
-#include <kpopupmenu.h>
41
+#include <tdepopupmenu.h>
42 42
 #include <krun.h>
43 43
 #include <klocale.h>
44 44
 #include <tdehtmlview.h>

+ 1
- 1
akregator/src/tagaction.cpp View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 #include <kapplication.h>
30 30
 #include <kdebug.h>
31
-#include <kpopupmenu.h>
31
+#include <tdepopupmenu.h>
32 32
 
33 33
 #include <tqmap.h>
34 34
 #include <tqpopupmenu.h>

+ 1
- 1
akregator/src/tagaction.h View File

@@ -25,7 +25,7 @@
25 25
 #ifndef AKREGATOR_TAGACTION_H
26 26
 #define AKREGATOR_TAGACTION_H
27 27
 
28
-#include <kactionclasses.h>
28
+#include <tdeactionclasses.h>
29 29
 
30 30
 class TQString;
31 31
 class TQWidget;

+ 1
- 1
akregator/src/tagfolderitem.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include "treenode.h"
29 29
 
30 30
 #include <tqpopupmenu.h>
31
-#include <kaction.h>
31
+#include <tdeaction.h>
32 32
 #include <kiconloader.h>
33 33
 
34 34
 namespace Akregator {

+ 1
- 1
akregator/src/tagnodeitem.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include "tagnodeitem.h"
28 28
 #include "treenode.h"
29 29
 
30
-#include <kaction.h>
30
+#include <tdeaction.h>
31 31
 #include <kiconloader.h>
32 32
 
33 33
 #include <tqpoint.h>

+ 1
- 1
akregator/src/trayicon.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <kglobalsettings.h>
34 34
 #include <dcopclient.h>
35 35
 #include <dcopref.h>
36
-#include <kpopupmenu.h>
36
+#include <tdepopupmenu.h>
37 37
 #include <kiconloader.h>
38 38
 
39 39
 #include <tqbitmap.h>

+ 1
- 1
akregator/src/treenodeitem.h View File

@@ -25,7 +25,7 @@
25 25
 #ifndef AKREGATORTREENODEITEM_H
26 26
 #define AKREGATORTREENODEITEM_H
27 27
 
28
-#include <klistview.h>
28
+#include <tdelistview.h>
29 29
 
30 30
 class TQPoint;
31 31
 class TQString;

+ 2
- 2
akregator/src/viewer.cpp View File

@@ -23,14 +23,14 @@
23 23
     without including the source code for TQt in the source distribution.
24 24
 */
25 25
 
26
-#include <kaction.h>
26
+#include <tdeaction.h>
27 27
 #include <kapplication.h>
28 28
 #include <tdefiledialog.h>
29 29
 #include <tdehtmlview.h>
30 30
 #include <kiconloader.h>
31 31
 #include <klocale.h>
32 32
 #include <kmessagebox.h>
33
-#include <kpopupmenu.h>
33
+#include <tdepopupmenu.h>
34 34
 #include <kprocess.h>
35 35
 #include <krun.h>
36 36
 #include <kshell.h>

+ 3
- 3
certmanager/certmanager.cpp View File

@@ -73,12 +73,12 @@
73 73
 // KDE
74 74
 #include <tdefiledialog.h>
75 75
 #include <kprocess.h>
76
-#include <kaction.h>
76
+#include <tdeaction.h>
77 77
 #include <kapplication.h>
78 78
 #include <klocale.h>
79 79
 #include <kmessagebox.h>
80 80
 #include <dcopclient.h>
81
-#include <ktoolbar.h>
81
+#include <tdetoolbar.h>
82 82
 #include <kstatusbar.h>
83 83
 #include <kstandarddirs.h>
84 84
 #include <kdebug.h>
@@ -87,7 +87,7 @@
87 87
 #include <ktempfile.h>
88 88
 #include <tdeio/job.h>
89 89
 #include <tdeio/netaccess.h>
90
-#include <kstdaccel.h>
90
+#include <tdestdaccel.h>
91 91
 
92 92
 // TQt
93 93
 #include <tqfontmetrics.h>

+ 1
- 1
certmanager/certmanager.h View File

@@ -35,7 +35,7 @@
35 35
 
36 36
 //#include <gpgme.h>
37 37
 
38
-#include <kmainwindow.h>
38
+#include <tdemainwindow.h>
39 39
 #include <tdepimmacros.h>
40 40
 #include <kurl.h>
41 41
 #include <tqcstring.h>

+ 2
- 2
certmanager/conf/appearanceconfigwidget.cpp View File

@@ -40,13 +40,13 @@
40 40
 #include <kleo/cryptobackendfactory.h>
41 41
 #include <kleo/keyfiltermanager.h>
42 42
 
43
-#include <klistview.h>
43
+#include <tdelistview.h>
44 44
 #include <tdeconfig.h>
45 45
 #include <kdialog.h>
46 46
 #include <klocale.h>
47 47
 #include <kdebug.h>
48 48
 #include <kmessagebox.h>
49
-#include <kfontdialog.h>
49
+#include <tdefontdialog.h>
50 50
 #include <kcolordialog.h>
51 51
 
52 52
 #include <tqpushbutton.h>

+ 1
- 1
certmanager/customactions.cpp View File

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include "customactions.h"
34 34
 
35
-#include <ktoolbar.h>
35
+#include <tdetoolbar.h>
36 36
 #include <kapplication.h>
37 37
 
38 38
 #include <tqlineedit.h>

+ 1
- 1
certmanager/customactions.h View File

@@ -33,7 +33,7 @@
33 33
 #ifndef __CUSTOMACTIONS_H__
34 34
 #define __CUSTOMACTIONS_H__
35 35
 
36
-#include <kaction.h>
36
+#include <tdeaction.h>
37 37
 
38 38
 #include <tqstringlist.h>
39 39
 

+ 1
- 1
certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp View File

@@ -41,7 +41,7 @@
41 41
 #include <kmessagebox.h>
42 42
 #include <klocale.h>
43 43
 #include <kapplication.h>
44
-#include <kaction.h>
44
+#include <tdeaction.h>
45 45
 #include <kstdaction.h>
46 46
 #include <kprocio.h>
47 47
 #include <tdeconfig.h>

+ 1
- 1
certmanager/kwatchgnupg/kwatchgnupgmainwin.h View File

@@ -33,7 +33,7 @@
33 33
 #ifndef KWATCHGNUPGMAINWIN_H
34 34
 #define KWATCHGNUPGMAINWIN_H
35 35
 
36
-#include <kmainwindow.h>
36
+#include <tdemainwindow.h>
37 37
 
38 38
 class KWatchGnuPGTray;
39 39
 class KWatchGnuPGConfig;

+ 2
- 2
certmanager/lib/ui/backendconfigwidget.cpp View File

@@ -41,7 +41,7 @@
41 41
 #include "kleo/cryptobackendfactory.h"
42 42
 #include "ui/keylistview.h" // for lvi_cast<>
43 43
 
44
-#include <klistview.h>
44
+#include <tdelistview.h>
45 45
 #include <kdialog.h>
46 46
 #include <klocale.h>
47 47
 #include <kdebug.h>
@@ -108,7 +108,7 @@ private:
108 108
 };
109 109
 
110 110
 
111
-// Checklist item under a BackendListViewItem
111
+// Chectdelist item under a BackendListViewItem
112 112
 // (e.g. "GpgME supports protocol OpenPGP")
113 113
 class Kleo::ProtocolCheckListItem : public TQCheckListItem
114 114
 {

+ 1
- 1
certmanager/lib/ui/cryptoconfigdialog.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include "cryptoconfigdialog.h"
33 33
 #include "cryptoconfigmodule.h"
34 34
 #include <klocale.h>
35
-#include <kaccelmanager.h>
35
+#include <tdeaccelmanager.h>
36 36
 
37 37
 Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name )
38 38
   : KDialogBase( Swallow,

+ 1
- 1
certmanager/lib/ui/keylistview.h View File

@@ -33,7 +33,7 @@
33 33
 #ifndef __KLEO_KEYLISTVIEW_H__
34 34
 #define __KLEO_KEYLISTVIEW_H__
35 35
 
36
-#include <klistview.h>
36
+#include <tdelistview.h>
37 37
 
38 38
 #include <gpgmepp/key.h>
39 39
 #include <tdepimmacros.h>

+ 1
- 1
kaddressbook/CMakeLists.txt View File

@@ -75,7 +75,7 @@ tde_add_kpart( libkaddressbookpart AUTOMOC
75 75
 ##### kaddressbook (executable) #################
76 76
 
77 77
 tde_add_executable( kaddressbook AUTOMOC
78
-  SOURCES main.cpp kaddressbookmain.cpp
78
+  SOURCES main.cpp kaddressbootdemain.cpp
79 79
   LINK kaddressbook-shared
80 80
   DESTINATION ${BIN_INSTALL_DIR}
81 81
 )

+ 1
- 1
kaddressbook/Makefile.am View File

@@ -16,7 +16,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
16 16
 
17 17
 bin_PROGRAMS = kaddressbook
18 18
 
19
-kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
19
+kaddressbook_SOURCES = main.cpp kaddressbootdemain.cpp
20 20
 kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
21 21
 kaddressbook_LDADD = libkaddressbook.la
22 22
 

+ 2
- 2
kaddressbook/addresseditwidget.cpp View File

@@ -36,7 +36,7 @@
36 36
 #include <tqtoolbutton.h>
37 37
 #include <tqtooltip.h>
38 38
 
39
-#include <kaccelmanager.h>
39
+#include <tdeaccelmanager.h>
40 40
 #include <kactivelabel.h>
41 41
 #include <kapplication.h>
42 42
 #include <kbuttonbox.h>
@@ -47,7 +47,7 @@
47 47
 #include <kiconloader.h>
48 48
 #include <kinputdialog.h>
49 49
 #include <klineedit.h>
50
-#include <klistview.h>
50
+#include <tdelistview.h>
51 51
 #include <klocale.h>
52 52
 #include <kmessagebox.h>
53 53
 #include <kseparator.h>

+ 1
- 1
kaddressbook/addresseeeditorwidget.cpp View File

@@ -34,7 +34,7 @@
34 34
 
35 35
 #include <kabc/resource.h>
36 36
 #include <kabc/stdaddressbook.h>
37
-#include <kaccelmanager.h>
37
+#include <tdeaccelmanager.h>
38 38
 #include <kapplication.h>
39 39
 #include <tdeconfig.h>
40 40
 #include <kcombobox.h>

+ 1
- 1
kaddressbook/customfieldswidget.cpp View File

@@ -30,7 +30,7 @@
30 30
 #include <tqvalidator.h>
31 31
 #include <tqspinbox.h>
32 32
 
33
-#include <kaccelmanager.h>
33
+#include <tdeaccelmanager.h>
34 34
 #include <kcombobox.h>
35 35
 #include <kinputdialog.h>
36 36
 #include <klineedit.h>

+ 1
- 1
kaddressbook/distributionlistpicker.cpp View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include <kapplication.h>
33 33
 #include <kinputdialog.h>
34
-#include <klistbox.h>
34
+#include <tdelistbox.h>
35 35
 #include <klocale.h>
36 36
 #include <kmessagebox.h>
37 37
 

+ 1
- 1
kaddressbook/editors/imeditorbase.ui View File

@@ -158,7 +158,7 @@
158 158
     <includehint>kpushbutton.h</includehint>
159 159
     <includehint>kpushbutton.h</includehint>
160 160
     <includehint>kpushbutton.h</includehint>
161
-    <includehint>klistview.h</includehint>
161
+    <includehint>tdelistview.h</includehint>
162 162
     <includehint>kactivelabel.h</includehint>
163 163
 </includehints>
164 164
 </UI>

+ 1
- 1
kaddressbook/editors/imeditorwidget.h View File

@@ -26,7 +26,7 @@
26 26
 #define IMEDITORWIDGET_H
27 27
 
28 28
 #include <tqvaluelist.h>
29
-#include <klistview.h>
29
+#include <tdelistview.h>
30 30
 #include <kdialogbase.h>
31 31
 
32 32
 #include "contacteditorwidget.h"

+ 1
- 1
kaddressbook/emaileditwidget.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <tqtoolbutton.h>
32 32
 #include <tqtooltip.h>
33 33
 
34
-#include <kaccelmanager.h>
34
+#include <tdeaccelmanager.h>
35 35
 #include <tdeconfig.h>
36 36
 #include <kcombobox.h>
37 37
 #include <kdebug.h>

+ 1
- 1
kaddressbook/extensionmanager.cpp View File

@@ -21,7 +21,7 @@
21 21
     without including the source code for TQt in the source distribution.
22 22
 */
23 23
 
24
-#include <kactionclasses.h>
24
+#include <tdeactionclasses.h>
25 25
 #include <tdeconfig.h>
26 26
 #include <kdebug.h>
27 27
 #include <klocale.h>

+ 2
- 2
kaddressbook/features/distributionlistngwidget.cpp View File

@@ -31,9 +31,9 @@
31 31
 
32 32
 #include <kdialog.h>
33 33
 #include <kiconloader.h>
34
-#include <klistview.h>
34
+#include <tdelistview.h>
35 35
 #include <klocale.h>
36
-#include <kpopupmenu.h>
36
+#include <tdepopupmenu.h>
37 37
 
38 38
 #include <tqevent.h>
39 39
 #include <tqguardedptr.h>

+ 1
- 1
kaddressbook/features/distributionlistngwidget.h View File

@@ -27,7 +27,7 @@
27 27
 
28 28
 #include <kabc/addressee.h>
29 29
 
30
-#include <klistbox.h>
30
+#include <tdelistbox.h>
31 31
 
32 32
 #include <tqstringlist.h>
33 33
 

+ 1
- 1
kaddressbook/features/distributionlistwidget.cpp View File

@@ -30,7 +30,7 @@
30 30
 #include <tqpushbutton.h>
31 31
 #include <tqradiobutton.h>
32 32
 
33
-#include <kaccelmanager.h>
33
+#include <tdeaccelmanager.h>
34 34
 #include <tdeconfig.h>
35 35
 #include <kdebug.h>
36 36
 #include <kglobal.h>

+ 1
- 1
kaddressbook/features/distributionlistwidget.h View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include <config.h> // for TDEPIM_NEW_DISTRLISTS
28 28
 #include <kdialogbase.h>
29
-#include <klistview.h>
29
+#include <tdelistview.h>
30 30
 
31 31
 #include "extensionwidget.h"
32 32
 

+ 1
- 1
kaddressbook/features/resourceselection.h View File

@@ -24,7 +24,7 @@
24 24
 #ifndef RESOURCESELECTION_H
25 25
 #define RESOURCESELECTION_H
26 26
 
27
-#include <klistview.h>
27
+#include <tdelistview.h>
28 28
 
29 29
 #include "extensionwidget.h"
30 30
 

+ 2
- 2
kaddressbook/filtereditdialog.cpp View File

@@ -38,8 +38,8 @@
38 38
 #include <kdebug.h>
39 39
 #include <kiconloader.h>
40 40
 #include <klineedit.h>
41
-#include <klistbox.h>
42
-#include <klistview.h>
41
+#include <tdelistbox.h>
42
+#include <tdelistview.h>
43 43
 #include <klocale.h>
44 44
 
45 45
 #include "kabprefs.h"

+ 1
- 1
kaddressbook/geowidget.cpp View File

@@ -22,7 +22,7 @@
22 22
 */
23 23
 
24 24
 #include <kabc/geo.h>
25
-#include <kaccelmanager.h>
25
+#include <tdeaccelmanager.h>
26 26
 #include <kcombobox.h>
27 27
 #include <kdebug.h>
28 28
 #include <kiconloader.h>

+ 1
- 1
kaddressbook/imeditwidget.cpp View File

@@ -30,7 +30,7 @@
30 30
 #include <tqtoolbutton.h>
31 31
 #include <tqtooltip.h>
32 32
 
33
-#include <kaccelmanager.h>
33
+#include <tdeaccelmanager.h>
34 34
 #include <tdeconfig.h>
35 35
 #include <kcombobox.h>
36 36
 #include <kdebug.h>

+ 1
- 1
kaddressbook/interfaces/xxport.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include <tqmap.h>
25 25
 #include <tqsignalmapper.h>
26 26
 
27
-#include <kaction.h>
27
+#include <tdeaction.h>
28 28
 #include <kinstance.h>
29 29
 #include <kmessagebox.h>
30 30
 #include <kapplication.h>

+ 3
- 3
kaddressbook/kabcore.cpp View File

@@ -44,10 +44,10 @@
44 44
 #include <kabc/vcardconverter.h>
45 45
 #include <kabc/resourcefile.h>
46 46
 #include <kaboutdata.h>
47
-#include <kaccelmanager.h>
47
+#include <tdeaccelmanager.h>
48 48
 #include <kapplication.h>
49 49
 #include <dcopclient.h>
50
-#include <kactionclasses.h>
50
+#include <tdeactionclasses.h>
51 51
 #include <kcmdlineargs.h>
52 52
 #include <kcmultidialog.h>
53 53
 #include <kdebug.h>
@@ -63,7 +63,7 @@
63 63
 #include <kstatusbar.h>
64 64
 #include <kstdguiitem.h>
65 65
 #include <kxmlguiclient.h>
66
-#include <ktoolbar.h>
66
+#include <tdetoolbar.h>
67 67
 #include <libtdepim/addresseeview.h>
68 68
 #include <libtdepim/categoryeditdialog.h>
69 69
 #include <libtdepim/categoryselectdialog.h>

+ 1
- 1
kaddressbook/kaddressbook_part.cpp View File

@@ -23,7 +23,7 @@
23 23
 
24 24
 #include <tqlayout.h>
25 25
 
26
-#include <kaction.h>
26
+#include <tdeaction.h>
27 27
 #include <kapplication.h>
28 28
 #include <kdebug.h>
29 29
 #include <kiconloader.h>

+ 2
- 2
kaddressbook/kaddressbootdemain.cpp View File

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include "kabcore.h"
34 34
 
35
-#include "kaddressbookmain.h"
35
+#include "kaddressbootdemain.h"
36 36
 
37 37
 KAddressBookMain::KAddressBookMain( const TQString &file )
38 38
   : DCOPObject( "KAddressBookIface" ), TDEMainWindow( 0 )
@@ -189,4 +189,4 @@ void KAddressBookMain::newToolbarConfig()
189 189
   applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
190 190
 }
191 191
 
192
-#include "kaddressbookmain.moc"
192
+#include "kaddressbootdemain.moc"

+ 2
- 2
kaddressbook/kaddressbootdemain.h View File

@@ -26,9 +26,9 @@
26 26
 
27 27
 #include <tqptrlist.h>
28 28
 
29
-#include <kaction.h>
29
+#include <tdeaction.h>
30 30
 #include <kapplication.h>
31
-#include <kmainwindow.h>
31
+#include <tdemainwindow.h>
32 32
 
33 33
 #include "kaddressbookiface.h"
34 34
 

+ 1
- 1
kaddressbook/kcmconfigs/addhostdialog.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <tqspinbox.h>
28 28
 #include <tqtooltip.h>
29 29
 
30
-#include <kaccelmanager.h>
30
+#include <tdeaccelmanager.h>
31 31
 #include <kbuttonbox.h>
32 32
 #include <klineedit.h>
33 33
 #include <klocale.h>

+ 1
- 1
kaddressbook/kcmconfigs/kabconfigwidget.cpp View File

@@ -35,7 +35,7 @@
35 35
 #include <tdeconfig.h>
36 36
 #include <kdebug.h>
37 37
 #include <kdialog.h>
38
-#include <klistview.h>
38
+#include <tdelistview.h>
39 39
 #include <klocale.h>
40 40
 #include <kmessagebox.h>
41 41
 #include <ktrader.h>

+ 1
- 1
kaddressbook/kcmconfigs/ldapoptionswidget.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <kapplication.h>
33 33
 #include <kbuttonbox.h>
34 34
 #include <tdeconfig.h>
35
-#include <klistview.h>
35
+#include <tdelistview.h>
36 36
 #include <klocale.h>
37 37
 
38 38
 #include "addhostdialog.h"

+ 1
- 1
kaddressbook/main.cpp View File

@@ -36,7 +36,7 @@
36 36
 #include <kuniqueapplication.h>
37 37
 #include <twin.h>
38 38
 
39
-#include "kaddressbookmain.h"
39
+#include "kaddressbootdemain.h"
40 40
 #include "kaddressbook_options.h"
41 41
 #include "kabcore.h"
42 42
 

+ 2
- 2
kaddressbook/nameeditdialog.cpp View File

@@ -31,12 +31,12 @@
31 31
 #include <tqstring.h>
32 32
 #include <tqwhatsthis.h>
33 33
 
34
-#include <kaccelmanager.h>
34
+#include <tdeaccelmanager.h>
35 35
 #include <kapplication.h>
36 36
 #include <kbuttonbox.h>
37 37
 #include <tdeconfig.h>
38 38
 #include <klineedit.h>
39
-#include <klistview.h>
39
+#include <tdelistview.h>
40 40
 #include <kcombobox.h>
41 41
 #include <klocale.h>
42 42
 #include <kdebug.h>

+ 1
- 1
kaddressbook/phoneeditwidget.cpp View File

@@ -39,7 +39,7 @@
39 39
 #include <kdebug.h>
40 40
 #include <kiconloader.h>
41 41
 #include <klineedit.h>
42
-#include <klistview.h>
42
+#include <tdelistview.h>
43 43
 #include <klocale.h>
44 44
 
45 45
 #include <kabc/phonenumber.h>

+ 1
- 1
kaddressbook/printing/detailledstyle.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <tdeconfig.h>
28 28
 #include <kdebug.h>
29 29
 #include <kdialog.h>
30
-#include <kfontcombo.h>
30
+#include <tdefontcombo.h>
31 31
 #include <kglobalsettings.h>
32 32
 #include <tqlayout.h>
33 33
 #include <klocale.h>

+ 1
- 1
kaddressbook/viewmanager.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <libtdepim/kvcarddrag.h>
29 29
 #include <kabc/addressbook.h>
30 30
 #include <kabc/vcardconverter.h>
31
-#include <kactionclasses.h>
31
+#include <tdeactionclasses.h>
32 32
 #include <tdeconfig.h>
33 33
 #include <kdebug.h>
34 34
 #include <tdeversion.h>

+ 1
- 1
kaddressbook/views/colorlistbox.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef _COLOR_LISTBOX_H_
22 22
 #define _COLOR_LISTBOX_H_
23 23
 
24
-#include <klistbox.h>
24
+#include <tdelistbox.h>
25 25
 
26 26
 class ColorListBox : public TDEListBox
27 27
 {

+ 1
- 1
kaddressbook/views/configurecardviewdialog.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <klocale.h>
38 38
 #include <kiconloader.h>
39 39
 #include <tdeconfig.h>
40
-#include <kfontdialog.h>
40
+#include <tdefontdialog.h>
41 41
 #include <kpushbutton.h>
42 42
 
43 43
 #include "colorlistbox.h"

+ 1
- 1
kaddressbook/views/contactlistview.h View File

@@ -29,7 +29,7 @@
29 29
 #include <tqtooltip.h>
30 30
 #include <tqstring.h>
31 31
 
32
-#include <klistview.h>
32
+#include <tdelistview.h>
33 33
 
34 34
 #include <kabc/field.h>
35 35
 

+ 1
- 1
kalarm/birthdaydlg.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <kglobal.h>
32 32
 #include <tdeconfig.h>
33 33
 #include <kmessagebox.h>
34
-#include <kaccel.h>
34
+#include <tdeaccel.h>
35 35
 #include <kabc/addressbook.h>
36 36
 #include <kabc/stdaddressbook.h>
37 37
 #include <kdebug.h>

+ 1
- 1
kalarm/birthdaydlg.h View File

@@ -21,7 +21,7 @@
21 21
 #define BIRTHDAYDLG_H
22 22
 
23 23
 #include <tqlineedit.h>
24
-#include <klistview.h>
24
+#include <tdelistview.h>
25 25
 #include <kdialogbase.h>
26 26
 
27 27
 #include "alarmevent.h"

+ 1
- 1
kalarm/daemon.h View File

@@ -23,7 +23,7 @@
23 23
 
24 24
 #include <tqobject.h>
25 25
 #include <tqdatetime.h>
26
-#include <kaction.h>
26
+#include <tdeaction.h>
27 27
 
28 28
 #include <kalarmd/kalarmd.h>
29 29
 #include <kalarmd/alarmguiiface.h>

+ 1
- 1
kalarm/eventlistviewbase.h View File

@@ -24,7 +24,7 @@
24 24
 #include "kalarm.h"
25 25
 
26 26
 #include <tqvaluelist.h>
27
-#include <klistview.h>
27
+#include <tdelistview.h>
28 28
 
29 29
 #include "alarmevent.h"
30 30
 

+ 1
- 1
kalarm/fontcolour.h View File

@@ -24,7 +24,7 @@
24 24
 #include <tdeversion.h>
25 25
 #include <tqwidget.h>
26 26
 #include <tqstringlist.h>
27
-#include <kfontdialog.h>
27
+#include <tdefontdialog.h>
28 28
 #include "colourlist.h"
29 29
 
30 30
 class ColourCombo;

+ 2
- 2
kalarm/functions.cpp View File

@@ -39,11 +39,11 @@
39 39
 #include <tqregexp.h>
40 40
 
41 41
 #include <tdeconfig.h>
42
-#include <kaction.h>
42
+#include <tdeaction.h>
43 43
 #include <kglobal.h>
44 44
 #include <klocale.h>
45 45
 #include <kstdguiitem.h>
46
-#include <kstdaccel.h>
46
+#include <tdestdaccel.h>
47 47
 #include <kmessagebox.h>
48 48
 #include <tdefiledialog.h>
49 49
 #include <dcopclient.h>

+ 5
- 5
kalarm/mainwindow.cpp View File

@@ -25,11 +25,11 @@
25 25
 #include <tqheader.h>
26 26
 
27 27
 #include <kmenubar.h>
28
-#include <ktoolbar.h>
29
-#include <kpopupmenu.h>
30
-#include <kaccel.h>
31
-#include <kaction.h>
32
-#include <kactionclasses.h>
28
+#include <tdetoolbar.h>
29
+#include <tdepopupmenu.h>
30
+#include <tdeaccel.h>
31
+#include <tdeaction.h>
32
+#include <tdeactionclasses.h>
33 33
 #include <kstdaction.h>
34 34
 #include <kiconloader.h>
35 35
 #include <kmessagebox.h>

+ 1
- 1
kalarm/mainwindowbase.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef MAINWINDOWBASE_H
22 22
 #define MAINWINDOWBASE_H
23 23
 
24
-#include <kmainwindow.h>
24
+#include <tdemainwindow.h>
25 25
 
26 26
 
27 27
 /**

+ 1
- 1
kalarm/messagewin.cpp View File

@@ -35,7 +35,7 @@
35 35
 #include <tqtimer.h>
36 36
 
37 37
 #include <kstandarddirs.h>
38
-#include <kaction.h>
38
+#include <tdeaction.h>
39 39
 #include <kstdguiitem.h>
40 40
 #include <kaboutdata.h>
41 41
 #include <klocale.h>

+ 1
- 1
kalarm/templatedlg.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <klocale.h>
28 28
 #include <kguiitem.h>
29 29
 #include <kmessagebox.h>
30
-#include <kaccel.h>
30
+#include <tdeaccel.h>
31 31
 #include <kdebug.h>
32 32
 
33 33
 #include "editdlg.h"

+ 1
- 1
kalarm/templatelistview.h View File

@@ -24,7 +24,7 @@
24 24
 #include "kalarm.h"
25 25
 
26 26
 #include <tqmap.h>
27
-#include <klistview.h>
27
+#include <tdelistview.h>
28 28
 
29 29
 #include "eventlistviewbase.h"
30 30
 

+ 2
- 2
kalarm/templatemenuaction.cpp View File

@@ -20,8 +20,8 @@
20 20
 
21 21
 #include "kalarm.h"
22 22
 
23
-#include <kactionclasses.h>
24
-#include <kpopupmenu.h>
23
+#include <tdeactionclasses.h>
24
+#include <tdepopupmenu.h>
25 25
 #include <kdebug.h>
26 26
 
27 27
 #include "alarmcalendar.h"

+ 1
- 1
kalarm/templatemenuaction.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef TEMPLATEMENUACTION_H
22 22
 #define TEMPLATEMENUACTION_H
23 23
 
24
-#include <kactionclasses.h>
24
+#include <tdeactionclasses.h>
25 25
 class KAEvent;
26 26
 
27 27
 

+ 2
- 2
kalarm/traywindow.cpp View File

@@ -27,12 +27,12 @@
27 27
 #include <kapplication.h>
28 28
 #include <klocale.h>
29 29
 #include <kaboutdata.h>
30
-#include <kpopupmenu.h>
30
+#include <tdepopupmenu.h>
31 31
 #include <kmessagebox.h>
32 32
 #include <kstandarddirs.h>
33 33
 #include <kstdaction.h>
34 34
 #include <kstdguiitem.h>
35
-#include <kaccel.h>
35
+#include <tdeaccel.h>
36 36
 #include <tdeconfig.h>
37 37
 #include <kdebug.h>
38 38
 

+ 3
- 3
kandy/src/kandy.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <kiconloader.h>
34 34
 #include <kmenubar.h>
35 35
 #include <kkeydialog.h>
36
-#include <kaccel.h>
36
+#include <tdeaccel.h>
37 37
 #include <tdeio/netaccess.h>
38 38
 #include <tdefiledialog.h>
39 39
 #include <tdeconfig.h>
@@ -43,8 +43,8 @@
43 43
 #include <kmessagebox.h>
44 44
 #include <kstandarddirs.h>
45 45
 #include <kedittoolbar.h>
46
-#include <kstdaccel.h>
47
-#include <kaction.h>
46
+#include <tdestdaccel.h>
47
+#include <tdeaction.h>
48 48
 #include <kstdaction.h>
49 49
 #include <kurldrag.h>
50 50
 

+ 1
- 1
kandy/src/kandy.h View File

@@ -29,7 +29,7 @@
29 29
 #endif 
30 30
 
31 31
 #include <kapplication.h>
32
-#include <kmainwindow.h>
32
+#include <tdemainwindow.h>
33 33
  
34 34
 #include "kandyview.h"
35 35
 

+ 1
- 1
kandy/src/kandyprefsdialog.cpp View File

@@ -41,7 +41,7 @@
41 41
 #include <kdebug.h>
42 42
 #include <klocale.h>
43 43
 #include <kglobal.h>
44
-#include <kfontdialog.h>
44
+#include <tdefontdialog.h>
45 45
 #include <kstandarddirs.h>
46 46
 #include <kmessagebox.h>
47 47
 #include <kcolordialog.h>

+ 3
- 3
kandy/src/mobilemain.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <kiconloader.h>
28 28
 #include <kmenubar.h>
29 29
 #include <kkeydialog.h>
30
-#include <kaccel.h>
30
+#include <tdeaccel.h>
31 31
 #include <tdeconfig.h>
32 32
 #include <kdebug.h>
33 33
 #include <kmessagebox.h>
@@ -35,8 +35,8 @@
35 35
 #include <kedittoolbar.h>
36 36
 #include <kurldrag.h>
37 37
 
38
-#include <kstdaccel.h>
39
-#include <kaction.h>
38
+#include <tdestdaccel.h>
39
+#include <tdeaction.h>
40 40
 #include <kstdaction.h>
41 41
 
42 42
 #include <tqpushbutton.h>

+ 1
- 1
kandy/src/mobilemain.h View File

@@ -29,7 +29,7 @@
29 29
 #endif
30 30
 
31 31
 #include <kapplication.h>
32
-#include <kmainwindow.h>
32
+#include <tdemainwindow.h>
33 33
 
34 34
 #include "kandyprefs.h"
35 35
 

+ 1
- 1
karm/CMakeLists.txt View File

@@ -48,7 +48,7 @@ install( FILES karmui.rc DESTINATION ${DATA_INSTALL_DIR}/karmpart )
48 48
 
49 49
 tde_add_library( karm SHARED AUTOMOC
50 50
   SOURCES
51
-    kaccelmenuwatch.cpp desktoptracker.cpp edittaskdialog.cpp
51
+    tdeaccelmenuwatch.cpp desktoptracker.cpp edittaskdialog.cpp
52 52
     idletimedetector.cpp printdialog.cpp timekard.cpp karmutility.cpp
53 53
     ktimewidget.cpp karmstorage.cpp mainwindow.cpp preferences.cpp
54 54
     print.cpp task.cpp taskview.cpp tray.cpp csvexportdialog_base.ui

+ 2
- 2
karm/Makefile.am View File

@@ -11,7 +11,7 @@ COMPILE_BEFORE_karm = libtdepim tderesources
11 11
 
12 12
 noinst_LTLIBRARIES = libkarm_shared.la
13 13
 
14
-libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \
14
+libkarm_shared_la_SOURCES = tdeaccelmenuwatch.cpp desktoptracker.cpp \
15 15
                 edittaskdialog.cpp idletimedetector.cpp \
16 16
                 printdialog.cpp timekard.cpp karmutility.cpp ktimewidget.cpp \
17 17
                 karmstorage.cpp mainwindow.cpp preferences.cpp print.cpp \
@@ -25,7 +25,7 @@ karm_SOURCES = main.cpp
25 25
 karm_LDADD = libkarm_shared.la 
26 26
 karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
27 27
 noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
28
-                 idletimedetector.h kaccelmenuwatch.h timekard.h \
28
+                 idletimedetector.h tdeaccelmenuwatch.h timekard.h \
29 29
 		 karmutility.h ktimewidget.h karmstorage.h mainwindow.h \
30 30
 		 preferences.h print.h task.h taskview.h toolicons.h \
31 31
 		 tray.h version.h csvexportdialog.h plannerparser.h taskviewwhatsthis.h

+ 3
- 3
karm/karm_part.cpp View File

@@ -1,15 +1,15 @@
1 1
 
2
-#include "kaccelmenuwatch.h"
2
+#include "tdeaccelmenuwatch.h"
3 3
 #include "karm_part.h"
4 4
 #include "karmerrors.h"
5 5
 #include "task.h"
6 6
 #include "preferences.h"
7 7
 #include "tray.h"
8 8
 #include "version.h"
9
-#include <kaccel.h>
9
+#include <tdeaccel.h>
10 10
 
11 11
 #include <kinstance.h>
12
-#include <kaction.h>
12
+#include <tdeaction.h>
13 13
 #include <kstdaction.h>
14 14
 #include <tdefiledialog.h>
15 15
 #include <kglobal.h>

+ 3
- 3
karm/mainwindow.cpp View File

@@ -5,10 +5,10 @@
5 5
 
6 6
 #include <numeric>
7 7
 
8
-#include "kaccelmenuwatch.h"
8
+#include "tdeaccelmenuwatch.h"
9 9
 #include <dcopclient.h>
10
-#include <kaccel.h>
11
-#include <kaction.h>
10
+#include <tdeaccel.h>
11
+#include <tdeaction.h>
12 12
 #include <kapplication.h>       // kapp
13 13
 #include <tdeconfig.h>
14 14
 #include <kdebug.h>

+ 1
- 1
karm/taskview.h View File

@@ -5,7 +5,7 @@
5 5
 #include <tqptrlist.h>
6 6
 #include <tqptrstack.h>
7 7
 
8
-#include <klistview.h>
8
+#include <tdelistview.h>
9 9
 
10 10
 #include "desktoplist.h"
11 11
 #include "resourcecalendar.h"

+ 1
- 1
karm/taskviewwhatsthis.cpp View File

@@ -11,7 +11,7 @@
11 11
 //
12 12
 #include "taskviewwhatsthis.h"
13 13
 #include <kdebug.h>
14
-#include <klistview.h>
14
+#include <tdelistview.h>
15 15
 #include <klocale.h>
16 16
 
17 17
 TaskViewWhatsThis::TaskViewWhatsThis( TQWidget* qw )

+ 1
- 1
karm/taskviewwhatsthis.h View File

@@ -11,7 +11,7 @@
11 11
 #define TASKVIEWWHATSTHIS_H
12 12
 
13 13
 #include <tqwhatsthis.h>
14
-#include <klistview.h>
14
+#include <tdelistview.h>
15 15
 
16 16
 /**
17 17
 this is the karm-taskview-specific implementation of qwhatsthis

+ 3
- 3
karm/tdeaccelmenuwatch.cpp View File

@@ -1,5 +1,5 @@
1 1
 /*
2
-* kaccelmenuwatch.cpp -- Implementation of class TDEAccelMenuWatch.
2
+* tdeaccelmenuwatch.cpp -- Implementation of class TDEAccelMenuWatch.
3 3
 * Author:    Sirtaj Singh Kang
4 4
 * Generated: Thu Jan  7 15:05:26 EST 1999
5 5
 */
@@ -7,7 +7,7 @@
7 7
 #include <assert.h>
8 8
 #include <tqpopupmenu.h>
9 9
 
10
-#include "kaccelmenuwatch.h"
10
+#include "tdeaccelmenuwatch.h"
11 11
 
12 12
 TDEAccelMenuWatch::TDEAccelMenuWatch( TDEAccel *accel, TQObject *parent )
13 13
   : TQObject( parent ),
@@ -110,4 +110,4 @@ TDEAccelMenuWatch::AccelItem *TDEAccelMenuWatch::newAccelItem( TQPopupMenu *,
110 110
   return item;
111 111
 }
112 112
 
113
-#include "kaccelmenuwatch.moc"
113
+#include "tdeaccelmenuwatch.moc"

+ 5
- 5
karm/tdeaccelmenuwatch.h View File

@@ -1,5 +1,5 @@
1 1
 /*
2
-* kaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch.
2
+* tdeaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch.
3 3
 * Generated by newclass on Thu Jan  7 15:05:26 EST 1999.
4 4
 */
5 5
 #ifndef KARM_K_ACCEL_MENU_WATCH_H
@@ -8,7 +8,7 @@
8 8
 #include <tqobject.h>
9 9
 #include <tqptrlist.h>
10 10
 
11
-#include <kaccel.h>
11
+#include <tdeaccel.h>
12 12
 
13 13
 class TQPopupMenu;
14 14
 
@@ -19,8 +19,8 @@ class TQPopupMenu;
19 19
  * is connected, we normally have to manually call 
20 20
  * TDEAccel::changeMenuAccel() again for each update of the TDEAccel object.
21 21
  *
22
- * With TDEAccelMenuWatch you provide the kaccel object and the menu
23
- * items to which it connects, and if you update the kaccel you just have
22
+ * With TDEAccelMenuWatch you provide the tdeaccel object and the menu
23
+ * items to which it connects, and if you update the tdeaccel you just have
24 24
  * to call TDEAccelMenuWatch::updateMenus() and the menu items will be updated.
25 25
  *
26 26
  * It is safe to delete menus that have connections handled by this class.
@@ -99,7 +99,7 @@ class TDEAccelMenuWatch : public TQObject
99 99
   public slots:
100 100
     /** 
101 101
      * Updates all menu accelerators. Call this after all accelerators
102
-     * have been connected or the kaccel object has been updated.
102
+     * have been connected or the tdeaccel object has been updated.
103 103
      */
104 104
     void updateMenus();
105 105
 

+ 2
- 2
karm/tray.cpp View File

@@ -16,12 +16,12 @@
16 16
 #include <tqtimer.h>
17 17
 #include <tqtooltip.h>
18 18
 
19
-#include <kaction.h>            // actionPreferences()
19
+#include <tdeaction.h>            // actionPreferences()
20 20
 #include <kglobal.h>
21 21
 #include <kglobalsettings.h>
22 22
 #include <kiconloader.h>        // UserIcon
23 23
 #include <klocale.h>            // i18n
24
-#include <kpopupmenu.h>         // plug()
24
+#include <tdepopupmenu.h>         // plug()
25 25
 #include <ksystemtray.h>
26 26
 
27 27
 #include "mainwindow.h"

+ 1
- 1
karm/tray.h View File

@@ -5,7 +5,7 @@
5 5
 #include <tqpixmap.h>
6 6
 #include <tqptrlist.h>
7 7
 // experiement
8
-// #include <kpopupmenu.h>
8
+// #include <tdepopupmenu.h>
9 9
 #include <ksystemtray.h>
10 10
 
11 11
 #include "task.h"

+ 1
- 1
kgantt/kgantt/KGantt.h View File

@@ -37,7 +37,7 @@
37 37
 #include <tqwidget.h>
38 38
 #include <tqsplitter.h> 
39 39
 
40
-#include <kpopupmenu.h>
40
+#include <tdepopupmenu.h>
41 41
 #include <tdepimmacros.h>
42 42
 
43 43
 #include "KGanttItem.h"

+ 1
- 1
kgantt/kgantt/xQGanttBarViewPort.cpp View File

@@ -15,7 +15,7 @@
15 15
 #include "open.xpm"
16 16
 #include "close.xpm"
17 17
 
18
-#include <ktoolbarbutton.h> 
18
+#include <tdetoolbarbutton.h> 
19 19
 #include <kiconloader.h>
20 20
 #include <klocale.h> 
21 21
   

+ 2
- 2
kgantt/kgantt/xQGanttBarViewPort.h View File

@@ -36,8 +36,8 @@
36 36
 #include <tqtimer.h>
37 37
 #include <tqlabel.h>
38 38
 
39
-#include <kpopupmenu.h> 
40
-#include <ktoolbar.h> 
39
+#include <tdepopupmenu.h> 
40
+#include <tdetoolbar.h> 
41 41
 
42 42
 #include <tqptrdict.h>
43 43
 #include <tqaction.h> 

+ 2
- 2
kitchensync/src/mainwidget.cpp View File

@@ -29,10 +29,10 @@
29 29
 #include <libqopensync/environment.h>
30 30
 
31 31
 #include <kaboutdata.h>
32
-#include <kaction.h>
32
+#include <tdeaction.h>
33 33
 #include <kdebug.h>
34 34
 #include <kinputdialog.h>
35
-#include <klistview.h>
35
+#include <tdelistview.h>
36 36
 #include <klocale.h>
37 37
 #include <kmessagebox.h>
38 38
 #include <kstdaction.h>

+ 0
- 0
kitchensync/src/mainwindow.cpp View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save