Browse Source

Rename many classes and header files to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
da47dd9fc6
100 changed files with 198 additions and 198 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. +1
    -1
      kopete/libkopete/private/kopetecommand.h

+ 1
- 1
dcoprss/feedbrowser.cpp View File

@@ -5,7 +5,7 @@
#include <kcmdlineargs.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <dcopclient.h>



+ 1
- 1
dcoprss/feedbrowser.h View File

@@ -4,7 +4,7 @@
#include <tqobject.h>
#include <dcopobject.h>
#include <kdialogbase.h>
#include <klistview.h>
#include <tdelistview.h>

class DCOPRSSIface : public TQObject, public DCOPObject
{


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

@@ -36,8 +36,8 @@
#include <tqcursor.h>


#include <kpopupmenu.h>
#include <kaction.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <krestrictedline.h>
#include <klocale.h>
#include <tdefiledetailview.h>


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

@@ -30,7 +30,7 @@
#define _HIDDENFILEVIEW_H_

#include <tdefileitem.h>
#include <klistview.h>
#include <tdelistview.h>

#include "qmultichecklistitem.h"



+ 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
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kurllabel.h</includehint>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>


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

@@ -55,7 +55,7 @@
#include <krestrictedline.h>
#include <kmessagebox.h>
#include <kjanuswidget.h>
#include <klistview.h>
#include <tdelistview.h>
#include <ksimpleconfig.h>

#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>
<includehint>kpushbutton.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>krestrictedline.h</includehint>
<includehint>krestrictedline.h</includehint>
<includehint>krestrictedline.h</includehint>


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

@@ -61,8 +61,8 @@
#include <tdefiledetailview.h>
#include <kdirlister.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <kaction.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <krestrictedline.h>
#include <kjanuswidget.h>



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

@@ -37,7 +37,7 @@
#include <tqpushbutton.h>
#include <tqlineedit.h>

#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kdebug.h>
#include <kiconloader.h>


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

@@ -29,8 +29,8 @@
#include <kmessagebox.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <klistview.h>
#include <kaccel.h>
#include <tdelistview.h>
#include <tdeaccel.h>

#include "nfsdialog.h"
#include "nfsentry.h"


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

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

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

@@ -31,7 +31,7 @@
#include <kdialog.h>
#include <kdialogbase.h>
#include <kgenericfactory.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kiconloader.h>
#include <knfsshare.h>
#include <ksambashare.h>


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

@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <kmessagebox.h>
#include <kinputdialog.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <kprocess.h>
#include <kpushbutton.h>
#include <kcombobox.h>


+ 1
- 1
kdict/actions.cpp View File

@@ -21,7 +21,7 @@
#include <tqpushbutton.h>

#include <kcombobox.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>


DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name,


+ 1
- 1
kdict/actions.h View File

@@ -20,7 +20,7 @@

#include <tqguardedptr.h>
#include <tqptrlist.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kglobalsettings.h>

class KComboBox;


+ 1
- 1
kdict/matchview.cpp View File

@@ -21,7 +21,7 @@
#include <tqpainter.h>
#include <tqregexp.h>

#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <klocale.h>
#include <kapplication.h>
#include <kiconloader.h>


+ 1
- 1
kdict/options.cpp View File

@@ -33,7 +33,7 @@
#include <knuminput.h>
#include <klineedit.h>
#include <kcharsets.h>
#include <kfontdialog.h>
#include <tdefontdialog.h>
#include <kiconloader.h>

#include "options.h"


+ 1
- 1
kdict/queryview.cpp View File

@@ -22,7 +22,7 @@
#include <ktempfile.h>
#include <tdeio/netaccess.h>
#include <kcursor.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <tdehtml_events.h>


+ 1
- 1
kdict/toplevel.cpp View File

@@ -16,7 +16,7 @@

#include <tqclipboard.h>

#include <kstdaccel.h>
#include <tdestdaccel.h>
#include <kstdaction.h>
#include <kapplication.h>
#include <kstatusbar.h>


+ 1
- 1
kdict/toplevel.h View File

@@ -18,7 +18,7 @@
#define _TOPLEVEL_H_

#include <tqtimer.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include "dcopinterface.h"

class TQSplitter;


+ 1
- 1
kget/CMakeLists.txt View File

@@ -39,7 +39,7 @@ install( FILES kgetui.rc eventsrc DESTINATION ${DATA_INSTALL_DIR}/kget )
tde_add_executable( kget AUTOMOC
SOURCES
getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp
transfer.cpp settings.cpp logwindow.cpp kmainwidget.cpp tdefileio.cpp
transfer.cpp settings.cpp logwindow.cpp tdemainwidget.cpp tdefileio.cpp
droptarget.cpp docking.cpp dlgconnectionbase.ui dlgautomationbase.ui
dlglimitsbase.ui dlgadvancedbase.ui dlgdirectoriesbase.ui
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)
kget_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIBSOCKET)
kget_SOURCES = getfilejob.cpp slaveevent.cpp slave.cpp transferlist.cpp \
transfer.cpp settings.cpp logwindow.cpp \
kmainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \
tdemainwidget.cpp tdefileio.cpp droptarget.cpp docking.cpp \
dlgconnectionbase.ui dlgautomationbase.ui dlglimitsbase.ui \
dlgadvancedbase.ui dlgdirectoriesbase.ui dlgsystembase.ui \
dlgSystem.cpp dlgPreferences.cpp dlgLimits.cpp \
@@ -20,7 +20,7 @@ noinst_HEADERS = common.h \
dlgAdvanced.h dlgAutomation.h dlgConnection.h \
dlgDirectories.h dlgIndividual.h dlgLimits.h \
dlgPreferences.h dlgSystem.h docking.h droptarget.h \
tdefileio.h kmainwidget.h logwindow.h settings.h \
tdefileio.h tdemainwidget.h logwindow.h settings.h \
transfer.h transferlist.h version.h slave.h \
slaveevent.h http_defaults.h getfilejob.h dockindividual.h



+ 2
- 2
kget/dlgAdvanced.cpp View File

@@ -33,7 +33,7 @@
#include <tdeconfig.h>

#include "settings.h"
#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "dlgAdvanced.h"


@@ -74,7 +74,7 @@ void DlgAdvanced::applyData()
ksettings.b_showMain=cb_ShowMain->isChecked();

if (ksettings.b_expertMode != cb_expertmode->isChecked()) {
kmain->slotToggleExpertMode();
tdemain->slotToggleExpertMode();
}

bool bIsKonquiEnable=cb_konqiIntegration->isChecked();


+ 6
- 6
kget/dlgAutomation.cpp View File

@@ -38,7 +38,7 @@
#include <klineedit.h>

#include "settings.h"
#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "dlgAutomation.h"


@@ -106,12 +106,12 @@ void DlgAutomation::applyData()
if (cb_autoSave->isChecked() != ksettings.b_autoSave || (uint) le_autoSave->value() != ksettings.autoSaveInterval) {
ksettings.b_autoSave = cb_autoSave->isChecked();
ksettings.autoSaveInterval = le_autoSave->value();
kmain->setAutoSave();
tdemain->setAutoSave();
}

if (cb_autoDisconnect->isChecked() != ksettings.b_autoDisconnect) {
kmain->slotToggleAutoDisconnect();
kmain->setAutoDisconnect();
tdemain->slotToggleAutoDisconnect();
tdemain->setAutoDisconnect();
}

ksettings.disconnectCommand = le_autoDisconnect->text();
@@ -120,11 +120,11 @@ void DlgAutomation::applyData()
ksettings.disconnectTime = spins->dateTime().time();

if (cb_autoShutdown->isChecked() != ksettings.b_autoShutdown) {
kmain->slotToggleAutoShutdown();
tdemain->slotToggleAutoShutdown();
}

if (cb_autoPaste->isChecked() != ksettings.b_autoPaste) {
kmain->slotToggleAutoPaste();
tdemain->slotToggleAutoPaste();
}
}



+ 2
- 2
kget/dlgConnection.cpp View File

@@ -37,7 +37,7 @@
#include <kcombobox.h>


#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "settings.h"
#include "dlgConnection.h"

@@ -125,7 +125,7 @@ void DlgConnection::applyData()
ksettings.linkNumber = le_linknum->value();

if (cb_offlinemode->isChecked() != ksettings.b_offlineMode) {
kmain->slotToggleOfflineMode();
tdemain->slotToggleOfflineMode();
}
}



+ 2
- 2
kget/dlgIndividual.cpp View File

@@ -39,9 +39,9 @@
#include <kdatetimewidget.h>

#include <kapplication.h>
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <krun.h>
#include <tdeio/global.h>
#include "common.h"


+ 2
- 2
kget/dlgLimits.cpp View File

@@ -33,7 +33,7 @@
#include <kdialog.h>

#include "settings.h"
#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "dlgLimits.h"


@@ -61,7 +61,7 @@ void DlgLimits::applyData()
ksettings.maxSimultaneousConnections = le_maxnum->value();
ksettings.minimumBandwidth = le_minband->value();
ksettings.maximumBandwidth = le_maxband->value();
kmain->checkQueue();
tdemain->checkQueue();
}

void DlgLimits::slotChanged()


+ 2
- 2
kget/dlgPreferences.cpp View File

@@ -29,7 +29,7 @@

#include <kapplication.h>
#include <klocale.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kcombobox.h>

#include "dlgConnection.h"
@@ -45,7 +45,7 @@
#undef index
#endif

#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "dlgPreferences.h"




+ 4
- 4
kget/dlgSystem.cpp View File

@@ -32,10 +32,10 @@
#undef index
#endif

#include <kfontrequester.h>
#include <tdefontrequester.h>

#include "settings.h"
#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "dlgSystem.h"

#include <tqbuttongroup.h>
@@ -62,11 +62,11 @@ void DlgSystem::applyData()
{
if (cb_useAnimation->isChecked() != ksettings.b_useAnimation)
{
kmain->slotToggleAnimation();
tdemain->slotToggleAnimation();
}

ksettings.listViewFont = le_font->font();
kmain->setListFont();
tdemain->setListFont();
}

void DlgSystem::slotChanged()


+ 1
- 1
kget/dlgsystembase.ui View File

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

+ 1
- 1
kget/dockindividual.cpp View File

@@ -26,7 +26,7 @@

#include <tqtooltip.h>

#include <kpopupmenu.h>
#include <tdepopupmenu.h>

#include "dockindividual.h"
DockIndividual::DockIndividual(TQWidget *parent, const char *name ) : KSystemTray(parent,name)


+ 2
- 2
kget/docking.cpp View File

@@ -30,10 +30,10 @@
#include <kapplication.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kurldrag.h>

#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "settings.h"
#include "docking.h"



+ 14
- 14
kget/droptarget.cpp View File

@@ -26,18 +26,18 @@

#include <tqpainter.h>

#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <kglobalsettings.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <twin.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kurldrag.h>

#include "kmainwidget.h"
#include "tdemainwidget.h"
#include <tqcursor.h>
#ifdef TQ_WS_X11
#include <X11/Xlib.h>
@@ -98,9 +98,9 @@ DropTarget::DropTarget(TDEMainWindow * mainWin):TQWidget()
popupMenu->insertSeparator();
popupMenu->setItemChecked(pop_sticky, b_sticky);
kmain->m_paPreferences->plug(popupMenu);
tdemain->m_paPreferences->plug(popupMenu);
popupMenu->insertSeparator();
kmain->m_paQuit->plug(popupMenu);
tdemain->m_paQuit->plug(popupMenu);

isdragging = false;

@@ -129,14 +129,14 @@ DropTarget::mousePressEvent(TQMouseEvent * e)
}
else if (e->button() == Qt::RightButton)
{
popupMenu->setItemEnabled(pop_Min, kmain->isVisible());
popupMenu->setItemEnabled(pop_Max, kmain->isHidden());
popupMenu->setItemEnabled(pop_Min, tdemain->isVisible());
popupMenu->setItemEnabled(pop_Max, tdemain->isHidden());

popupMenu->popup(TQCursor::pos());
}
else if (e->button() == Qt::MidButton)
{
kmain->slotPasteTransfer();
tdemain->slotPasteTransfer();
}
}

@@ -163,11 +163,11 @@ void DropTarget::dropEvent(TQDropEvent * event)

if (KURLDrag::decode(event, list))
{
kmain->addTransfers(list);
tdemain->addTransfers(list);
}
else if (TQTextDrag::decode(event, str))
{
kmain->addTransfer(str);
tdemain->addTransfer(str);
}
}

@@ -193,10 +193,10 @@ void DropTarget::updateStickyState()

void DropTarget::toggleMinimizeRestore()
{
if (kmain->isVisible())
kmain->hide();
if (tdemain->isVisible())
tdemain->hide();
else
kmain->show();
tdemain->show();
}

/** No descriptions */


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

@@ -3,15 +3,15 @@
#include <tqlayout.h>

#include <dcopclient.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kiconloader.h>
#include <klistviewsearchline.h>
#include <tdelistviewsearchline.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kprocess.h>
#include <kstdaction.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>

#define COL_NAME 0
#define COL_DESC 1


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

@@ -10,8 +10,8 @@

#include <tqptrlist.h>

#include <klistview.h>
#include <kmainwindow.h>
#include <tdelistview.h>
#include <tdemainwindow.h>
#include <kurl.h>

#include "links.h"


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

@@ -26,11 +26,11 @@
#include <tdehtml_part.h>
#include <kiconloader.h>
#include <kglobal.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kinstance.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <krun.h>

#include <dom/html_document.h>


+ 4
- 4
kget/logwindow.cpp View File

@@ -30,10 +30,10 @@

#include <klocale.h>
#include <kdialog.h>
#include <kaction.h>
#include <tdeaction.h>

#include "transfer.h"
#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "logwindow.h"

#include <kapplication.h>
@@ -182,8 +182,8 @@ LogWindow::LogWindow():KDialogBase(Tabbed, i18n("Log Window"), Close, Close, 0,

void LogWindow::closeEvent(TQCloseEvent *e)
{
kmain->m_paShowLog->setChecked(false);
kmain->b_viewLogWindow = false;
tdemain->m_paShowLog->setChecked(false);
tdemain->b_viewLogWindow = false;
KDialogBase::closeEvent( e );
}



+ 16
- 16
kget/main.cpp View File

@@ -37,7 +37,7 @@
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "version.h"


@@ -64,9 +64,9 @@ static void signalHandler(int sigId)
{
fprintf(stderr, "*** KGet got signal %d\n", sigId);

if (sigId != SIGSEGV && kmain) {
if (sigId != SIGSEGV && tdemain) {
fprintf(stderr, "*** KGet saving data\n");
delete kmain;
delete tdemain;
}
// If Kget crashes again below this line we consider the data lost :-|
// Otherwise Kget will end in an infinite loop.
@@ -101,7 +101,7 @@ static void cleanup(void)
class KGetApp : public KUniqueApplication
{
private:
TDEMainWidget *kmainwidget;
TDEMainWidget *tdemainwidget;
public:
KGetApp() : KUniqueApplication()
@@ -110,7 +110,7 @@ public:
sDebugIn << endl;
#endif

kmainwidget=0;
tdemainwidget=0;

#ifdef _DEBUG
sDebugOut << endl;
@@ -122,7 +122,7 @@ public:
#ifdef _DEBUG
sDebugIn << endl;
#endif
delete kmainwidget;
delete tdemainwidget;
#ifdef _DEBUG
sDebugOut << endl;
#endif
@@ -132,26 +132,26 @@ public:
int newInstance()
{
#ifdef _DEBUG
sDebugIn <<"kmainwidget="<<kmainwidget << endl;
sDebugIn <<"tdemainwidget="<<tdemainwidget << endl;
#endif

TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();


if (kmainwidget==0)
if (tdemainwidget==0)
{
if(args->count()>0)
kmainwidget=new TDEMainWidget(true);
tdemainwidget=new TDEMainWidget(true);
else
kmainwidget=new TDEMainWidget();
setMainWidget(kmain);
tdemainwidget=new TDEMainWidget();
setMainWidget(tdemain);
}

else
TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId());

if (args->isSet("showDropTarget"))
kmain->activateDropTarget();
tdemain->activateDropTarget();

if (args->count()==1)
{
@@ -160,9 +160,9 @@ public:
#endif
TQString txt(args->arg(0));
if ( txt.endsWith( ".kgt" ) )
kmain->readTransfersEx(KURL::fromPathOrURL( txt ));
tdemain->readTransfersEx(KURL::fromPathOrURL( txt ));
else
kmain->addTransferEx( KURL::fromPathOrURL( txt ),
tdemain->addTransferEx( KURL::fromPathOrURL( txt ),
KURL());
}
else if(args->count()>=2)
@@ -175,11 +175,11 @@ public:
// Sometimes valid filenames are not recognised by KURL::isLocalFile(), they are marked as invalid then
if ( args->count()==2 && ( urls.last().isLocalFile() || !urls.last().isValid()))
{
kmain->addTransferEx( urls.first(), urls.last() );
tdemain->addTransferEx( urls.first(), urls.last() );
}
else
{
kmain->addTransfers( urls, TQString() );
tdemain->addTransfers( urls, TQString() );
}
}
args->clear();


+ 4
- 4
kget/settings.cpp View File

@@ -35,7 +35,7 @@

#include <tqdir.h>

#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "transferlist.h"
#include "droptarget.h"
#include "settings.h"
@@ -271,9 +271,9 @@ void Settings::save()

// write main window geometry properties
config->setGroup("MainGeometry");
config->writeEntry("Position", kmain->pos());
config->writeEntry("Size", kmain->size());
config->writeEntry("State", KWin::windowInfo(kmain->winId()).state());
config->writeEntry("Position", tdemain->pos());
config->writeEntry("Size", tdemain->size());
config->writeEntry("State", KWin::windowInfo(tdemain->winId()).state());

// write drop target geometry properties
config->setGroup("DropGeometry");


+ 5
- 5
kget/tdemainwidget.cpp View File

@@ -1,5 +1,5 @@
/***************************************************************************
* kmainwidget.cpp
* tdemainwidget.cpp
* -------------------
*
* begin : Tue Jan 29 2002
@@ -75,7 +75,7 @@
#include "settings.h"
#include "transfer.h"
#include "transferlist.h"
#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "tdefileio.h"
#include "dlgPreferences.h"
#include "logwindow.h"
@@ -99,7 +99,7 @@ struct KURLPair
KURL src;
};

TDEMainWidget *kmain = 0L;
TDEMainWidget *tdemain = 0L;

#define LOAD_ICON(X) TDEGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar)

@@ -139,7 +139,7 @@ TDEMainWidget::TDEMainWidget(bool bStartDocked)
b_viewPreferences = FALSE;

myTransferList = 0L;
kmain = this;
tdemain = this;

// Set log time, needed for the name of log file
TQDate date = TQDateTime::currentDateTime().date();
@@ -2545,4 +2545,4 @@ void TDEMainWidget::slotShowMenubar()
menuBar()->hide();
}

#include "kmainwidget.moc"
#include "tdemainwidget.moc"

+ 4
- 4
kget/tdemainwidget.h View File

@@ -1,5 +1,5 @@
/***************************************************************************
* kmainwidget.h
* tdemainwidget.h
* -------------------
*
* Revision : $Id$
@@ -28,8 +28,8 @@
#ifndef _KMAINWIDGET_H_
#define _KMAINWIDGET_H_

#include <kmainwindow.h>
#include <kaction.h>
#include <tdemainwindow.h>
#include <tdeaction.h>
#include <kurl.h>
#include "common.h"

@@ -227,7 +227,7 @@ private:

};

extern TDEMainWidget *kmain;
extern TDEMainWidget *tdemain;
extern DropTarget *kdrop;

#endif // _KMAINWIDGET_H_

+ 6
- 6
kget/transfer.cpp View File

@@ -29,7 +29,7 @@
#include <kmessagebox.h>
#include <klocale.h>
#include <ksimpleconfig.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <twin.h>
@@ -39,7 +39,7 @@
#include "safedelete.h"
#include "settings.h"
#include "logwindow.h"
#include "kmainwidget.h"
#include "tdemainwidget.h"
#include "dlgIndividual.h"
#include "transferlist.h"
#include "transfer.h"
@@ -118,10 +118,10 @@ Transfer::init(const uint _id)
status = ST_STOPPED;


connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), kmain, TQT_SLOT(slotStatusChanged(Transfer *, int)));
connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), tdemain, TQT_SLOT(slotStatusChanged(Transfer *, int)));
connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), this, TQT_SLOT(slotUpdateActions()));

connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), kmain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &)));
connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), tdemain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &)));

// setup actions
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)
}

if (!src.isValid() && !ksettings.b_expertMode) {
KMessageBox::error(kmain, i18n("Malformed URL:\n") + src.prettyURL(), i18n("Error"));
KMessageBox::error(tdemain, i18n("Malformed URL:\n") + src.prettyURL(), i18n("Error"));
return false;
}

@@ -840,7 +840,7 @@ void Transfer::slotExecPause()
m_paResume->setEnabled(true);
slotUpdateActions();
//TODO WE NEED TO UPDATE ACTIONS..
kmain->slotUpdateActions();
tdemain->slotUpdateActions();
emit statusChanged(this, OP_PAUSED);
sDebugOut << endl;
}


+ 1
- 1
kget/transfer.h View File

@@ -28,7 +28,7 @@
#ifndef _Transfer_h
#define _Transfer_h

#include <klistview.h>
#include <tdelistview.h>
#include <tqdatetime.h>
#include <tqguardedptr.h>
#include <tqmap.h>


+ 1
- 1
kget/transferlist.h View File

@@ -27,7 +27,7 @@
#ifndef _TransferList_h
#define _TransferList_h

#include <klistview.h>
#include <tdelistview.h>
#include <tqptrlist.h>

#include <kurl.h>


+ 1
- 1
knewsticker/knewsticker.h View File

@@ -19,7 +19,7 @@

#include <tqtoolbutton.h>
#include <kpanelapplet.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>

#include "configiface.h"
#include "configaccess.h"


+ 3
- 3
knewsticker/knewstickerconfig.cpp View File

@@ -18,13 +18,13 @@
#include <kcolorbutton.h>
#include <kcombobox.h>
#include <kdebug.h>
#include <kfontdialog.h>
#include <tdefontdialog.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kmessagebox.h>
#include <knuminput.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>

#include <tqcursor.h>
#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
<include location="global" impldecl="in declaration">kcolorbutton.h</include>
<include location="global" impldecl="in declaration">kcombobox.h</include>
<include location="global" impldecl="in declaration">klineedit.h</include>
<include location="global" impldecl="in declaration">klistview.h</include>
<include location="global" impldecl="in declaration">tdelistview.h</include>
<include location="global" impldecl="in declaration">knuminput.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kcombobox.h</includehint>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>


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

@@ -18,7 +18,7 @@
#include <loader.h>

#include <kapplication.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <klocale.h>
#include <kurl.h>
#include <kurllabel.h>


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

@@ -202,7 +202,7 @@
</image>
</images>
<includes>
<include location="global" impldecl="in declaration">klistbox.h</include>
<include location="global" impldecl="in declaration">tdelistbox.h</include>
<include location="global" impldecl="in declaration">kurllabel.h</include>
<include location="global" impldecl="in declaration">kseparator.h</include>
</includes>
@@ -210,6 +210,6 @@
<includehints>
<includehint>kurllabel.h</includehint>
<includehint>kseparator.h</includehint>
<includehint>klistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
</includehints>
</UI>

+ 1
- 1
kopete/KABC_INTEG_NOTES View File

@@ -57,7 +57,7 @@ Policy:
One way kopete->kabc contacts
, achieve bidi later
<Bille> what about the sync policy between IM contacts contained in kabc and in kopete
<spaze> mETz: alt-enter doesn't work? report a bug to klistview/qlistview, that sucks :( </ot>
<spaze> mETz: alt-enter doesn't work? report a bug to tdelistview/qlistview, that sucks :( </ot>
<gregj> hyhy
<spaze> Bille: implied i'd say
<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 @@
#include <kcolorbutton.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kplugininfo.h>


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

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

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

@@ -56,14 +56,14 @@

#include <kpushbutton.h>
#include <kdebug.h>
#include <klistview.h>
#include <tdelistview.h>
// used for its AddresseeItem class
#include <kabc/addresseedialog.h>
#include <kabc/addressbook.h>
#include <kabc/stdaddressbook.h>

#include <addcontactpage.h>
#include "addressbookselectorwidget.h"
#include "addressbootdeselectorwidget.h"
#include "addcontactwizard.h"
#include "kopetecontactlist.h"
#include "kopetemetacontact.h"


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

@@ -480,8 +480,8 @@
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

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

@@ -21,14 +21,14 @@
#ifndef FASTADDCONTACTWIZARD_H
#define FASTADDCONTACTWIZARD_H
#include <kdebug.h>
#include <klistview.h>
#include <tdelistview.h>

#include <tqptrlist.h>
#include <tqvaluelist.h>
#include <tqmap.h>

#include <kdebug.h>
#include <klistview.h>
#include <tdelistview.h>

#include "fastaddcontactwizard_base.h"



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

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

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

@@ -30,7 +30,7 @@
#include <kabc/vcardconverter.h>
#include <kdebug.h>
#include <tdemultipledrag.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>

#include <tqheader.h>
#include <tqtooltip.h>


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

@@ -18,7 +18,7 @@
#ifndef CHATMEMBERSLISTWIDGET_H
#define CHATMEMBERSLISTWIDGET_H

#include <klistview.h>
#include <tdelistview.h>

#include <tqmap.h>



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

@@ -55,7 +55,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <tdemultipledrag.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <krun.h>
#include <kstringhandler.h>
#include <ktempfile.h>


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

@@ -37,7 +37,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstringhandler.h>
#include <twin.h>
#include <kurldrag.h>


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

@@ -31,7 +31,7 @@
#include <klocale.h>
#include <kmenubar.h>
#include <tdeconfig.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <twin.h>
@@ -45,7 +45,7 @@
#include <kdialog.h>
#include <kstringhandler.h>
#include <ksqueezedtextlabel.h>
#include <kstdaccel.h>
#include <tdestdaccel.h>
#include <kglobalsettings.h>

#include "chatmessagepart.h"
@@ -64,7 +64,7 @@
#include "kopeteviewmanager.h"

#include <tqtoolbutton.h>
#include <kactionclasses.h>
#include <tdeactionclasses.h>

typedef TQMap<Kopete::Account*,KopeteChatWindow*> AccountMap;
typedef TQMap<Kopete::Group*,KopeteChatWindow*> GroupMap;


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

@@ -31,7 +31,7 @@
#include "kopetestdaction.h"
#include "kopeteviewmanager.h"

#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kcolordialog.h>
#include <tdeconfig.h>
@@ -39,7 +39,7 @@
#include <kdebug.h>
#include <tdeversion.h>
#include <kedittoolbar.h>
#include <kfontdialog.h>
#include <tdefontdialog.h>
#include <kglobalsettings.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
@@ -48,7 +48,7 @@
#include <klocale.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <ktextedit.h>
#include <twin.h>


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

@@ -22,7 +22,7 @@

#include "kopeteview.h"
#include "kopeteviewplugin.h"
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <tdeparts/mainwindow.h>

namespace KParts { struct URLArgs; }


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

@@ -28,9 +28,9 @@
#include <kdebug.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kpopupmenu.h>
#include <ktoolbar.h>
#include <ktoolbarbutton.h>
#include <tdepopupmenu.h>
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>

#include "emoticonselector.h"
#include "kopeteemoticons.h"


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

@@ -21,7 +21,7 @@
#ifndef _KOPETEEMOTICONACTION_H_
#define _KOPETEEMOTICONACTION_H_

#include <kaction.h>
#include <tdeaction.h>

class KopeteEmoticonAction : public TDEAction
{


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

@@ -1,8 +1,8 @@
#include <ktextedit.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kcolordialog.h>
#include <kglobalsettings.h>
#include <kfontdialog.h>
#include <tdefontdialog.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdeversion.h>


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

@@ -28,7 +28,7 @@
#include <kdialogbase.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>



+ 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
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>


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

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


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

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


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

@@ -447,10 +447,10 @@
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kfontrequester.h</includehint>
<includehint>kfontrequester.h</includehint>
<includehint>kfontrequester.h</includehint>
<includehint>kfontrequester.h</includehint>
<includehint>tdefontrequester.h</includehint>
<includehint>tdefontrequester.h</includehint>
<includehint>tdefontrequester.h</includehint>
<includehint>tdefontrequester.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
</includehints>


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

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

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

@@ -21,7 +21,7 @@
#include "kopeteemoticons.h"

#include <klocale.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kstandarddirs.h>
#include <tdefiledialog.h>
#include <tdeio/job.h>


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

@@ -82,6 +82,6 @@
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

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

@@ -27,7 +27,7 @@
#include <tqstringlist.h>

#include <kiconloader.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>

class TooltipItem : public TDEListViewItem


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

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

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

@@ -60,7 +60,7 @@
#include "kopeteaccount.h"
#include "kopetecontact.h"
#include "kopetecontactlist.h"
#include "addressbookselectordialog.h"
#include "addressbootdeselectordialog.h"
#include "kopeteconfig.h"

// Local includes


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

@@ -24,7 +24,7 @@

#include <kdialogbase.h>
#include <kiconloader.h>
#include <klistbox.h>
#include <tdelistbox.h>
#include <klocale.h>

#include "kopeteaccount.h"


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

@@ -33,14 +33,14 @@
#include <tqtooltip.h>
#include <tqguardedptr.h>

#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kurldrag.h>
#include <tdemultipledrag.h>
#include <kabc/stdaddressbook.h>


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

@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <kguiitem.h>
#include <klocale.h>
#include <kaction.h>
#include <tdeaction.h>
#include <twin.h>
#include <kcmultidialog.h>



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

@@ -20,7 +20,7 @@
#define KOPETEGRLISTACT_H


#include <kaction.h>
#include <tdeaction.h>


/**


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

@@ -54,7 +54,7 @@
#include "kopeteaccount.h"
#include "kopeteprotocol.h"
#include "addressbooklinkwidget.h"
#include "addressbookselectordialog.h"
#include "addressbootdeselectordialog.h"

#include "customnotificationprops.h"
#include "customnotifications.h"


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

@@ -32,7 +32,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kpassivepopup.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kapplication.h>


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

@@ -27,7 +27,7 @@
#include <tqpixmap.h>
#include <tqptrdict.h>

#include <klistview.h>
#include <tdelistview.h>

class TQVariant;



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

@@ -20,7 +20,7 @@
#ifndef KOPETESTATUSGROUPVIEWITEM_H
#define KOPETESTATUSGROUPVIEWITEM_H

#include <klistview.h>
#include <tdelistview.h>
#include "kopetemetacontact.h"

/**


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

@@ -28,7 +28,7 @@
#include <klineedit.h>
#include <kdebug.h>
#include <klocale.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kstandarddirs.h>
#include <kurl.h>
#include <tdefiledialog.h>


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

@@ -30,16 +30,16 @@
#include <tqevent.h>
#include <tqsignalmapper.h>

#include <kaction.h>
#include <kactionclasses.h>
#include <tdeaction.h>
#include <tdeactionclasses.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <knotifydialog.h>
#include <kpopupmenu.h>
#include <kaccel.h>
#include <tdepopupmenu.h>
#include <tdeaccel.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>
#include <kmenubar.h>


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

@@ -22,7 +22,7 @@

#include <tqptrdict.h>

#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <tqlabel.h>

class TQHBox;


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

@@ -25,7 +25,7 @@

#include <twin.h>
#include <kaboutdata.h>
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kiconloader.h>


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

@@ -31,8 +31,8 @@
#include <kimageeffect.h>
#include <kdebug.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <kaction.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <stdlib.h>
#include <tqcursor.h>
#include <tqapplication.h>


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

@@ -26,8 +26,8 @@
#include <klocale.h>
#include <kiconloader.h>
#include <kiconeffect.h>
#include <kaction.h>
#include <kpopupmenu.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <knotifyclient.h>



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

@@ -19,8 +19,8 @@
#define KOPETEAWAYACTION_H

#include <tdeversion.h>
#include <kactionclasses.h>
#include <kaction.h>
#include <tdeactionclasses.h>
#include <tdeaction.h>

#include "kopete_export.h"



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 @@
#include <kprocess.h>
#include <tdeversion.h>
#include <kxmlguiclient.h>
#include <kaction.h>
#include <tdeaction.h>
#include <tqdom.h>

#include "kopetechatsessionmanager.h"


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

@@ -18,7 +18,7 @@
#define _KOPETECOMMANDHANDLER_H_

#include <tqdict.h>
#include <kshortcut.h>
#include <tdeshortcut.h>
#include "kopetemessage.h"

#include "kopete_export.h"


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

@@ -29,9 +29,9 @@
#include <kabcpersistence.h>
#include <kdialogbase.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <klistviewsearchline.h>
#include <tdelistviewsearchline.h>

#include "kopetecontactlist.h"
#include "kopeteglobal.h"
@@ -51,7 +51,7 @@
#include <tqimage.h>
#include <tqmime.h>
#include <tqvbox.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
#include <tqstylesheet.h>


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

@@ -21,7 +21,7 @@
#include <tqobject.h>

#include "kopeteonlinestatus.h"
#include "kaction.h"
#include "tdeaction.h"

class TQString;
class TQPixmap;


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

@@ -20,7 +20,7 @@
#include "kopeteprotocol.h"

#include <kdebug.h>
#include <kaction.h>
#include <tdeaction.h>
#include <klocale.h>

#include <tqdict.h>


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

@@ -19,7 +19,7 @@
#define __KOPETECOMMAND_H__

#include <tqobject.h>
#include <kaction.h>
#include <tdeaction.h>
#include "kopetecommandhandler.h"

namespace Kopete


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

Loading…
Cancel
Save