Browse Source

Rename additional header files to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
cfb328d590
100 changed files with 153 additions and 153 deletions
  1. 1
    1
      README
  2. 1
    1
      akregator/src/actionmanagerimpl.cpp
  3. 2
    2
      akregator/src/addfeeddialog.cpp
  4. 1
    1
      akregator/src/akregator_options.h
  5. 3
    3
      akregator/src/akregator_part.cpp
  6. 2
    2
      akregator/src/akregator_view.cpp
  7. 2
    2
      akregator/src/articlelistview.cpp
  8. 3
    3
      akregator/src/articleviewer.cpp
  9. 1
    1
      akregator/src/articleviewer.h
  10. 1
    1
      akregator/src/configdialog.cpp
  11. 1
    1
      akregator/src/feed.cpp
  12. 1
    1
      akregator/src/feedlist.cpp
  13. 1
    1
      akregator/src/feedlistview.cpp
  14. 1
    1
      akregator/src/frame.cpp
  15. 1
    1
      akregator/src/main.cpp
  16. 3
    3
      akregator/src/mainwindow.cpp
  17. 1
    1
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  18. 2
    2
      akregator/src/mk4storage/mk4confwidget.cpp
  19. 1
    1
      akregator/src/mk4storage/mk4plugin.cpp
  20. 1
    1
      akregator/src/mk4storage/storagefactorymk4impl.cpp
  21. 1
    1
      akregator/src/notificationmanager.cpp
  22. 2
    2
      akregator/src/pageviewer.cpp
  23. 2
    2
      akregator/src/pluginmanager.cpp
  24. 1
    1
      akregator/src/progressmanager.cpp
  25. 1
    1
      akregator/src/propertiesdialog.cpp
  26. 1
    1
      akregator/src/searchbar.cpp
  27. 1
    1
      akregator/src/simplenodeselector.cpp
  28. 1
    1
      akregator/src/speechclient.cpp
  29. 1
    1
      akregator/src/storagefactorydummyimpl.cpp
  30. 1
    1
      akregator/src/tabwidget.cpp
  31. 1
    1
      akregator/src/tagnodelist.cpp
  32. 1
    1
      akregator/src/tagpropertiesdialog.cpp
  33. 2
    2
      akregator/src/trayicon.cpp
  34. 2
    2
      akregator/src/viewer.cpp
  35. 1
    1
      certmanager/CMakeLists.txt
  36. 1
    1
      certmanager/aboutdata.cpp
  37. 3
    3
      certmanager/certificateinfowidgetimpl.cpp
  38. 4
    4
      certmanager/certificatewizardimpl.cpp
  39. 3
    3
      certmanager/certmanager.cpp
  40. 2
    2
      certmanager/conf/appearanceconfigpage.cpp
  41. 2
    2
      certmanager/conf/appearanceconfigwidget.cpp
  42. 1
    1
      certmanager/conf/configuredialog.cpp
  43. 3
    3
      certmanager/conf/dirservconfigpage.cpp
  44. 3
    3
      certmanager/crlview.cpp
  45. 1
    1
      certmanager/kwatchgnupg/aboutdata.cpp
  46. 1
    1
      certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
  47. 2
    2
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  48. 3
    3
      certmanager/kwatchgnupg/main.cpp
  49. 2
    2
      certmanager/kwatchgnupg/tray.cpp
  50. 1
    1
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  51. 2
    2
      certmanager/lib/backends/chiasmus/chiasmusjob.cpp
  52. 1
    1
      certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
  53. 2
    2
      certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
  54. 1
    1
      certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
  55. 1
    1
      certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
  56. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
  57. 3
    3
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  58. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
  59. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmejob.cpp
  60. 2
    2
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
  61. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  62. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
  63. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
  64. 2
    2
      certmanager/lib/cryptplugfactory.cpp
  65. 2
    2
      certmanager/lib/cryptplugwrapper.cpp
  66. 2
    2
      certmanager/lib/kleo/cryptobackendfactory.cpp
  67. 1
    1
      certmanager/lib/kleo/dn.cpp
  68. 1
    1
      certmanager/lib/kleo/enum.cpp
  69. 1
    1
      certmanager/lib/kleo/hierarchicalkeylistjob.cpp
  70. 1
    1
      certmanager/lib/kleo/multideletejob.cpp
  71. 1
    1
      certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
  72. 1
    1
      certmanager/lib/tests/test_gnupgprocessbase.cpp
  73. 1
    1
      certmanager/lib/tests/test_keygen.cpp
  74. 1
    1
      certmanager/lib/tests/test_keyselectiondialog.cpp
  75. 2
    2
      certmanager/lib/ui/backendconfigwidget.cpp
  76. 1
    1
      certmanager/lib/ui/cryptoconfigdialog.cpp
  77. 2
    2
      certmanager/lib/ui/cryptoconfigmodule.cpp
  78. 1
    1
      certmanager/lib/ui/dnattributeorderconfigwidget.cpp
  79. 2
    2
      certmanager/lib/ui/keyapprovaldialog.cpp
  80. 2
    2
      certmanager/lib/ui/keyrequester.cpp
  81. 3
    3
      certmanager/lib/ui/keyselectiondialog.cpp
  82. 1
    1
      certmanager/lib/ui/messagebox.cpp
  83. 1
    1
      certmanager/lib/ui/messagebox.h
  84. 1
    1
      certmanager/lib/ui/passphrasedialog.cpp
  85. 1
    1
      certmanager/lib/ui/progressdialog.cpp
  86. 3
    3
      certmanager/main.cpp
  87. 1
    1
      doc/kaddressbook/index.docbook
  88. 1
    1
      doc/kpilot/configuration.docbook
  89. 1
    1
      kabc/frontend/main.cpp
  90. 2
    2
      kabc/frontend/mainWindow.ui.h
  91. 1
    1
      kabc/kabc2mutt/CMakeLists.txt
  92. 2
    2
      kabc/kabc2mutt/kabc2mutt.cpp
  93. 1
    1
      kabc/kabc2mutt/kabc2mutt.h
  94. 1
    1
      kabc/kabc2mutt/main.cpp
  95. 4
    4
      kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
  96. 2
    2
      kaddressbook/addresseditwidget.cpp
  97. 2
    2
      kaddressbook/addresseditwidget.h
  98. 1
    1
      kaddressbook/addresseeconfig.h
  99. 1
    1
      kaddressbook/addresseeeditorbase.h
  100. 0
    0
      kaddressbook/addresseeeditordialog.cpp

+ 1
- 1
README View File

@@ -48,7 +48,7 @@ There is also quite an amount of infrastructure in this package:
* libkcal: C++ api for the iCalendar and vCalendar formats
* libkcal/libical: a basic iCalendar protocol implementation, see RFCs 2245,2246
* libkpimexchange: connecting to Exchange2000 servers
* kabc/frontend: A GUI frontend for libkabc, not intended for end users.
* tdeabc/frontend: A GUI frontend for libkabc, not intended for end users.
* kgantt: lib to display and manage Gantt diagrams used by the project view
plugin of KOrganizer
* kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of

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

@@ -25,7 +25,7 @@
#include <tqwidget.h>
#include <tdeaction.h>
#include <tdeactioncollection.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tdeshortcut.h>
#include <kxmlguifactory.h>

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

@@ -29,13 +29,13 @@

#include <tdeapplication.h>
#include <kurl.h>
#include <klocale.h>
#include <tdelocale.h>
#include <klineedit.h>
#include <kiconloader.h>
#include <kicontheme.h>
#include <kdebug.h>
#include <ksqueezedtextlabel.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>

namespace Akregator {


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

@@ -26,7 +26,7 @@
#define AKREGATOR_OPTIONS_H

#include <tdecmdlineargs.h>
#include <klocale.h>
#include <tdelocale.h>

namespace Akregator {


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

@@ -31,18 +31,18 @@
#include <tdeconfig.h>
#include <tdeconfigdialog.h>
#include <tdefiledialog.h>
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <tdehtmldefaults.h>
#include <kinstance.h>
#include <tdemainwindow.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <knotifydialog.h>
#include <tdepopupmenu.h>
#include <kservice.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
#include <ktempfile.h>
#include <tdetempfile.h>
#include <ktrader.h>
#include <tdeio/netaccess.h>
#include <tdeparts/browserinterface.h>

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

@@ -73,8 +73,8 @@
#include <kinputdialog.h>
#include <klineedit.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kpassdlg.h>
#include <kprocess.h>
#include <krun.h>

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

@@ -34,9 +34,9 @@

#include <kstandarddirs.h>
#include <kdebug.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kcharsets.h>
#include <kurl.h>


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

@@ -30,14 +30,14 @@
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <tdehtmlview.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kprocess.h>
#include <krun.h>
#include <kstandarddirs.h>
#include <kshell.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <libtdepim/tdefileio.h>


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

@@ -26,7 +26,7 @@
#ifndef ARTICLEVIEWER_H
#define ARTICLEVIEWER_H

#include <klocale.h>
#include <tdelocale.h>

#include <tqcolor.h>
#include <tqfont.h>

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

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

#include <kcombobox.h>
#include <klocale.h>
#include <tdelocale.h>

#include "configdialog.h"


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

@@ -33,7 +33,7 @@

#include <kurl.h>
#include <kdebug.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kstandarddirs.h>

#include "akregatorconfig.h"

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

@@ -29,7 +29,7 @@
#include <tqvaluelist.h>

#include <kdebug.h>
#include <klocale.h>
#include <tdelocale.h>

#include "article.h"
#include "feed.h"

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

@@ -42,7 +42,7 @@
#include <kdebug.h>
#include <kiconeffect.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdemultipledrag.h>
#include <kstringhandler.h>
#include <kurldrag.h>

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

@@ -27,7 +27,7 @@

#include <tdeactioncollection.h>
#include <kdebug.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/part.h>


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

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

#include <dcopref.h>
#include <tdecmdlineargs.h>
#include <klocale.h>
#include <tdelocale.h>
#include <knotifyclient.h>
#include <kuniqueapplication.h>


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

@@ -36,11 +36,11 @@
#include <kdebug.h>
#include <kedittoolbar.h>
#include <tdefiledialog.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kkeydialog.h>
#include <klibloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdeparts/partmanager.h>
#include <ksqueezedtextlabel.h>
#include <kstandarddirs.h>

+ 1
- 1
akregator/src/mk4storage/feedstoragemk4impl.cpp View File

@@ -35,7 +35,7 @@
#include <tqfile.h>

#include <kdebug.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kstandarddirs.h>

namespace Akregator {

+ 2
- 2
akregator/src/mk4storage/mk4confwidget.cpp View File

@@ -28,8 +28,8 @@

#include <tqcheckbox.h>
#include <tqlabel.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kurlrequester.h>

namespace Akregator {

+ 1
- 1
akregator/src/mk4storage/mk4plugin.cpp View File

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

#include "mk4plugin.h"

#include <klocale.h>
#include <tdelocale.h>

#include "storagefactorymk4impl.h"
#include "storagefactoryregistry.h"

+ 1
- 1
akregator/src/mk4storage/storagefactorymk4impl.cpp View File

@@ -26,7 +26,7 @@
//#include "mk4confwidget.h"
//#include "mk4config.h"

#include <klocale.h>
#include <tdelocale.h>
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqwidget.h>

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

@@ -22,7 +22,7 @@
without including the source code for TQt in the source distribution.
*/

#include <klocale.h>
#include <tdelocale.h>
#include <knotifyclient.h>
#include <kstaticdeleter.h>
#include <kurl.h>

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

@@ -34,11 +34,11 @@
#include <kbookmark.h>
#include <kbookmarkmanager.h>
#include <tdeconfig.h>
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>
#include <tdehtml_settings.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <tdestdaccel.h>

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

@@ -23,8 +23,8 @@ email : markey@web.de

#include <klibloader.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>

using std::vector;
using Akregator::Plugin;

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

@@ -25,7 +25,7 @@
#include <tqmap.h>
#include <tqstylesheet.h>

#include <klocale.h>
#include <tdelocale.h>
#include <kstaticdeleter.h>

#include <libtdepim/progressmanager.h>

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

@@ -29,7 +29,7 @@
#include <kcombobox.h>
#include <klineedit.h>
#include <kpassdlg.h>
#include <klocale.h>
#include <tdelocale.h>
#include <knuminput.h>

#include <tqcheckbox.h>

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

@@ -30,7 +30,7 @@
#include <kcombobox.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kstandarddirs.h>

#include <tqapplication.h>

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

@@ -29,7 +29,7 @@
#include "treenodevisitor.h"

#include <tdelistview.h>
#include <klocale.h>
#include <tdelocale.h>

#include <tqlayout.h>
#include <tqmap.h>

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

@@ -29,7 +29,7 @@
#include <dcopclient.h>
#include <tdeapplication.h>
#include <kcharsets.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kstaticdeleter.h>
#include <ktrader.h>

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

@@ -24,7 +24,7 @@
#include "storagefactorydummyimpl.h"
#include "storagedummyimpl.h"

#include <klocale.h>
#include <tdelocale.h>
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqwidget.h>

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

@@ -40,7 +40,7 @@
#include <ktabbar.h>
#include <tdepopupmenu.h>
#include <krun.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdehtmlview.h>
#include <tdehtml_part.h>
#include <kiconloader.h>

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

@@ -36,7 +36,7 @@
#include <tqvaluelist.h>

#include <tdeapplication.h>
#include <klocale.h>
#include <tdelocale.h>

namespace Akregator {


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

@@ -23,7 +23,7 @@
*/

#include <kicondialog.h>
#include <klocale.h>
#include <tdelocale.h>

#include <tqlineedit.h>


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

@@ -29,8 +29,8 @@
#include <twin.h>
#include <kiconeffect.h>
#include <kdebug.h>
#include <klocale.h>
#include <kglobalsettings.h>
#include <tdelocale.h>
#include <tdeglobalsettings.h>
#include <dcopclient.h>
#include <dcopref.h>
#include <tdepopupmenu.h>

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

@@ -28,8 +28,8 @@
#include <tdefiledialog.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
#include <krun.h>

+ 1
- 1
certmanager/CMakeLists.txt View File

@@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC
hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp
certificateinfowidget.ui certificateinfowidgetimpl.cpp
crlview.cpp storedtransferjob.cpp certlistview.cpp
LINK conf-static kleopatra-shared tdeutils-shared kabc-shared
LINK conf-static kleopatra-shared tdeutils-shared tdeabc-shared
DESTINATION ${BIN_INSTALL_DIR}
)


+ 1
- 1
certmanager/aboutdata.cpp View File

@@ -36,7 +36,7 @@

#include "aboutdata.h"

#include <klocale.h>
#include <tdelocale.h>

static const char kleopatra_version[] = "0.40";
static const char description[] = I18N_NOOP("TDE Key Manager");

+ 3
- 3
certmanager/certificateinfowidgetimpl.cpp View File

@@ -47,12 +47,12 @@
#include <gpgmepp/keylistresult.h>

// KDE
#include <klocale.h>
#include <tdelocale.h>
#include <kdialogbase.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <kdebug.h>
#include <kprocio.h>
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>

// TQt
#include <tqlistview.h>

+ 4
- 4
certmanager/certificatewizardimpl.cpp View File

@@ -49,11 +49,11 @@
#include <gpgmepp/keygenerationresult.h>

// KDE
#include <kabc/stdaddressbook.h>
#include <kabc/addressee.h>
#include <tdeabc/stdaddressbook.h>
#include <tdeabc/addressee.h>

#include <kmessagebox.h>
#include <klocale.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>

+ 3
- 3
certmanager/certmanager.cpp View File

@@ -75,8 +75,8 @@
#include <kprocess.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <dcopclient.h>
#include <tdetoolbar.h>
#include <kstatusbar.h>
@@ -84,7 +84,7 @@
#include <kdebug.h>
#include <kdialogbase.h>
#include <kkeydialog.h>
#include <ktempfile.h>
#include <tdetempfile.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <tdestdaccel.h>

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

@@ -32,8 +32,8 @@
#include "appearanceconfigpage.h"
#include <tqlayout.h>
#include "appearanceconfigwidget.h"
#include <kmessagebox.h>
#include <klocale.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <kdebug.h>

#include <tdepimmacros.h>

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

@@ -43,9 +43,9 @@
#include <tdelistview.h>
#include <tdeconfig.h>
#include <kdialog.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <tdefontdialog.h>
#include <kcolordialog.h>


+ 1
- 1
certmanager/conf/configuredialog.cpp View File

@@ -36,7 +36,7 @@
#include <twin.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <tdelocale.h>

ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
: KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal )

+ 3
- 3
certmanager/conf/dirservconfigpage.cpp View File

@@ -34,8 +34,8 @@

#include <kleo/cryptobackendfactory.h>

#include <kmessagebox.h>
#include <klocale.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <knuminput.h>
@@ -62,7 +62,7 @@ public:
KURL::List readCurrentList() const {

KURL::List lst;
// stolen from kabc/ldapclient.cpp
// stolen from tdeabc/ldapclient.cpp
const uint numHosts = mConfig.readUnsignedNumEntry( "NumSelectedHosts" );
for ( uint j = 0; j < numHosts; j++ ) {
const TQString num = TQString::number( j );

+ 3
- 3
certmanager/crlview.cpp View File

@@ -36,12 +36,12 @@

#include "crlview.h"

#include <klocale.h>
#include <tdelocale.h>
#include <kprocess.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include <kglobalsettings.h>
#include <tdeglobalsettings.h>

#include <tqlayout.h>
#include <tqlabel.h>

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

@@ -32,7 +32,7 @@

#include "aboutdata.h"

#include <klocale.h>
#include <tdelocale.h>

static const char kwatchgnupg_version[] = "1.0";
static const char description[] = I18N_NOOP("GnuPG log viewer");

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

@@ -32,7 +32,7 @@

#include "kwatchgnupgconfig.h"

#include <klocale.h>
#include <tdelocale.h>
#include <kurlrequester.h>
#include <tdeconfig.h>
#include <tdeapplication.h>

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

@@ -38,8 +38,8 @@
#include <kleo/cryptoconfig.h>

#include <kdebug.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeaction.h>
#include <kstdaction.h>

+ 3
- 3
certmanager/kwatchgnupg/main.cpp View File

@@ -39,9 +39,9 @@

#include <kuniqueapplication.h>
#include <tdecmdlineargs.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <kdebug.h>


+ 2
- 2
certmanager/kwatchgnupg/tray.cpp View File

@@ -34,8 +34,8 @@
#include "kwatchgnupgmainwin.h"

#include <kdebug.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdelocale.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <tqtooltip.h>


+ 1
- 1
certmanager/lib/backends/chiasmus/chiasmusbackend.cpp View File

@@ -42,7 +42,7 @@

#include "kleo/cryptoconfig.h"

#include <klocale.h>
#include <tdelocale.h>
#include <tdeconfig.h>
#include <kshell.h>
#include <kdebug.h>

+ 2
- 2
certmanager/lib/backends/chiasmus/chiasmusjob.cpp View File

@@ -44,9 +44,9 @@
#include <gpg-error.h>

#include <kshell.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>

#include <tqtimer.h>
#include <tqfileinfo.h>

+ 1
- 1
certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp View File

@@ -39,7 +39,7 @@

#include <klibloader.h>
#include <kdebug.h>
#include <klocale.h>
#include <tdelocale.h>

#include <tqfile.h>


+ 2
- 2
certmanager/lib/backends/chiasmus/obtainkeysjob.cpp View File

@@ -40,8 +40,8 @@

#include "kleo/cryptoconfig.h"

#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kshell.h>

#include <tqdir.h>

+ 1
- 1
certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp View File

@@ -32,7 +32,7 @@

#include "symcryptrunprocessbase.h"

#include <ktempfile.h>
#include <tdetempfile.h>
#include <kdebug.h>
#include <kshell.h>


+ 1
- 1
certmanager/lib/backends/kpgp/kpgpbackendbase.cpp View File

@@ -41,7 +41,7 @@
#include "pgp6backend.h"
#include "gpg1backend.h"

#include <klocale.h>
#include <tdelocale.h>

#include <tqstring.h>


+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmebackend.cpp View File

@@ -42,7 +42,7 @@
#include <gpgmepp/context.h>
#include <gpgmepp/engineinfo.h>

#include <klocale.h>
#include <tdelocale.h>
#include <kstandarddirs.h>

#include <tqfile.h>

+ 3
- 3
certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp View File

@@ -34,11 +34,11 @@
#include <kdebug.h>
#include <kprocio.h>
#include <errno.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <tdemessagebox.h>
#include <tdelocale.h>

#include <assert.h>
#include <ktempfile.h>
#include <tdetempfile.h>
#include <tqfile.h>
#include <stdlib.h>
#include <tqtextcodec.h>

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp View File

@@ -45,7 +45,7 @@
#include <gpgmepp/encryptionresult.h>
#include <gpgmepp/data.h>

#include <klocale.h>
#include <tdelocale.h>

#include <assert.h>


+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmejob.cpp View File

@@ -46,7 +46,7 @@
#include <gpgmepp/context.h>
#include <gpgmepp/data.h>

#include <klocale.h>
#include <tdelocale.h>
#include <kstandarddirs.h>

#include <tqstring.h>

+ 2
- 2
certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp View File

@@ -43,8 +43,8 @@
#include <gpgmepp/keylistresult.h>
#include <gpg-error.h>

#include <kmessagebox.h>
#include <klocale.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <kdebug.h>

#include <tqstringlist.h>

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp View File

@@ -36,7 +36,7 @@

#include "qgpgmeprogresstokenmapper.h"

#include <klocale.h>
#include <tdelocale.h>

#include <tqstring.h>


+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp View File

@@ -45,7 +45,7 @@
#include <gpgmepp/data.h>
#include <gpgmepp/key.h>

#include <klocale.h>
#include <tdelocale.h>

#include <assert.h>


+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp View File

@@ -46,7 +46,7 @@
#include <gpgmepp/data.h>
#include <gpgmepp/key.h>

#include <klocale.h>
#include <tdelocale.h>

#include <assert.h>


+ 2
- 2
certmanager/lib/cryptplugfactory.cpp View File

@@ -38,9 +38,9 @@
#include "cryptplugwrapperlist.h"

#include <tdeconfig.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <tdeapplication.h>

#include <assert.h>

+ 2
- 2
certmanager/lib/cryptplugwrapper.cpp View File

@@ -62,8 +62,8 @@
// kde
#include <kdebug.h>
#include <tdeapplication.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdelocale.h>
#include <tdeglobal.h>
#include <tdeconfig.h>

// other

+ 2
- 2
certmanager/lib/kleo/cryptobackendfactory.cpp View File

@@ -47,9 +47,9 @@
#include <ui/backendconfigwidget.h>

#include <tdeconfig.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <tdeapplication.h>

#include <iterator>

+ 1
- 1
certmanager/lib/kleo/dn.cpp View File

@@ -41,7 +41,7 @@

#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <tdelocale.h>

#include <tqstringlist.h>
#include <tqvaluevector.h>

+ 1
- 1
certmanager/lib/kleo/enum.cpp View File

@@ -32,7 +32,7 @@

#include "enum.h"

#include <klocale.h>
#include <tdelocale.h>

#include <tqstring.h>
#include <tqstringlist.h>

+ 1
- 1
certmanager/lib/kleo/hierarchicalkeylistjob.cpp View File

@@ -38,7 +38,7 @@
#include "cryptobackend.h"
#include "keylistjob.h"

#include <klocale.h>
#include <tdelocale.h>

#include <tqstringlist.h>
#include <tqtl.h>

+ 1
- 1
certmanager/lib/kleo/multideletejob.cpp View File

@@ -38,7 +38,7 @@
#include "cryptobackend.h"
#include "deletejob.h"

#include <klocale.h>
#include <tdelocale.h>

#include <gpgmepp/key.h>
#include <gpgmepp/context.h>

+ 1
- 1
certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp View File

@@ -37,7 +37,7 @@
#include "tdeconfigbasedkeyfilter.h"

#include <tdeconfigbase.h>
#include <klocale.h>
#include <tdelocale.h>

static const struct {
const char * name;

+ 1
- 1
certmanager/lib/tests/test_gnupgprocessbase.cpp View File

@@ -41,7 +41,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <kdebug.h>

#include <tqstringlist.h>

+ 1
- 1
certmanager/lib/tests/test_keygen.cpp View File

@@ -46,7 +46,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <kdebug.h>

#include <tqmessagebox.h>

+ 1
- 1
certmanager/lib/tests/test_keyselectiondialog.cpp View File

@@ -37,7 +37,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <kdebug.h>


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

@@ -43,9 +43,9 @@

#include <tdelistview.h>
#include <kdialog.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <dcopclient.h>


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

@@ -31,7 +31,7 @@

#include "cryptoconfigdialog.h"
#include "cryptoconfigmodule.h"
#include <klocale.h>
#include <tdelocale.h>
#include <tdeaccelmanager.h>

Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name )

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

@@ -37,12 +37,12 @@
#include <kleo/cryptoconfig.h>

#include <klineedit.h>
#include <klocale.h>
#include <tdelocale.h>
#include <kdialogbase.h>
#include <kdebug.h>
#include <knuminput.h>
#include <kiconloader.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kurlrequester.h>

#include <tqgrid.h>

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

@@ -38,7 +38,7 @@

#include "kleo/dn.h"

#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>

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

@@ -45,8 +45,8 @@
#include <cryptplugfactory.h>
#include <kleo/cryptobackend.h>

#include <klocale.h>
#include <kglobalsettings.h>
#include <tdelocale.h>
#include <tdeglobalsettings.h>
#include <kseparator.h>

#include <tqstringlist.h>

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

@@ -63,11 +63,11 @@
#include <gpgmepp/keylistresult.h>

// KDE
#include <klocale.h>
#include <tdelocale.h>
#include <kiconloader.h>
#include <kdialog.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <kpushbutton.h>

// TQt

+ 3
- 3
certmanager/lib/ui/keyselectiondialog.cpp View File

@@ -52,14 +52,14 @@
#include <gpgmepp/keylistresult.h>

// KDE
#include <klocale.h>
#include <tdelocale.h>
#include <tdeapplication.h>
#include <kglobal.h>
#include <tdeglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <twin.h>
#include <tdeconfig.h>
#include <kmessagebox.h>
#include <tdemessagebox.h>
#include <kprocess.h>
#include <kactivelabel.h>
#include <kurl.h>

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

@@ -43,7 +43,7 @@

#include <tdefiledialog.h>
#include <kdialogbase.h>
#include <klocale.h>
#include <tdelocale.h>
#include <ksavefile.h>
#include <kguiitem.h>
#include <kdebug.h>

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

@@ -33,7 +33,7 @@
#ifndef __KLEO_UI_MESSAGEBOX_H__
#define __KLEO_UI_MESSAGEBOX_H__

#include <kmessagebox.h>
#include <tdemessagebox.h>

namespace GpgME {
class SigningResult;

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

@@ -54,7 +54,7 @@

#include <kpassdlg.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdelocale.h>

#include <tqlabel.h>
#include <tqlayout.h>

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

@@ -37,7 +37,7 @@
#include <kleo/job.h>

#include <kdebug.h>
#include <klocale.h>
#include <tdelocale.h>

#include <tqtimer.h>


+ 3
- 3
certmanager/main.cpp View File

@@ -41,9 +41,9 @@

#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdeglobal.h>
#include <kiconloader.h>

int main( int argc, char** argv )

+ 1
- 1
doc/kaddressbook/index.docbook View File

@@ -111,7 +111,7 @@ will be displayed:</para>
<para>&kaddressbook; can use multiple resources for loading and storing
its contacts. After starting &kaddressbook; for the first time you will have
a default resource installed that saves all contacts in a vCard file
under $HOME/.trinity/share/apps/kabc/std.vcf; you can add more resources
under $HOME/.trinity/share/apps/tdeabc/std.vcf; you can add more resources
by using the Resource Configuration dialog, which is available in
<application>kcontrol</application> under
<guilabel>TDE Components</guilabel>-><guilabel>TDE Resources Configuration</guilabel>:</para>

+ 1
- 1
doc/kpilot/configuration.docbook View File

@@ -1402,7 +1402,7 @@ filename of the
vCard file (this will usually be a file that ends in <literal
role="extension">.vcf</literal>) to sync with, of if it uses the standard
&kde; address book file, it will be under the
<filename class="directory">$TDEHOME/share/apps/kabc/</filename>
<filename class="directory">$TDEHOME/share/apps/tdeabc/</filename>
folder, where the <filename class="directory">$TDEHOME</filename> environment
variable (typically <filename class="directory">/home/Login Name/.trinity/</filename>)
points to the folder that contains your configuration and data for the &kde;

+ 1
- 1
kabc/frontend/main.cpp View File

@@ -1,7 +1,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>

#include "mainWindow.h"

+ 2
- 2
kabc/frontend/mainWindow.ui.h View File

@@ -10,10 +10,10 @@
#include <kinputdialog.h>
#include <tqmessagebox.h>

#include <klocale.h>
#include <tdelocale.h>
#include <kdebug.h>

#include <kabc/stdaddressbook.h>
#include <tdeabc/stdaddressbook.h>

using namespace KABC;


+ 1
- 1
kabc/kabc2mutt/CMakeLists.txt View File

@@ -24,6 +24,6 @@ link_directories(

tde_add_executable( kabc2mutt AUTOMOC
SOURCES kabc2mutt.cpp main.cpp
LINK kabc-shared
LINK tdeabc-shared
DESTINATION ${BIN_INSTALL_DIR}
)

+ 2
- 2
kabc/kabc2mutt/kabc2mutt.cpp View File

@@ -17,9 +17,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

#include <kabc/distributionlist.h>
#include <tdeabc/distributionlist.h>
#include <tdeapplication.h>
#include <klocale.h>
#include <tdelocale.h>

#include <tqregexp.h>


+ 1
- 1
kabc/kabc2mutt/kabc2mutt.h View File

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

#include <kabc/stdaddressbook.h>
#include <tdeabc/stdaddressbook.h>

class KABC2Mutt : public TQObject
{

+ 1
- 1
kabc/kabc2mutt/main.cpp View File

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

#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <klocale.h>
#include <tdelocale.h>

#include <iostream>


+ 4
- 4
kabc/kabcdistlistupdater/kabcdistlistupdater.cpp View File

@@ -23,11 +23,11 @@
#include <tdecmdlineargs.h>
#include <ksimpleconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
#include <tdeglobal.h>
#include <tdelocale.h>
#include <kstandarddirs.h>

#include <kabc/stdaddressbook.h>
#include <tdeabc/stdaddressbook.h>
#include <libtdepim/distributionlist.h>

static const TDECmdLineOptions options[] =
@@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] =

void convertDistributionLists()
{
KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
const TQMap<TQString, TQString> entryMap = cfg.entryMap( "DistributionLists" );

if ( entryMap.isEmpty() ) // nothing to convert

+ 2
- 2
kaddressbook/addresseditwidget.cpp View File

@@ -48,8 +48,8 @@
#include <kinputdialog.h>
#include <klineedit.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
#include <kseparator.h>

#include "addresseditwidget.h"

+ 2
- 2
kaddressbook/addresseditwidget.h View File

@@ -27,8 +27,8 @@
#include <tqwidget.h>

#include <kdialogbase.h>
#include <kabc/address.h>
#include <kabc/addressee.h>
#include <tdeabc/address.h>
#include <tdeabc/addressee.h>

#include "addresseeconfig.h"
#include "typecombo.h"

+ 1
- 1
kaddressbook/addresseeconfig.h View File

@@ -24,7 +24,7 @@
#ifndef ADDRESSEECONFIG_H
#define ADDRESSEECONFIG_H

#include <kabc/addressee.h>
#include <tdeabc/addressee.h>
#include <tdeconfig.h>

using namespace KABC;

+ 1
- 1
kaddressbook/addresseeeditorbase.h View File

@@ -24,7 +24,7 @@
#ifndef ADDRESSEEEDITORBASE_H
#define ADDRESSEEEDITORBASE_H

#include <kabc/addressee.h>
#include <tdeabc/addressee.h>

#include <tqwidget.h>


+ 0
- 0
kaddressbook/addresseeeditordialog.cpp View File


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

Loading…
Cancel
Save