Browse Source

Rename many classes and header files to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
da47dd9fc6
100 changed files with 197 additions and 197 deletions
  1. 1
    1
      dcoprss/feedbrowser.cpp
  2. 1
    1
      dcoprss/feedbrowser.h
  3. 2
    2
      filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
  4. 1
    1
      filesharing/advanced/kcm_sambaconf/hiddenfileview.h
  5. 4
    4
      filesharing/advanced/kcm_sambaconf/kcminterface.ui
  6. 1
    1
      filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
  7. 1
    1
      filesharing/advanced/kcm_sambaconf/share.ui
  8. 2
    2
      filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp
  9. 1
    1
      filesharing/advanced/kcm_sambaconf/usertabimpl.cpp
  10. 2
    2
      filesharing/advanced/nfs/nfsdialog.cpp
  11. 1
    1
      filesharing/simple/controlcenter.ui
  12. 1
    1
      filesharing/simple/fileshare.cpp
  13. 1
    1
      filesharing/simple/groupconfigdlg.cpp
  14. 1
    1
      kdict/actions.cpp
  15. 1
    1
      kdict/actions.h
  16. 1
    1
      kdict/matchview.cpp
  17. 1
    1
      kdict/options.cpp
  18. 1
    1
      kdict/queryview.cpp
  19. 1
    1
      kdict/toplevel.cpp
  20. 1
    1
      kdict/toplevel.h
  21. 1
    1
      kget/CMakeLists.txt
  22. 2
    2
      kget/Makefile.am
  23. 2
    2
      kget/dlgAdvanced.cpp
  24. 6
    6
      kget/dlgAutomation.cpp
  25. 2
    2
      kget/dlgConnection.cpp
  26. 2
    2
      kget/dlgIndividual.cpp
  27. 2
    2
      kget/dlgLimits.cpp
  28. 2
    2
      kget/dlgPreferences.cpp
  29. 4
    4
      kget/dlgSystem.cpp
  30. 1
    1
      kget/dlgsystembase.ui
  31. 1
    1
      kget/dockindividual.cpp
  32. 2
    2
      kget/docking.cpp
  33. 14
    14
      kget/droptarget.cpp
  34. 3
    3
      kget/kget_plug_in/kget_linkview.cpp
  35. 2
    2
      kget/kget_plug_in/kget_linkview.h
  36. 2
    2
      kget/kget_plug_in/kget_plug_in.cpp
  37. 4
    4
      kget/logwindow.cpp
  38. 16
    16
      kget/main.cpp
  39. 4
    4
      kget/settings.cpp
  40. 5
    5
      kget/tdemainwidget.cpp
  41. 4
    4
      kget/tdemainwidget.h
  42. 6
    6
      kget/transfer.cpp
  43. 1
    1
      kget/transfer.h
  44. 1
    1
      kget/transferlist.h
  45. 1
    1
      knewsticker/knewsticker.h
  46. 3
    3
      knewsticker/knewstickerconfig.cpp
  47. 3
    3
      knewsticker/knewstickerconfigwidget.ui
  48. 1
    1
      knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
  49. 2
    2
      knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
  50. 1
    1
      kopete/KABC_INTEG_NOTES
  51. 1
    1
      kopete/kopete/addaccountwizard/addaccountwizard.cpp
  52. 1
    1
      kopete/kopete/addaccountwizard/addaccountwizardpage1.ui
  53. 2
    2
      kopete/kopete/addcontactwizard/addcontactwizard.cpp
  54. 2
    2
      kopete/kopete/addcontactwizard/addcontactwizard_base.ui
  55. 2
    2
      kopete/kopete/addcontactwizard/fastaddcontactwizard.h
  56. 1
    1
      kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui
  57. 1
    1
      kopete/kopete/chatwindow/chatmemberslistwidget.cpp
  58. 1
    1
      kopete/kopete/chatwindow/chatmemberslistwidget.h
  59. 1
    1
      kopete/kopete/chatwindow/chatmessagepart.cpp
  60. 1
    1
      kopete/kopete/chatwindow/chatview.cpp
  61. 3
    3
      kopete/kopete/chatwindow/kopetechatwindow.cpp
  62. 3
    3
      kopete/kopete/chatwindow/kopeteemailwindow.cpp
  63. 1
    1
      kopete/kopete/chatwindow/kopeteemailwindow.h
  64. 3
    3
      kopete/kopete/chatwindow/kopeteemoticonaction.cpp
  65. 1
    1
      kopete/kopete/chatwindow/kopeteemoticonaction.h
  66. 2
    2
      kopete/kopete/chatwindow/krichtexteditpart.cpp
  67. 1
    1
      kopete/kopete/config/accounts/kopeteaccountconfig.cpp
  68. 1
    1
      kopete/kopete/config/accounts/kopeteaccountconfigbase.ui
  69. 1
    1
      kopete/kopete/config/appearance/appearanceconfig.cpp
  70. 1
    1
      kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui
  71. 4
    4
      kopete/kopete/config/appearance/appearanceconfig_colors.ui
  72. 1
    1
      kopete/kopete/config/appearance/appearanceconfig_emoticons.ui
  73. 1
    1
      kopete/kopete/config/appearance/emoticonseditdialog.cpp
  74. 1
    1
      kopete/kopete/config/appearance/emoticonseditwidget.ui
  75. 1
    1
      kopete/kopete/config/appearance/tooltipeditdialog.cpp
  76. 2
    2
      kopete/kopete/config/appearance/tooltipeditwidget.ui
  77. 1
    1
      kopete/kopete/config/identity/kopeteidentityconfig.cpp
  78. 1
    1
      kopete/kopete/contactlist/kopeteaddrbookexport.cpp
  79. 3
    3
      kopete/kopete/contactlist/kopetecontactlistview.cpp
  80. 1
    1
      kopete/kopete/contactlist/kopetegrouplistaction.cpp
  81. 1
    1
      kopete/kopete/contactlist/kopetegrouplistaction.h
  82. 1
    1
      kopete/kopete/contactlist/kopetelviprops.cpp
  83. 1
    1
      kopete/kopete/contactlist/kopetemetacontactlvi.cpp
  84. 1
    1
      kopete/kopete/contactlist/kopetemetacontactlvi.h
  85. 1
    1
      kopete/kopete/contactlist/kopetestatusgroupviewitem.h
  86. 1
    1
      kopete/kopete/kopeteeditglobalidentitywidget.cpp
  87. 4
    4
      kopete/kopete/kopetewindow.cpp
  88. 1
    1
      kopete/kopete/kopetewindow.h
  89. 1
    1
      kopete/kopete/systemtray.cpp
  90. 2
    2
      kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
  91. 2
    2
      kopete/libkopete/kopeteaccount.cpp
  92. 2
    2
      kopete/libkopete/kopeteawayaction.h
  93. 0
    0
      kopete/libkopete/kopeteblacklister.cpp
  94. 0
    0
      kopete/libkopete/kopeteblacklister.h
  95. 1
    1
      kopete/libkopete/kopetecommandhandler.cpp
  96. 1
    1
      kopete/libkopete/kopetecommandhandler.h
  97. 3
    3
      kopete/libkopete/kopetecontact.cpp
  98. 1
    1
      kopete/libkopete/kopeteonlinestatusmanager.h
  99. 1
    1
      kopete/libkopete/kopeteprotocol.cpp
  100. 0
    0
      kopete/libkopete/private/kopetecommand.h

+ 1
- 1
dcoprss/feedbrowser.cpp View File

@@ -5,7 +5,7 @@
5 5
 #include <kcmdlineargs.h>
6 6
 #include <kdebug.h>
7 7
 #include <kdialogbase.h>
8
-#include <klistview.h>
8
+#include <tdelistview.h>
9 9
 #include <klocale.h>
10 10
 #include <dcopclient.h>
11 11
 

+ 1
- 1
dcoprss/feedbrowser.h View File

@@ -4,7 +4,7 @@
4 4
 #include <tqobject.h>
5 5
 #include <dcopobject.h>
6 6
 #include <kdialogbase.h>
7
-#include <klistview.h>
7
+#include <tdelistview.h>
8 8
 
9 9
 class DCOPRSSIface : public TQObject, public DCOPObject
10 10
 {

+ 2
- 2
filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp View File

@@ -36,8 +36,8 @@
36 36
 #include <tqcursor.h>
37 37
 
38 38
 
39
-#include <kpopupmenu.h>
40
-#include <kaction.h>
39
+#include <tdepopupmenu.h>
40
+#include <tdeaction.h>
41 41
 #include <krestrictedline.h>
42 42
 #include <klocale.h>
43 43
 #include <tdefiledetailview.h>

+ 1
- 1
filesharing/advanced/kcm_sambaconf/hiddenfileview.h View File

@@ -30,7 +30,7 @@
30 30
 #define _HIDDENFILEVIEW_H_
31 31
 
32 32
 #include <tdefileitem.h>
33
-#include <klistview.h>
33
+#include <tdelistview.h>
34 34
 
35 35
 #include "qmultichecklistitem.h"
36 36
 

+ 4
- 4
filesharing/advanced/kcm_sambaconf/kcminterface.ui View File

@@ -8417,10 +8417,10 @@ This is only available if the SSL libraries have been compiled on your system an
8417 8417
     <includehint>klineedit.h</includehint>
8418 8418
     <includehint>klineedit.h</includehint>
8419 8419
     <includehint>kurllabel.h</includehint>
8420
-    <includehint>klistview.h</includehint>
8421
-    <includehint>klistview.h</includehint>
8422
-    <includehint>klistview.h</includehint>
8423
-    <includehint>klistview.h</includehint>
8420
+    <includehint>tdelistview.h</includehint>
8421
+    <includehint>tdelistview.h</includehint>
8422
+    <includehint>tdelistview.h</includehint>
8423
+    <includehint>tdelistview.h</includehint>
8424 8424
     <includehint>kurlrequester.h</includehint>
8425 8425
     <includehint>klineedit.h</includehint>
8426 8426
     <includehint>kpushbutton.h</includehint>

+ 1
- 1
filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp View File

@@ -55,7 +55,7 @@
55 55
 #include <krestrictedline.h>
56 56
 #include <kmessagebox.h>
57 57
 #include <kjanuswidget.h>
58
-#include <klistview.h>
58
+#include <tdelistview.h>
59 59
 #include <ksimpleconfig.h>
60 60
 
61 61
 #include "sambashare.h"

+ 1
- 1
filesharing/advanced/kcm_sambaconf/share.ui View File

@@ -3282,7 +3282,7 @@ Only change something if you know what you are doing.</string>
3282 3282
     <includehint>kpushbutton.h</includehint>
3283 3283
     <includehint>klineedit.h</includehint>
3284 3284
     <includehint>klineedit.h</includehint>
3285
-    <includehint>klistview.h</includehint>
3285
+    <includehint>tdelistview.h</includehint>
3286 3286
     <includehint>krestrictedline.h</includehint>
3287 3287
     <includehint>krestrictedline.h</includehint>
3288 3288
     <includehint>krestrictedline.h</includehint>

+ 2
- 2
filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp View File

@@ -61,8 +61,8 @@
61 61
 #include <tdefiledetailview.h>
62 62
 #include <kdirlister.h>
63 63
 #include <kmessagebox.h>
64
-#include <kpopupmenu.h>
65
-#include <kaction.h>
64
+#include <tdepopupmenu.h>
65
+#include <tdeaction.h>
66 66
 #include <krestrictedline.h>
67 67
 #include <kjanuswidget.h>
68 68
 

+ 1
- 1
filesharing/advanced/kcm_sambaconf/usertabimpl.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <tqpushbutton.h>
38 38
 #include <tqlineedit.h>
39 39
 
40
-#include <klistview.h>
40
+#include <tdelistview.h>
41 41
 #include <klocale.h>
42 42
 #include <kdebug.h>
43 43
 #include <kiconloader.h>

+ 2
- 2
filesharing/advanced/nfs/nfsdialog.cpp View File

@@ -29,8 +29,8 @@
29 29
 #include <kmessagebox.h>
30 30
 #include <tdefiledialog.h>
31 31
 #include <klocale.h>
32
-#include <klistview.h>
33
-#include <kaccel.h>
32
+#include <tdelistview.h>
33
+#include <tdeaccel.h>
34 34
 
35 35
 #include "nfsdialog.h"
36 36
 #include "nfsentry.h"

+ 1
- 1
filesharing/simple/controlcenter.ui View File

@@ -480,7 +480,7 @@
480 480
 <layoutdefaults spacing="6" margin="11"/>
481 481
 <includehints>
482 482
     <includehint>krichtextlabel.h</includehint>
483
-    <includehint>klistview.h</includehint>
483
+    <includehint>tdelistview.h</includehint>
484 484
     <includehint>kpushbutton.h</includehint>
485 485
 </includehints>
486 486
 </UI>

+ 1
- 1
filesharing/simple/fileshare.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <kdialog.h>
32 32
 #include <kdialogbase.h>
33 33
 #include <kgenericfactory.h>
34
-#include <klistview.h>
34
+#include <tdelistview.h>
35 35
 #include <kiconloader.h>
36 36
 #include <knfsshare.h>
37 37
 #include <ksambashare.h>

+ 1
- 1
filesharing/simple/groupconfigdlg.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <kdebug.h>
32 32
 #include <kmessagebox.h>
33 33
 #include <kinputdialog.h>
34
-#include <klistbox.h>
34
+#include <tdelistbox.h>
35 35
 #include <kprocess.h>
36 36
 #include <kpushbutton.h>
37 37
 #include <kcombobox.h>

+ 1
- 1
kdict/actions.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include <tqpushbutton.h>
22 22
 
23 23
 #include <kcombobox.h>
24
-#include <ktoolbar.h>
24
+#include <tdetoolbar.h>
25 25
 
26 26
 
27 27
 DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name,

+ 1
- 1
kdict/actions.h View File

@@ -20,7 +20,7 @@
20 20
 
21 21
 #include <tqguardedptr.h>
22 22
 #include <tqptrlist.h>
23
-#include <kaction.h>
23
+#include <tdeaction.h>
24 24
 #include <kglobalsettings.h>
25 25
 
26 26
 class KComboBox;

+ 1
- 1
kdict/matchview.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include <tqpainter.h>
22 22
 #include <tqregexp.h>
23 23
 
24
-#include <kpopupmenu.h>
24
+#include <tdepopupmenu.h>
25 25
 #include <klocale.h>
26 26
 #include <kapplication.h>
27 27
 #include <kiconloader.h>

+ 1
- 1
kdict/options.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <knuminput.h>
34 34
 #include <klineedit.h>
35 35
 #include <kcharsets.h>
36
-#include <kfontdialog.h>
36
+#include <tdefontdialog.h>
37 37
 #include <kiconloader.h>
38 38
 
39 39
 #include "options.h"

+ 1
- 1
kdict/queryview.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include <ktempfile.h>
23 23
 #include <tdeio/netaccess.h>
24 24
 #include <kcursor.h>
25
-#include <kpopupmenu.h>
25
+#include <tdepopupmenu.h>
26 26
 #include <kmessagebox.h>
27 27
 #include <klocale.h>
28 28
 #include <tdehtml_events.h>

+ 1
- 1
kdict/toplevel.cpp View File

@@ -16,7 +16,7 @@
16 16
 
17 17
 #include <tqclipboard.h>
18 18
 
19
-#include <kstdaccel.h>
19
+#include <tdestdaccel.h>
20 20
 #include <kstdaction.h>
21 21
 #include <kapplication.h>
22 22
 #include <kstatusbar.h>

+ 1
- 1
kdict/toplevel.h View File

@@ -18,7 +18,7 @@
18 18
 #define _TOPLEVEL_H_
19 19
 
20 20
 #include <tqtimer.h>
21
-#include <kmainwindow.h>
21
+#include <tdemainwindow.h>
22 22
 #include "dcopinterface.h"
23 23
 
24 24
 class TQSplitter;

+ 1
- 1
kget/CMakeLists.txt View File

@@ -39,7 +39,7 @@ install( FILES kgetui.rc eventsrc DESTINATION ${DATA_INSTALL_DIR}/kget )
39 39
 tde_add_executable( kget AUTOMOC
40 40
   SOURCES
41 41
     getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp
42
-    transfer.cpp settings.cpp logwindow.cpp kmainwidget.cpp tdefileio.cpp
42
+    transfer.cpp settings.cpp logwindow.cpp tdemainwidget.cpp tdefileio.cpp
43 43
     droptarget.cpp docking.cpp dlgconnectionbase.ui dlgautomationbase.ui
44 44
     dlglimitsbase.ui dlgadvancedbase.ui dlgdirectoriesbase.ui
45 45
     dlgsystembase.ui dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp

+ 2
- 2
kget/Makefile.am View File

@@ -8,7 +8,7 @@ kget_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_QT)
8 8
 kget_LDADD   = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET)
9 9
 kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \
10 10
                transfer.cpp settings.cpp logwindow.cpp \
11
-               kmainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \
11
+               tdemainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \
12 12
                dlgconnectionbase.ui dlgautomationbase.ui dlglimitsbase.ui \
13 13
                dlgadvancedbase.ui dlgdirectoriesbase.ui dlgsystembase.ui \
14 14
                dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp \
@@ -20,7 +20,7 @@ noinst_HEADERS = common.h \
20 20
                  dlgAdvanced.h dlgAutomation.h dlgConnection.h \
21 21
                  dlgDirectories.h dlgIndividual.h dlgLimits.h \
22 22
                  dlgPreferences.h dlgSystem.h docking.h droptarget.h \
23
-                 tdefileio.h kmainwidget.h logwindow.h settings.h \
23
+                 tdefileio.h tdemainwidget.h logwindow.h settings.h \
24 24
                  transfer.h transferlist.h version.h slave.h \
25 25
                  slaveevent.h http_defaults.h getfilejob.h dockindividual.h
26 26
 

+ 2
- 2
kget/dlgAdvanced.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <tdeconfig.h>
34 34
 
35 35
 #include "settings.h"
36
-#include "kmainwidget.h"
36
+#include "tdemainwidget.h"
37 37
 #include "dlgAdvanced.h"
38 38
 
39 39
 
@@ -74,7 +74,7 @@ void DlgAdvanced::applyData()
74 74
     ksettings.b_showMain=cb_ShowMain->isChecked();
75 75
 
76 76
     if (ksettings.b_expertMode != cb_expertmode->isChecked()) {
77
-        kmain->slotToggleExpertMode();
77
+        tdemain->slotToggleExpertMode();
78 78
     }
79 79
 
80 80
     bool bIsKonquiEnable=cb_konqiIntegration->isChecked();

+ 6
- 6
kget/dlgAutomation.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <klineedit.h>
39 39
 
40 40
 #include "settings.h"
41
-#include "kmainwidget.h"
41
+#include "tdemainwidget.h"
42 42
 #include "dlgAutomation.h"
43 43
 
44 44
 
@@ -106,12 +106,12 @@ void DlgAutomation::applyData()
106 106
     if (cb_autoSave->isChecked() != ksettings.b_autoSave || (uint) le_autoSave->value() != ksettings.autoSaveInterval) {
107 107
         ksettings.b_autoSave = cb_autoSave->isChecked();
108 108
         ksettings.autoSaveInterval = le_autoSave->value();
109
-        kmain->setAutoSave();
109
+        tdemain->setAutoSave();
110 110
     }
111 111
 
112 112
     if (cb_autoDisconnect->isChecked() != ksettings.b_autoDisconnect) {
113
-        kmain->slotToggleAutoDisconnect();
114
-        kmain->setAutoDisconnect();
113
+        tdemain->slotToggleAutoDisconnect();
114
+        tdemain->setAutoDisconnect();
115 115
     }
116 116
 
117 117
     ksettings.disconnectCommand = le_autoDisconnect->text();
@@ -120,11 +120,11 @@ void DlgAutomation::applyData()
120 120
     ksettings.disconnectTime = spins->dateTime().time();
121 121
 
122 122
     if (cb_autoShutdown->isChecked() != ksettings.b_autoShutdown) {
123
-        kmain->slotToggleAutoShutdown();
123
+        tdemain->slotToggleAutoShutdown();
124 124
     }
125 125
 
126 126
     if (cb_autoPaste->isChecked() != ksettings.b_autoPaste) {
127
-        kmain->slotToggleAutoPaste();
127
+        tdemain->slotToggleAutoPaste();
128 128
     }
129 129
 }
130 130
 

+ 2
- 2
kget/dlgConnection.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <kcombobox.h>
38 38
 
39 39
 
40
-#include "kmainwidget.h"
40
+#include "tdemainwidget.h"
41 41
 #include "settings.h"
42 42
 #include "dlgConnection.h"
43 43
 
@@ -125,7 +125,7 @@ void DlgConnection::applyData()
125 125
     ksettings.linkNumber = le_linknum->value();
126 126
 
127 127
     if (cb_offlinemode->isChecked() != ksettings.b_offlineMode) {
128
-        kmain->slotToggleOfflineMode();
128
+        tdemain->slotToggleOfflineMode();
129 129
     }
130 130
 }
131 131
 

+ 2
- 2
kget/dlgIndividual.cpp View File

@@ -39,9 +39,9 @@
39 39
 #include <kdatetimewidget.h>
40 40
 
41 41
 #include <kapplication.h>
42
-#include <kaction.h>
42
+#include <tdeaction.h>
43 43
 #include <klocale.h>
44
-#include <ktoolbar.h>
44
+#include <tdetoolbar.h>
45 45
 #include <krun.h>
46 46
 #include <tdeio/global.h>
47 47
 #include "common.h"

+ 2
- 2
kget/dlgLimits.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <kdialog.h>
34 34
 
35 35
 #include "settings.h"
36
-#include "kmainwidget.h"
36
+#include "tdemainwidget.h"
37 37
 #include "dlgLimits.h"
38 38
 
39 39
 
@@ -61,7 +61,7 @@ void DlgLimits::applyData()
61 61
     ksettings.maxSimultaneousConnections = le_maxnum->value();
62 62
     ksettings.minimumBandwidth = le_minband->value();
63 63
     ksettings.maximumBandwidth = le_maxband->value();
64
-    kmain->checkQueue();
64
+    tdemain->checkQueue();
65 65
 }
66 66
 
67 67
 void DlgLimits::slotChanged()

+ 2
- 2
kget/dlgPreferences.cpp View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include <kapplication.h>
31 31
 #include <klocale.h>
32
-#include <kaction.h>
32
+#include <tdeaction.h>
33 33
 #include <kcombobox.h>
34 34
 
35 35
 #include "dlgConnection.h"
@@ -45,7 +45,7 @@
45 45
 #undef index
46 46
 #endif
47 47
 
48
-#include "kmainwidget.h"
48
+#include "tdemainwidget.h"
49 49
 #include "dlgPreferences.h"
50 50
 
51 51
 

+ 4
- 4
kget/dlgSystem.cpp View File

@@ -32,10 +32,10 @@
32 32
 #undef index
33 33
 #endif
34 34
 
35
-#include <kfontrequester.h>
35
+#include <tdefontrequester.h>
36 36
 
37 37
 #include "settings.h"
38
-#include "kmainwidget.h"
38
+#include "tdemainwidget.h"
39 39
 #include "dlgSystem.h"
40 40
 
41 41
 #include <tqbuttongroup.h>
@@ -62,11 +62,11 @@ void DlgSystem::applyData()
62 62
 {
63 63
     if (cb_useAnimation->isChecked() != ksettings.b_useAnimation)
64 64
     {
65
-        kmain->slotToggleAnimation();
65
+        tdemain->slotToggleAnimation();
66 66
     }
67 67
 
68 68
     ksettings.listViewFont = le_font->font();
69
-    kmain->setListFont();
69
+    tdemain->setListFont();
70 70
 }
71 71
 
72 72
 void DlgSystem::slotChanged()

+ 1
- 1
kget/dlgsystembase.ui View File

@@ -164,6 +164,6 @@
164 164
 <layoutdefaults spacing="6" margin="11"/>
165 165
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
166 166
 <includehints>
167
-    <includehint>kfontrequester.h</includehint>
167
+    <includehint>tdefontrequester.h</includehint>
168 168
 </includehints>
169 169
 </UI>

+ 1
- 1
kget/dockindividual.cpp View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include <tqtooltip.h>
28 28
 
29
-#include <kpopupmenu.h>
29
+#include <tdepopupmenu.h>
30 30
 
31 31
 #include "dockindividual.h"
32 32
 DockIndividual::DockIndividual(TQWidget *parent, const char *name ) : KSystemTray(parent,name)

+ 2
- 2
kget/docking.cpp View File

@@ -30,10 +30,10 @@
30 30
 #include <kapplication.h>
31 31
 #include <kiconloader.h>
32 32
 #include <klocale.h>
33
-#include <kpopupmenu.h>
33
+#include <tdepopupmenu.h>
34 34
 #include <kurldrag.h>
35 35
 
36
-#include "kmainwidget.h"
36
+#include "tdemainwidget.h"
37 37
 #include "settings.h"
38 38
 #include "docking.h"
39 39
 

+ 14
- 14
kget/droptarget.cpp View File

@@ -26,18 +26,18 @@
26 26
 
27 27
 #include <tqpainter.h>
28 28
 
29
-#include <kaction.h>
29
+#include <tdeaction.h>
30 30
 #include <kapplication.h>
31 31
 #include <tdeconfig.h>
32 32
 #include <kiconloader.h>
33 33
 #include <kglobalsettings.h>
34
-#include <kmainwindow.h>
34
+#include <tdemainwindow.h>
35 35
 #include <twin.h>
36 36
 #include <klocale.h>
37
-#include <kpopupmenu.h>
37
+#include <tdepopupmenu.h>
38 38
 #include <kurldrag.h>
39 39
 
40
-#include "kmainwidget.h"
40
+#include "tdemainwidget.h"
41 41
 #include <tqcursor.h>
42 42
 #ifdef TQ_WS_X11
43 43
 #include <X11/Xlib.h>
@@ -98,9 +98,9 @@ DropTarget::DropTarget(TDEMainWindow * mainWin):TQWidget()
98 98
     popupMenu->insertSeparator();
99 99
     
100 100
     popupMenu->setItemChecked(pop_sticky, b_sticky);
101
-    kmain->m_paPreferences->plug(popupMenu);
101
+    tdemain->m_paPreferences->plug(popupMenu);
102 102
     popupMenu->insertSeparator();
103
-    kmain->m_paQuit->plug(popupMenu);
103
+    tdemain->m_paQuit->plug(popupMenu);
104 104
 
105 105
     isdragging = false;
106 106
 
@@ -129,14 +129,14 @@ DropTarget::mousePressEvent(TQMouseEvent * e)
129 129
     }
130 130
     else if (e->button() == Qt::RightButton)
131 131
     {
132
-        popupMenu->setItemEnabled(pop_Min, kmain->isVisible());
133
-        popupMenu->setItemEnabled(pop_Max, kmain->isHidden());
132
+        popupMenu->setItemEnabled(pop_Min, tdemain->isVisible());
133
+        popupMenu->setItemEnabled(pop_Max, tdemain->isHidden());
134 134
 
135 135
         popupMenu->popup(TQCursor::pos());
136 136
     }
137 137
     else if (e->button() == Qt::MidButton)
138 138
     {
139
-        kmain->slotPasteTransfer();
139
+        tdemain->slotPasteTransfer();
140 140
     }
141 141
 }
142 142
 
@@ -163,11 +163,11 @@ void DropTarget::dropEvent(TQDropEvent * event)
163 163
 
164 164
     if (KURLDrag::decode(event, list))
165 165
     {
166
-        kmain->addTransfers(list);
166
+        tdemain->addTransfers(list);
167 167
     }
168 168
     else if (TQTextDrag::decode(event, str))
169 169
     {
170
-        kmain->addTransfer(str);
170
+        tdemain->addTransfer(str);
171 171
     }
172 172
 }
173 173
 
@@ -193,10 +193,10 @@ void DropTarget::updateStickyState()
193 193
 
194 194
 void DropTarget::toggleMinimizeRestore()
195 195
 {
196
-    if (kmain->isVisible())
197
-        kmain->hide();
196
+    if (tdemain->isVisible())
197
+        tdemain->hide();
198 198
     else
199
-        kmain->show();
199
+        tdemain->show();
200 200
 }
201 201
 
202 202
 /** No descriptions */

+ 3
- 3
kget/kget_plug_in/kget_linkview.cpp View File

@@ -3,15 +3,15 @@
3 3
 #include <tqlayout.h>
4 4
 
5 5
 #include <dcopclient.h>
6
-#include <kaction.h>
6
+#include <tdeaction.h>
7 7
 #include <kapplication.h>
8 8
 #include <kiconloader.h>
9
-#include <klistviewsearchline.h>
9
+#include <tdelistviewsearchline.h>
10 10
 #include <klocale.h>
11 11
 #include <kmessagebox.h>
12 12
 #include <kprocess.h>
13 13
 #include <kstdaction.h>
14
-#include <ktoolbar.h>
14
+#include <tdetoolbar.h>
15 15
 
16 16
 #define COL_NAME 0
17 17
 #define COL_DESC 1

+ 2
- 2
kget/kget_plug_in/kget_linkview.h View File

@@ -10,8 +10,8 @@
10 10
 
11 11
 #include <tqptrlist.h>
12 12
 
13
-#include <klistview.h>
14
-#include <kmainwindow.h>
13
+#include <tdelistview.h>
14
+#include <tdemainwindow.h>
15 15
 #include <kurl.h>
16 16
 
17 17
 #include "links.h"

+ 2
- 2
kget/kget_plug_in/kget_plug_in.cpp View File

@@ -26,11 +26,11 @@
26 26
 #include <tdehtml_part.h>
27 27
 #include <kiconloader.h>
28 28
 #include <kglobal.h>
29
-#include <kaction.h>
29
+#include <tdeaction.h>
30 30
 #include <kinstance.h>
31 31
 #include <klocale.h>
32 32
 #include <kmessagebox.h>
33
-#include <kpopupmenu.h>
33
+#include <tdepopupmenu.h>
34 34
 #include <krun.h>
35 35
 
36 36
 #include <dom/html_document.h>

+ 4
- 4
kget/logwindow.cpp View File

@@ -30,10 +30,10 @@
30 30
 
31 31
 #include <klocale.h>
32 32
 #include <kdialog.h>
33
-#include <kaction.h>
33
+#include <tdeaction.h>
34 34
 
35 35
 #include "transfer.h"
36
-#include "kmainwidget.h"
36
+#include "tdemainwidget.h"
37 37
 #include "logwindow.h"
38 38
 
39 39
 #include <kapplication.h>
@@ -182,8 +182,8 @@ LogWindow::LogWindow():KDialogBase(Tabbed, i18n("Log Window"), Close, Close, 0,
182 182
 
183 183
 void LogWindow::closeEvent(TQCloseEvent *e)
184 184
 {
185
-    kmain->m_paShowLog->setChecked(false);
186
-    kmain->b_viewLogWindow = false;
185
+    tdemain->m_paShowLog->setChecked(false);
186
+    tdemain->b_viewLogWindow = false;
187 187
     KDialogBase::closeEvent( e );
188 188
 }
189 189
 

+ 16
- 16
kget/main.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <unistd.h>
38 38
 #include <stdio.h>
39 39
 #include <stdlib.h>
40
-#include "kmainwidget.h"
40
+#include "tdemainwidget.h"
41 41
 #include "version.h"
42 42
 
43 43
 
@@ -64,9 +64,9 @@ static void signalHandler(int sigId)
64 64
 {
65 65
     fprintf(stderr, "*** KGet got signal %d\n", sigId);
66 66
 
67
-    if (sigId != SIGSEGV && kmain) {
67
+    if (sigId != SIGSEGV && tdemain) {
68 68
         fprintf(stderr, "*** KGet saving data\n");
69
-        delete kmain;
69
+        delete tdemain;
70 70
     }
71 71
     // If Kget crashes again below this line we consider the data lost :-|
72 72
     // Otherwise Kget will end in an infinite loop.
@@ -101,7 +101,7 @@ static void cleanup(void)
101 101
 class KGetApp : public KUniqueApplication
102 102
 {
103 103
 private:
104
-    TDEMainWidget *kmainwidget;
104
+    TDEMainWidget *tdemainwidget;
105 105
     
106 106
 public:
107 107
     KGetApp() : KUniqueApplication()
@@ -110,7 +110,7 @@ public:
110 110
         sDebugIn << endl;
111 111
 #endif
112 112
 
113
-        kmainwidget=0;
113
+        tdemainwidget=0;
114 114
 
115 115
 #ifdef _DEBUG
116 116
         sDebugOut << endl;
@@ -122,7 +122,7 @@ public:
122 122
 #ifdef _DEBUG
123 123
         sDebugIn << endl;
124 124
 #endif
125
-    delete kmainwidget;
125
+    delete tdemainwidget;
126 126
 #ifdef _DEBUG
127 127
         sDebugOut << endl;
128 128
 #endif
@@ -132,26 +132,26 @@ public:
132 132
     int newInstance()
133 133
     {
134 134
 #ifdef _DEBUG
135
-        sDebugIn <<"kmainwidget="<<kmainwidget << endl;
135
+        sDebugIn <<"tdemainwidget="<<tdemainwidget << endl;
136 136
 #endif
137 137
 
138 138
         TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
139 139
 
140 140
 
141
-        if (kmainwidget==0)
141
+        if (tdemainwidget==0)
142 142
         {
143 143
             if(args->count()>0)
144
-                kmainwidget=new TDEMainWidget(true);
144
+                tdemainwidget=new TDEMainWidget(true);
145 145
             else
146
-                kmainwidget=new TDEMainWidget();
147
-            setMainWidget(kmain);
146
+                tdemainwidget=new TDEMainWidget();
147
+            setMainWidget(tdemain);
148 148
         }
149 149
 
150 150
         else
151 151
             TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId());
152 152
 
153 153
         if (args->isSet("showDropTarget"))
154
-            kmain->activateDropTarget();
154
+            tdemain->activateDropTarget();
155 155
 
156 156
         if (args->count()==1)
157 157
         {
@@ -160,9 +160,9 @@ public:
160 160
 #endif
161 161
             TQString txt(args->arg(0));
162 162
             if ( txt.endsWith( ".kgt" ) )
163
-                kmain->readTransfersEx(KURL::fromPathOrURL( txt ));
163
+                tdemain->readTransfersEx(KURL::fromPathOrURL( txt ));
164 164
             else
165
-                kmain->addTransferEx( KURL::fromPathOrURL( txt ),
165
+                tdemain->addTransferEx( KURL::fromPathOrURL( txt ),
166 166
                                       KURL());
167 167
         }
168 168
         else if(args->count()>=2)
@@ -175,11 +175,11 @@ public:
175 175
 			// Sometimes valid filenames are not recognised by KURL::isLocalFile(), they are marked as invalid then
176 176
 			if ( args->count()==2 && ( urls.last().isLocalFile() || !urls.last().isValid()))
177 177
 			{
178
-				kmain->addTransferEx( urls.first(), urls.last() );
178
+				tdemain->addTransferEx( urls.first(), urls.last() );
179 179
 			}
180 180
 			else
181 181
 			{
182
-				kmain->addTransfers( urls, TQString() );
182
+				tdemain->addTransfers( urls, TQString() );
183 183
 			}
184 184
 		}
185 185
         args->clear();

+ 4
- 4
kget/settings.cpp View File

@@ -35,7 +35,7 @@
35 35
 
36 36
 #include <tqdir.h>
37 37
 
38
-#include "kmainwidget.h"
38
+#include "tdemainwidget.h"
39 39
 #include "transferlist.h"
40 40
 #include "droptarget.h"
41 41
 #include "settings.h"
@@ -271,9 +271,9 @@ void Settings::save()
271 271
 
272 272
     // write main window geometry properties
273 273
     config->setGroup("MainGeometry");
274
-    config->writeEntry("Position", kmain->pos());
275
-    config->writeEntry("Size", kmain->size());
276
-    config->writeEntry("State", KWin::windowInfo(kmain->winId()).state());
274
+    config->writeEntry("Position", tdemain->pos());
275
+    config->writeEntry("Size", tdemain->size());
276
+    config->writeEntry("State", KWin::windowInfo(tdemain->winId()).state());
277 277
 
278 278
     // write drop target geometry properties
279 279
     config->setGroup("DropGeometry");

+ 5
- 5
kget/tdemainwidget.cpp View File

@@ -1,5 +1,5 @@
1 1
 /***************************************************************************
2
-*                                kmainwidget.cpp
2
+*                                tdemainwidget.cpp
3 3
 *                             -------------------
4 4
 *
5 5
 *    begin        : Tue Jan 29 2002
@@ -75,7 +75,7 @@
75 75
 #include "settings.h"
76 76
 #include "transfer.h"
77 77
 #include "transferlist.h"
78
-#include "kmainwidget.h"
78
+#include "tdemainwidget.h"
79 79
 #include "tdefileio.h"
80 80
 #include "dlgPreferences.h"
81 81
 #include "logwindow.h"
@@ -99,7 +99,7 @@ struct KURLPair
99 99
 	KURL src;
100 100
 };
101 101
 
102
-TDEMainWidget *kmain = 0L;
102
+TDEMainWidget *tdemain = 0L;
103 103
 
104 104
 #define LOAD_ICON(X) TDEGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar)
105 105
 
@@ -139,7 +139,7 @@ TDEMainWidget::TDEMainWidget(bool bStartDocked)
139 139
     b_viewPreferences = FALSE;
140 140
 
141 141
     myTransferList = 0L;
142
-    kmain = this;
142
+    tdemain = this;
143 143
 
144 144
     // Set log time, needed for the name of log file
145 145
     TQDate date = TQDateTime::currentDateTime().date();
@@ -2545,4 +2545,4 @@ void TDEMainWidget::slotShowMenubar()
2545 2545
         menuBar()->hide();
2546 2546
 }
2547 2547
 
2548
-#include "kmainwidget.moc"
2548
+#include "tdemainwidget.moc"

+ 4
- 4
kget/tdemainwidget.h View File

@@ -1,5 +1,5 @@
1 1
 /***************************************************************************
2
-*                                kmainwidget.h
2
+*                                tdemainwidget.h
3 3
 *                             -------------------
4 4
 *
5 5
 *    Revision     : $Id$
@@ -28,8 +28,8 @@
28 28
 #ifndef _KMAINWIDGET_H_
29 29
 #define _KMAINWIDGET_H_
30 30
 
31
-#include <kmainwindow.h>
32
-#include <kaction.h>
31
+#include <tdemainwindow.h>
32
+#include <tdeaction.h>
33 33
 #include <kurl.h>
34 34
 #include "common.h"
35 35
 
@@ -227,7 +227,7 @@ private:
227 227
 
228 228
 };
229 229
 
230
-extern TDEMainWidget *kmain;
230
+extern TDEMainWidget *tdemain;
231 231
 extern DropTarget *kdrop;
232 232
 
233 233
 #endif                          // _KMAINWIDGET_H_

+ 6
- 6
kget/transfer.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <kmessagebox.h>
30 30
 #include <klocale.h>
31 31
 #include <ksimpleconfig.h>
32
-#include <kaction.h>
32
+#include <tdeaction.h>
33 33
 #include <kiconloader.h>
34 34
 #include <kstandarddirs.h>
35 35
 #include <twin.h>
@@ -39,7 +39,7 @@
39 39
 #include "safedelete.h"
40 40
 #include "settings.h"
41 41
 #include "logwindow.h"
42
-#include "kmainwidget.h"
42
+#include "tdemainwidget.h"
43 43
 #include "dlgIndividual.h"
44 44
 #include "transferlist.h"
45 45
 #include "transfer.h"
@@ -118,10 +118,10 @@ Transfer::init(const uint _id)
118 118
     status = ST_STOPPED;
119 119
 
120 120
 
121
-    connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), kmain, TQT_SLOT(slotStatusChanged(Transfer *, int)));
121
+    connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), tdemain, TQT_SLOT(slotStatusChanged(Transfer *, int)));
122 122
     connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), this, TQT_SLOT(slotUpdateActions()));
123 123
 
124
-    connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), kmain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &)));
124
+    connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), tdemain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &)));
125 125
 
126 126
     // setup actions
127 127
     m_paResume = new TDEAction(i18n("&Resume"), "tool_resume", 0, this, TQT_SLOT(slotResume()), this, "resume");
@@ -782,7 +782,7 @@ bool Transfer::read(KSimpleConfig * config, int id)
782 782
     }
783 783
 
784 784
     if (!src.isValid() && !ksettings.b_expertMode) {
785
-        KMessageBox::error(kmain, i18n("Malformed URL:\n") + src.prettyURL(), i18n("Error"));
785
+        KMessageBox::error(tdemain, i18n("Malformed URL:\n") + src.prettyURL(), i18n("Error"));
786 786
         return false;
787 787
     }
788 788
 
@@ -840,7 +840,7 @@ void Transfer::slotExecPause()
840 840
     m_paResume->setEnabled(true);
841 841
     slotUpdateActions();
842 842
     //TODO WE NEED TO UPDATE ACTIONS..
843
-    kmain->slotUpdateActions();
843
+    tdemain->slotUpdateActions();
844 844
     emit statusChanged(this, OP_PAUSED);
845 845
     sDebugOut << endl;
846 846
 }

+ 1
- 1
kget/transfer.h View File

@@ -28,7 +28,7 @@
28 28
 #ifndef _Transfer_h
29 29
 #define _Transfer_h
30 30
 
31
-#include <klistview.h>
31
+#include <tdelistview.h>
32 32
 #include <tqdatetime.h>
33 33
 #include <tqguardedptr.h>
34 34
 #include <tqmap.h>

+ 1
- 1
kget/transferlist.h View File

@@ -27,7 +27,7 @@
27 27
 #ifndef _TransferList_h
28 28
 #define _TransferList_h
29 29
 
30
-#include <klistview.h>
30
+#include <tdelistview.h>
31 31
 #include <tqptrlist.h>
32 32
 
33 33
 #include <kurl.h>

+ 1
- 1
knewsticker/knewsticker.h View File

@@ -19,7 +19,7 @@
19 19
 
20 20
 #include <tqtoolbutton.h>
21 21
 #include <kpanelapplet.h>
22
-#include <kpopupmenu.h>
22
+#include <tdepopupmenu.h>
23 23
 
24 24
 #include "configiface.h"
25 25
 #include "configaccess.h"

+ 3
- 3
knewsticker/knewstickerconfig.cpp View File

@@ -18,13 +18,13 @@
18 18
 #include <kcolorbutton.h>
19 19
 #include <kcombobox.h>
20 20
 #include <kdebug.h>
21
-#include <kfontdialog.h>
21
+#include <tdefontdialog.h>
22 22
 #include <kiconloader.h>
23 23
 #include <klineedit.h>
24
-#include <klistview.h>
24
+#include <tdelistview.h>
25 25
 #include <kmessagebox.h>
26 26
 #include <knuminput.h>
27
-#include <kpopupmenu.h>
27
+#include <tdepopupmenu.h>
28 28
 
29 29
 #include <tqcursor.h>
30 30
 #include <tqcheckbox.h>

+ 3
- 3
knewsticker/knewstickerconfigwidget.ui View File

@@ -1157,15 +1157,15 @@ Note that the filters are processed from the top to the bottom so that of two fi
1157 1157
     <include location="global" impldecl="in declaration">kcolorbutton.h</include>
1158 1158
     <include location="global" impldecl="in declaration">kcombobox.h</include>
1159 1159
     <include location="global" impldecl="in declaration">klineedit.h</include>
1160
-    <include location="global" impldecl="in declaration">klistview.h</include>
1160
+    <include location="global" impldecl="in declaration">tdelistview.h</include>
1161 1161
     <include location="global" impldecl="in declaration">knuminput.h</include>
1162 1162
 </includes>
1163 1163
 <layoutdefaults spacing="6" margin="11"/>
1164 1164
 <includehints>
1165 1165
     <includehint>knuminput.h</includehint>
1166 1166
     <includehint>knuminput.h</includehint>
1167
-    <includehint>klistview.h</includehint>
1168
-    <includehint>klistview.h</includehint>
1167
+    <includehint>tdelistview.h</includehint>
1168
+    <includehint>tdelistview.h</includehint>
1169 1169
     <includehint>kcombobox.h</includehint>
1170 1170
     <includehint>kcombobox.h</includehint>
1171 1171
     <includehint>klineedit.h</includehint>

+ 1
- 1
knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp View File

@@ -18,7 +18,7 @@
18 18
 #include <loader.h>
19 19
 
20 20
 #include <kapplication.h>
21
-#include <klistbox.h>
21
+#include <tdelistbox.h>
22 22
 #include <klocale.h>
23 23
 #include <kurl.h>
24 24
 #include <kurllabel.h>

+ 2
- 2
knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui View File

@@ -202,7 +202,7 @@
202 202
     </image>
203 203
 </images>
204 204
 <includes>
205
-    <include location="global" impldecl="in declaration">klistbox.h</include>
205
+    <include location="global" impldecl="in declaration">tdelistbox.h</include>
206 206
     <include location="global" impldecl="in declaration">kurllabel.h</include>
207 207
     <include location="global" impldecl="in declaration">kseparator.h</include>
208 208
 </includes>
@@ -210,6 +210,6 @@
210 210
 <includehints>
211 211
     <includehint>kurllabel.h</includehint>
212 212
     <includehint>kseparator.h</includehint>
213
-    <includehint>klistbox.h</includehint>
213
+    <includehint>tdelistbox.h</includehint>
214 214
 </includehints>
215 215
 </UI>

+ 1
- 1
kopete/KABC_INTEG_NOTES View File

@@ -57,7 +57,7 @@ Policy:
57 57
 One way kopete->kabc contacts
58 58
 , achieve bidi later
59 59
 <Bille> what about the sync policy between IM contacts contained in kabc and in kopete
60
-<spaze> mETz: alt-enter doesn't work? report a bug to klistview/qlistview, that sucks :( </ot>
60
+<spaze> mETz: alt-enter doesn't work? report a bug to tdelistview/qlistview, that sucks :( </ot>
61 61
 <gregj> hyhy
62 62
 <spaze> Bille: implied i'd say
63 63
 <Bille> for example - in Addressee A I already have 3 IM id's added with another client - if i associate him with a Kopete MC

+ 1
- 1
kopete/kopete/addaccountwizard/addaccountwizard.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include <kcolorbutton.h>
25 25
 #include <kdebug.h>
26 26
 #include <kiconloader.h>
27
-#include <klistview.h>
27
+#include <tdelistview.h>
28 28
 #include <klocale.h>
29 29
 #include <kmessagebox.h>
30 30
 #include <kplugininfo.h>

+ 1
- 1
kopete/kopete/addaccountwizard/addaccountwizardpage1.ui View File

@@ -139,6 +139,6 @@
139 139
 </tabstops>
140 140
 <layoutdefaults spacing="6" margin="11"/>
141 141
 <includehints>
142
-    <includehint>klistview.h</includehint>
142
+    <includehint>tdelistview.h</includehint>
143 143
 </includehints>
144 144
 </UI>

+ 2
- 2
kopete/kopete/addcontactwizard/addcontactwizard.cpp View File

@@ -56,14 +56,14 @@
56 56
 
57 57
 #include <kpushbutton.h>
58 58
 #include <kdebug.h>
59
-#include <klistview.h>
59
+#include <tdelistview.h>
60 60
 // used for its AddresseeItem class
61 61
 #include <kabc/addresseedialog.h>
62 62
 #include <kabc/addressbook.h>
63 63
 #include <kabc/stdaddressbook.h>
64 64
 
65 65
 #include <addcontactpage.h>
66
-#include "addressbookselectorwidget.h"
66
+#include "addressbootdeselectorwidget.h"
67 67
 #include "addcontactwizard.h"
68 68
 #include "kopetecontactlist.h"
69 69
 #include "kopetemetacontact.h"

+ 2
- 2
kopete/kopete/addcontactwizard/addcontactwizard_base.ui View File

@@ -480,8 +480,8 @@
480 480
 </tabstops>
481 481
 <layoutdefaults spacing="6" margin="11"/>
482 482
 <includehints>
483
-    <includehint>klistview.h</includehint>
483
+    <includehint>tdelistview.h</includehint>
484 484
     <includehint>kpushbutton.h</includehint>
485
-    <includehint>klistview.h</includehint>
485
+    <includehint>tdelistview.h</includehint>
486 486
 </includehints>
487 487
 </UI>

+ 2
- 2
kopete/kopete/addcontactwizard/fastaddcontactwizard.h View File

@@ -21,14 +21,14 @@
21 21
 #ifndef FASTADDCONTACTWIZARD_H
22 22
 #define FASTADDCONTACTWIZARD_H
23 23
 #include <kdebug.h>
24
-#include <klistview.h>
24
+#include <tdelistview.h>
25 25
 
26 26
 #include <tqptrlist.h>
27 27
 #include <tqvaluelist.h>
28 28
 #include <tqmap.h>
29 29
 
30 30
 #include <kdebug.h>
31
-#include <klistview.h>
31
+#include <tdelistview.h>
32 32
 
33 33
 #include "fastaddcontactwizard_base.h"
34 34
 

+ 1
- 1
kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui View File

@@ -214,6 +214,6 @@
214 214
 </images>
215 215
 <layoutdefaults spacing="6" margin="11"/>
216 216
 <includehints>
217
-    <includehint>klistview.h</includehint>
217
+    <includehint>tdelistview.h</includehint>
218 218
 </includehints>
219 219
 </UI>

+ 1
- 1
kopete/kopete/chatwindow/chatmemberslistwidget.cpp View File

@@ -30,7 +30,7 @@
30 30
 #include <kabc/vcardconverter.h>
31 31
 #include <kdebug.h>
32 32
 #include <tdemultipledrag.h>
33
-#include <kpopupmenu.h>
33
+#include <tdepopupmenu.h>
34 34
 
35 35
 #include <tqheader.h>
36 36
 #include <tqtooltip.h>

+ 1
- 1
kopete/kopete/chatwindow/chatmemberslistwidget.h View File

@@ -18,7 +18,7 @@
18 18
 #ifndef CHATMEMBERSLISTWIDGET_H
19 19
 #define CHATMEMBERSLISTWIDGET_H
20 20
 
21
-#include <klistview.h>
21
+#include <tdelistview.h>
22 22
 
23 23
 #include <tqmap.h>
24 24
 

+ 1
- 1
kopete/kopete/chatwindow/chatmessagepart.cpp View File

@@ -55,7 +55,7 @@
55 55
 #include <klocale.h>
56 56
 #include <kmessagebox.h>
57 57
 #include <tdemultipledrag.h>
58
-#include <kpopupmenu.h>
58
+#include <tdepopupmenu.h>
59 59
 #include <krun.h>
60 60
 #include <kstringhandler.h>
61 61
 #include <ktempfile.h>

+ 1
- 1
kopete/kopete/chatwindow/chatview.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <kdebug.h>
38 38
 #include <klocale.h>
39 39
 #include <kmessagebox.h>
40
-#include <kpopupmenu.h>
40
+#include <tdepopupmenu.h>
41 41
 #include <kstringhandler.h>
42 42
 #include <twin.h>
43 43
 #include <kurldrag.h>

+ 3
- 3
kopete/kopete/chatwindow/kopetechatwindow.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <klocale.h>
32 32
 #include <kmenubar.h>
33 33
 #include <tdeconfig.h>
34
-#include <kpopupmenu.h>
34
+#include <tdepopupmenu.h>
35 35
 #include <kiconloader.h>
36 36
 #include <kdebug.h>
37 37
 #include <twin.h>
@@ -45,7 +45,7 @@
45 45
 #include <kdialog.h>
46 46
 #include <kstringhandler.h>
47 47
 #include <ksqueezedtextlabel.h>
48
-#include <kstdaccel.h>
48
+#include <tdestdaccel.h>
49 49
 #include <kglobalsettings.h>
50 50
 
51 51
 #include "chatmessagepart.h"
@@ -64,7 +64,7 @@
64 64
 #include "kopeteviewmanager.h"
65 65
 
66 66
 #include <tqtoolbutton.h>
67
-#include <kactionclasses.h>
67
+#include <tdeactionclasses.h>
68 68
 
69 69
 typedef TQMap<Kopete::Account*,KopeteChatWindow*> AccountMap;
70 70
 typedef TQMap<Kopete::Group*,KopeteChatWindow*> GroupMap;

+ 3
- 3
kopete/kopete/chatwindow/kopeteemailwindow.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include "kopetestdaction.h"
32 32
 #include "kopeteviewmanager.h"
33 33
 
34
-#include <kaction.h>
34
+#include <tdeaction.h>
35 35
 #include <kapplication.h>
36 36
 #include <kcolordialog.h>
37 37
 #include <tdeconfig.h>
@@ -39,7 +39,7 @@
39 39
 #include <kdebug.h>
40 40
 #include <tdeversion.h>
41 41
 #include <kedittoolbar.h>
42
-#include <kfontdialog.h>
42
+#include <tdefontdialog.h>
43 43
 #include <kglobalsettings.h>
44 44
 #include <tdehtmlview.h>
45 45
 #include <kiconloader.h>
@@ -48,7 +48,7 @@
48 48
 #include <klocale.h>
49 49
 #include <kmenubar.h>
50 50
 #include <kmessagebox.h>
51
-#include <kpopupmenu.h>
51
+#include <tdepopupmenu.h>
52 52
 #include <kpushbutton.h>
53 53
 #include <ktextedit.h>
54 54
 #include <twin.h>

+ 1
- 1
kopete/kopete/chatwindow/kopeteemailwindow.h View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 #include "kopeteview.h"
24 24
 #include "kopeteviewplugin.h"
25
-#include <kmainwindow.h>
25
+#include <tdemainwindow.h>
26 26
 #include <tdeparts/mainwindow.h>
27 27
 
28 28
 namespace KParts { struct URLArgs; }

+ 3
- 3
kopete/kopete/chatwindow/kopeteemoticonaction.cpp View File

@@ -28,9 +28,9 @@
28 28
 #include <kdebug.h>
29 29
 #include <klocale.h>
30 30
 #include <kmenubar.h>
31
-#include <kpopupmenu.h>
32
-#include <ktoolbar.h>
33
-#include <ktoolbarbutton.h>
31
+#include <tdepopupmenu.h>
32
+#include <tdetoolbar.h>
33
+#include <tdetoolbarbutton.h>
34 34
 
35 35
 #include "emoticonselector.h"
36 36
 #include "kopeteemoticons.h"

+ 1
- 1
kopete/kopete/chatwindow/kopeteemoticonaction.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef _KOPETEEMOTICONACTION_H_
22 22
 #define _KOPETEEMOTICONACTION_H_
23 23
 
24
-#include <kaction.h>
24
+#include <tdeaction.h>
25 25
 
26 26
 class KopeteEmoticonAction : public TDEAction
27 27
 {

+ 2
- 2
kopete/kopete/chatwindow/krichtexteditpart.cpp View File

@@ -1,8 +1,8 @@
1 1
 #include <ktextedit.h>
2
-#include <kaction.h>
2
+#include <tdeaction.h>
3 3
 #include <kcolordialog.h>
4 4
 #include <kglobalsettings.h>
5
-#include <kfontdialog.h>
5
+#include <tdefontdialog.h>
6 6
 #include <kdebug.h>
7 7
 #include <tdeconfig.h>
8 8
 #include <tdeversion.h>

+ 1
- 1
kopete/kopete/config/accounts/kopeteaccountconfig.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <kdialogbase.h>
29 29
 #include <kgenericfactory.h>
30 30
 #include <kiconloader.h>
31
-#include <klistview.h>
31
+#include <tdelistview.h>
32 32
 #include <klocale.h>
33 33
 #include <kmessagebox.h>
34 34
 

+ 1
- 1
kopete/kopete/config/accounts/kopeteaccountconfigbase.ui View File

@@ -261,7 +261,7 @@ The priority is used to determine which contact to use when you click on a metac
261 261
 </tabstops>
262 262
 <layoutdefaults spacing="6" margin="11"/>
263 263
 <includehints>
264
-    <includehint>klistview.h</includehint>
264
+    <includehint>tdelistview.h</includehint>
265 265
     <includehint>kpushbutton.h</includehint>
266 266
     <includehint>kpushbutton.h</includehint>
267 267
 </includehints>

+ 1
- 1
kopete/kopete/config/appearance/appearanceconfig.cpp View File

@@ -45,7 +45,7 @@
45 45
 #include <kcolorbutton.h>
46 46
 #include <tdeconfig.h> // for KNewStuff emoticon fetching
47 47
 #include <kdebug.h>
48
-#include <kfontrequester.h>
48
+#include <tdefontrequester.h>
49 49
 #include <kgenericfactory.h>
50 50
 #include <tdeio/netaccess.h>
51 51
 #include <tdehtmlview.h>

+ 1
- 1
kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui View File

@@ -187,7 +187,7 @@
187 187
 </tabstops>
188 188
 <layoutdefaults spacing="6" margin="11"/>
189 189
 <includehints>
190
-    <includehint>klistbox.h</includehint>
190
+    <includehint>tdelistbox.h</includehint>
191 191
     <includehint>kpushbutton.h</includehint>
192 192
     <includehint>kpushbutton.h</includehint>
193 193
     <includehint>kpushbutton.h</includehint>

+ 4
- 4
kopete/kopete/config/appearance/appearanceconfig_colors.ui View File

@@ -447,10 +447,10 @@
447 447
     <includehint>kcolorbutton.h</includehint>
448 448
     <includehint>kcolorbutton.h</includehint>
449 449
     <includehint>kcolorbutton.h</includehint>
450
-    <includehint>kfontrequester.h</includehint>
451
-    <includehint>kfontrequester.h</includehint>
452
-    <includehint>kfontrequester.h</includehint>
453
-    <includehint>kfontrequester.h</includehint>
450
+    <includehint>tdefontrequester.h</includehint>
451
+    <includehint>tdefontrequester.h</includehint>
452
+    <includehint>tdefontrequester.h</includehint>
453
+    <includehint>tdefontrequester.h</includehint>
454 454
     <includehint>kcolorbutton.h</includehint>
455 455
     <includehint>kcolorbutton.h</includehint>
456 456
 </includehints>

+ 1
- 1
kopete/kopete/config/appearance/appearanceconfig_emoticons.ui View File

@@ -230,7 +230,7 @@
230 230
 </connections>
231 231
 <layoutdefaults spacing="6" margin="11"/>
232 232
 <includehints>
233
-    <includehint>klistbox.h</includehint>
233
+    <includehint>tdelistbox.h</includehint>
234 234
     <includehint>ktextedit.h</includehint>
235 235
 </includehints>
236 236
 </UI>

+ 1
- 1
kopete/kopete/config/appearance/emoticonseditdialog.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include "kopeteemoticons.h"
22 22
 
23 23
 #include <klocale.h>
24
-#include <klistview.h>
24
+#include <tdelistview.h>
25 25
 #include <kstandarddirs.h>
26 26
 #include <tdefiledialog.h>
27 27
 #include <tdeio/job.h>

+ 1
- 1
kopete/kopete/config/appearance/emoticonseditwidget.ui View File

@@ -82,6 +82,6 @@
82 82
     <includehint>kpushbutton.h</includehint>
83 83
     <includehint>kpushbutton.h</includehint>
84 84
     <includehint>kpushbutton.h</includehint>
85
-    <includehint>klistview.h</includehint>
85
+    <includehint>tdelistview.h</includehint>
86 86
 </includehints>
87 87
 </UI>

+ 1
- 1
kopete/kopete/config/appearance/tooltipeditdialog.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <tqstringlist.h>
28 28
 
29 29
 #include <kiconloader.h>
30
-#include <klistview.h>
30
+#include <tdelistview.h>
31 31
 #include <klocale.h>
32 32
 
33 33
 class TooltipItem : public TDEListViewItem

+ 2
- 2
kopete/kopete/config/appearance/tooltipeditwidget.ui View File

@@ -209,7 +209,7 @@
209 209
 </customwidgets>
210 210
 <layoutdefaults spacing="6" margin="11"/>
211 211
 <includehints>
212
-    <includehint>klistview.h</includehint>
213
-    <includehint>klistview.h</includehint>
212
+    <includehint>tdelistview.h</includehint>
213
+    <includehint>tdelistview.h</includehint>
214 214
 </includehints>
215 215
 </UI>

+ 1
- 1
kopete/kopete/config/identity/kopeteidentityconfig.cpp View File

@@ -60,7 +60,7 @@
60 60
 #include "kopeteaccount.h"
61 61
 #include "kopetecontact.h"
62 62
 #include "kopetecontactlist.h"
63
-#include "addressbookselectordialog.h"
63
+#include "addressbootdeselectordialog.h"
64 64
 #include "kopeteconfig.h"
65 65
 
66 66
 // Local includes

+ 1
- 1
kopete/kopete/contactlist/kopeteaddrbookexport.cpp View File

@@ -24,7 +24,7 @@
24 24
 
25 25
 #include <kdialogbase.h>
26 26
 #include <kiconloader.h>
27
-#include <klistbox.h>
27
+#include <tdelistbox.h>
28 28
 #include <klocale.h>
29 29
 
30 30
 #include "kopeteaccount.h"

+ 3
- 3
kopete/kopete/contactlist/kopetecontactlistview.cpp View File

@@ -33,14 +33,14 @@
33 33
 #include <tqtooltip.h>
34 34
 #include <tqguardedptr.h>
35 35
 
36
-#include <kaction.h>
36
+#include <tdeaction.h>
37 37
 #include <kapplication.h>
38 38
 #include <kdebug.h>
39 39
 #include <kiconloader.h>
40 40
 #include <klocale.h>
41
-#include <kmainwindow.h>
41
+#include <tdemainwindow.h>
42 42
 #include <kmessagebox.h>
43
-#include <kpopupmenu.h>
43
+#include <tdepopupmenu.h>
44 44
 #include <kurldrag.h>
45 45
 #include <tdemultipledrag.h>
46 46
 #include <kabc/stdaddressbook.h>

+ 1
- 1
kopete/kopete/contactlist/kopetegrouplistaction.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include <kdebug.h>
23 23
 #include <kguiitem.h>
24 24
 #include <klocale.h>
25
-#include <kaction.h>
25
+#include <tdeaction.h>
26 26
 #include <twin.h>
27 27
 #include <kcmultidialog.h>
28 28
 

+ 1
- 1
kopete/kopete/contactlist/kopetegrouplistaction.h View File

@@ -20,7 +20,7 @@
20 20
 #define KOPETEGRLISTACT_H
21 21
 
22 22
 
23
-#include <kaction.h>
23
+#include <tdeaction.h>
24 24
 
25 25
 
26 26
 /**

+ 1
- 1
kopete/kopete/contactlist/kopetelviprops.cpp View File

@@ -54,7 +54,7 @@
54 54
 #include "kopeteaccount.h"
55 55
 #include "kopeteprotocol.h"
56 56
 #include "addressbooklinkwidget.h"
57
-#include "addressbookselectordialog.h"
57
+#include "addressbootdeselectordialog.h"
58 58
 
59 59
 #include "customnotificationprops.h"
60 60
 #include "customnotifications.h"

+ 1
- 1
kopete/kopete/contactlist/kopetemetacontactlvi.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <klocale.h>
33 33
 #include <kmessagebox.h>
34 34
 #include <kpassivepopup.h>
35
-#include <kpopupmenu.h>
35
+#include <tdepopupmenu.h>
36 36
 #include <kglobal.h>
37 37
 #include <tdeconfig.h>
38 38
 #include <kapplication.h>

+ 1
- 1
kopete/kopete/contactlist/kopetemetacontactlvi.h View File

@@ -27,7 +27,7 @@
27 27
 #include <tqpixmap.h>
28 28
 #include <tqptrdict.h>
29 29
 
30
-#include <klistview.h>
30
+#include <tdelistview.h>
31 31
 
32 32
 class TQVariant;
33 33
 

+ 1
- 1
kopete/kopete/contactlist/kopetestatusgroupviewitem.h View File

@@ -20,7 +20,7 @@
20 20
 #ifndef KOPETESTATUSGROUPVIEWITEM_H
21 21
 #define KOPETESTATUSGROUPVIEWITEM_H
22 22
 
23
-#include <klistview.h>
23
+#include <tdelistview.h>
24 24
 #include "kopetemetacontact.h"
25 25
 
26 26
 /**

+ 1
- 1
kopete/kopete/kopeteeditglobalidentitywidget.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <klineedit.h>
29 29
 #include <kdebug.h>
30 30
 #include <klocale.h>
31
-#include <ktoolbar.h>
31
+#include <tdetoolbar.h>
32 32
 #include <kstandarddirs.h>
33 33
 #include <kurl.h>
34 34
 #include <tdefiledialog.h>

+ 4
- 4
kopete/kopete/kopetewindow.cpp View File

@@ -30,16 +30,16 @@
30 30
 #include <tqevent.h>
31 31
 #include <tqsignalmapper.h>
32 32
 
33
-#include <kaction.h>
34
-#include <kactionclasses.h>
33
+#include <tdeaction.h>
34
+#include <tdeactionclasses.h>
35 35
 #include <tdeconfig.h>
36 36
 #include <kdebug.h>
37 37
 #include <klocale.h>
38 38
 #include <kiconloader.h>
39 39
 #include <kmessagebox.h>
40 40
 #include <knotifydialog.h>
41
-#include <kpopupmenu.h>
42
-#include <kaccel.h>
41
+#include <tdepopupmenu.h>
42
+#include <tdeaccel.h>
43 43
 #include <kkeydialog.h>
44 44
 #include <kedittoolbar.h>
45 45
 #include <kmenubar.h>

+ 1
- 1
kopete/kopete/kopetewindow.h View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 #include <tqptrdict.h>
24 24
 
25
-#include <kmainwindow.h>
25
+#include <tdemainwindow.h>
26 26
 #include <tqlabel.h>
27 27
 
28 28
 class TQHBox;

+ 1
- 1
kopete/kopete/systemtray.cpp View File

@@ -25,7 +25,7 @@
25 25
 
26 26
 #include <twin.h>
27 27
 #include <kaboutdata.h>
28
-#include <kactioncollection.h>
28
+#include <tdeactioncollection.h>
29 29
 #include <kapplication.h>
30 30
 #include <kdebug.h>
31 31
 #include <kiconloader.h>

+ 2
- 2
kopete/libkopete/compat/kpixmapregionselectorwidget.cpp View File

@@ -31,8 +31,8 @@
31 31
 #include <kimageeffect.h>
32 32
 #include <kdebug.h>
33 33
 #include <klocale.h>
34
-#include <kpopupmenu.h>
35
-#include <kaction.h>
34
+#include <tdepopupmenu.h>
35
+#include <tdeaction.h>
36 36
 #include <stdlib.h>
37 37
 #include <tqcursor.h>
38 38
 #include <tqapplication.h>

+ 2
- 2
kopete/libkopete/kopeteaccount.cpp View File

@@ -26,8 +26,8 @@
26 26
 #include <klocale.h>
27 27
 #include <kiconloader.h>
28 28
 #include <kiconeffect.h>
29
-#include <kaction.h>
30
-#include <kpopupmenu.h>
29
+#include <tdeaction.h>
30
+#include <tdepopupmenu.h>
31 31
 #include <kmessagebox.h>
32 32
 #include <knotifyclient.h>
33 33
 

+ 2
- 2
kopete/libkopete/kopeteawayaction.h View File

@@ -19,8 +19,8 @@
19 19
 #define KOPETEAWAYACTION_H
20 20
 
21 21
 #include <tdeversion.h>
22
-#include <kactionclasses.h>
23
-#include <kaction.h>
22
+#include <tdeactionclasses.h>
23
+#include <tdeaction.h>
24 24
 
25 25
 #include "kopete_export.h"
26 26
 

kopete/libkopete/kopeteblactdelister.cpp → kopete/libkopete/kopeteblacklister.cpp View File


kopete/libkopete/kopeteblactdelister.h → kopete/libkopete/kopeteblacklister.h View File


+ 1
- 1
kopete/libkopete/kopetecommandhandler.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include <kprocess.h>
22 22
 #include <tdeversion.h>
23 23
 #include <kxmlguiclient.h>
24
-#include <kaction.h>
24
+#include <tdeaction.h>
25 25
 #include <tqdom.h>
26 26
 
27 27
 #include "kopetechatsessionmanager.h"

+ 1
- 1
kopete/libkopete/kopetecommandhandler.h View File

@@ -18,7 +18,7 @@
18 18
 #define _KOPETECOMMANDHANDLER_H_
19 19
 
20 20
 #include <tqdict.h>
21
-#include <kshortcut.h>
21
+#include <tdeshortcut.h>
22 22
 #include "kopetemessage.h"
23 23
 
24 24
 #include "kopete_export.h"

+ 3
- 3
kopete/libkopete/kopetecontact.cpp View File

@@ -29,9 +29,9 @@
29 29
 #include <kabcpersistence.h>
30 30
 #include <kdialogbase.h>
31 31
 #include <klocale.h>
32
-#include <kpopupmenu.h>
32
+#include <tdepopupmenu.h>
33 33
 #include <kmessagebox.h>
34
-#include <klistviewsearchline.h>
34
+#include <tdelistviewsearchline.h>
35 35
 
36 36
 #include "kopetecontactlist.h"
37 37
 #include "kopeteglobal.h"
@@ -51,7 +51,7 @@
51 51
 #include <tqimage.h>
52 52
 #include <tqmime.h>
53 53
 #include <tqvbox.h>
54
-#include <klistview.h>
54
+#include <tdelistview.h>
55 55
 #include <tqcheckbox.h>
56 56
 #include <tqwhatsthis.h>
57 57
 #include <tqstylesheet.h>

+ 1
- 1
kopete/libkopete/kopeteonlinestatusmanager.h View File

@@ -21,7 +21,7 @@
21 21
 #include <tqobject.h>
22 22
 
23 23
 #include "kopeteonlinestatus.h"
24
-#include "kaction.h"
24
+#include "tdeaction.h"
25 25
 
26 26
 class TQString;
27 27
 class TQPixmap;

+ 1
- 1
kopete/libkopete/kopeteprotocol.cpp View File

@@ -20,7 +20,7 @@
20 20
 #include "kopeteprotocol.h"
21 21
 
22 22
 #include <kdebug.h>
23
-#include <kaction.h>
23
+#include <tdeaction.h>
24 24
 #include <klocale.h>
25 25
 
26 26
 #include <tqdict.h>

+ 0
- 0
kopete/libkopete/private/kopetecommand.h View File


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

Loading…
Cancel
Save