Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
2e25fa39cd
100 changed files with 115 additions and 632 deletions
  1. 9
    9
      CMakeLists.txt
  2. 1
    1
      Makefile.am.in
  3. 1
    1
      README
  4. 1
    1
      kamera/CMakeLists.txt
  5. 1
    1
      kamera/Makefile.am
  6. 1
    1
      kamera/kcontrol/CMakeLists.txt
  7. 1
    1
      kamera/kcontrol/kamera.desktop
  8. 1
    1
      kamera/kcontrol/kameradevice.cpp
  9. 1
    1
      kamera/tdeioslave/CMakeLists.txt
  10. 1
    1
      kamera/tdeioslave/Makefile.am
  11. 0
    0
      kamera/tdeioslave/camera.protocol
  12. 2
    2
      kamera/tdeioslave/kamera.cpp
  13. 1
    1
      kamera/tdeioslave/kamera.h
  14. 1
    1
      kcoloredit/CMakeLists.txt
  15. 2
    2
      kcoloredit/kcoloredit.cpp
  16. 1
    1
      kcoloredit/loadpalettedlg.cpp
  17. 3
    3
      kdvi/dviRenderer.cpp
  18. 3
    3
      kdvi/dviRenderer_export.cpp
  19. 1
    1
      kdvi/infodialog.cpp
  20. 2
    2
      kdvi/kdvi_multipage.cpp
  21. 1
    1
      kdvi/kdvi_multipage_texthandling.cpp
  22. 1
    1
      kdvi/prefs.kcfgc
  23. 5
    5
      kfax/kfax.cpp
  24. 1
    1
      kfaxview/CMakeLists.txt
  25. 1
    1
      kfaxview/faxmultipage.cpp
  26. 0
    22
      kfile-plugins/bmp/Makefile.am
  27. 0
    22
      kfile-plugins/dds/Makefile.am
  28. 0
    22
      kfile-plugins/dvi/Makefile.am
  29. 0
    22
      kfile-plugins/ico/Makefile.am
  30. 0
    24
      kfile-plugins/jpeg/Makefile.am
  31. 0
    21
      kfile-plugins/pcx/Makefile.am
  32. 0
    36
      kfile-plugins/pdf/CMakeLists.txt
  33. 0
    22
      kfile-plugins/pdf/Makefile.am
  34. 0
    34
      kfile-plugins/png/CMakeLists.txt
  35. 0
    22
      kfile-plugins/png/Makefile.am
  36. 0
    22
      kfile-plugins/pnm/Makefile.am
  37. 0
    35
      kfile-plugins/rgb/CMakeLists.txt
  38. 0
    22
      kfile-plugins/rgb/Makefile.am
  39. 0
    35
      kfile-plugins/tga/CMakeLists.txt
  40. 0
    22
      kfile-plugins/tga/Makefile.am
  41. 0
    21
      kfile-plugins/tiff/Makefile.am
  42. 0
    35
      kfile-plugins/xbm/CMakeLists.txt
  43. 0
    22
      kfile-plugins/xbm/Makefile.am
  44. 0
    35
      kfile-plugins/xpm/CMakeLists.txt
  45. 0
    21
      kfile-plugins/xpm/Makefile.am
  46. 1
    1
      kgamma/kcmkgamma/kgamma.cpp
  47. 1
    1
      kgamma/kcmkgamma/kgamma.desktop
  48. 1
    1
      kghostview/Makefile.am
  49. 1
    1
      kghostview/displayoptions.cpp
  50. 1
    1
      kghostview/kgv_miniwidget.cpp
  51. 2
    2
      kghostview/kgv_view.cpp
  52. 1
    1
      kghostview/kgv_view.h
  53. 3
    3
      kghostview/kgvconfigdialog.cpp
  54. 3
    3
      kghostview/kgvdocument.cpp
  55. 1
    1
      kghostview/kgvshell.cpp
  56. 1
    1
      kiconedit/CMakeLists.txt
  57. 2
    2
      kiconedit/kicon.cpp
  58. 1
    1
      kiconedit/kiconconfig.cpp
  59. 1
    1
      kiconedit/kiconedit.cpp
  60. 1
    1
      kiconedit/knew.cpp
  61. 1
    1
      kiconedit/main.cpp
  62. 1
    1
      kiconedit/properties.cpp
  63. 1
    1
      kmrml/README
  64. 1
    1
      kmrml/kmrml/CMakeLists.txt
  65. 1
    1
      kmrml/kmrml/kcontrol/CMakeLists.txt
  66. 1
    1
      kmrml/kmrml/kcontrol/indextest.cpp
  67. 1
    1
      kmrml/kmrml/kcontrol/kcmkmrml.desktop
  68. 2
    2
      kmrml/kmrml/kcontrol/mainpage.cpp
  69. 1
    1
      kmrml/kmrml/lib/kmrml_config.cpp
  70. 1
    1
      kmrml/kmrml/loader.cpp
  71. 1
    1
      kmrml/kmrml/loader.h
  72. 1
    1
      kmrml/kmrml/mrml.cpp
  73. 1
    1
      kmrml/kmrml/mrml.h
  74. 1
    1
      kmrml/kmrml/mrml.protocol
  75. 4
    4
      kmrml/kmrml/mrml_part.cpp
  76. 2
    2
      kmrml/kmrml/mrmlsearch.cpp
  77. 1
    1
      kmrml/kmrml/server/CMakeLists.txt
  78. 1
    1
      kolourpaint/kpcommandhistory.cpp
  79. 1
    1
      kolourpaint/kpdocument.cpp
  80. 1
    1
      kolourpaint/kpdocumentsaveoptions.cpp
  81. 1
    1
      kolourpaint/kpdocumentsaveoptionswidget.cpp
  82. 1
    1
      kolourpaint/kpmainwindow.cpp
  83. 3
    3
      kolourpaint/kpmainwindow_file.cpp
  84. 2
    2
      kolourpaint/kpmainwindow_help.cpp
  85. 1
    1
      kolourpaint/kpmainwindow_image.cpp
  86. 1
    1
      kolourpaint/kpmainwindow_settings.cpp
  87. 1
    1
      kolourpaint/kpmainwindow_text.cpp
  88. 1
    1
      kolourpaint/kpmainwindow_tools.cpp
  89. 1
    1
      kolourpaint/kpmainwindow_view.cpp
  90. 1
    1
      kolourpaint/pixmapfx/kpeffectflatten.cpp
  91. 1
    1
      kolourpaint/pixmapfx/kpeffectsdialog.cpp
  92. 1
    1
      kolourpaint/pixmapfx/kppixmapfx.cpp
  93. 1
    1
      kolourpaint/tools/kptoolresizescale.cpp
  94. 1
    1
      kolourpaint/widgets/kpcolortoolbar.cpp
  95. 1
    1
      kolourpaint/widgets/kptooltoolbar.cpp
  96. 1
    1
      kolourpaint/widgets/kptoolwidgetbase.cpp
  97. 1
    1
      kooka/CHANGES
  98. 1
    1
      kooka/imageselectline.cpp
  99. 5
    5
      kooka/img_saver.cpp
  100. 0
    0
      kooka/imgnamecombo.cpp

+ 9
- 9
CMakeLists.txt View File

@@ -44,9 +44,9 @@ tde_setup_paths( )
44 44
 
45 45
 option( WITH_T1LIB "Enable t1lib support" OFF )
46 46
 option( WITH_PAPER "Enable libpaper support" OFF )
47
-OPTION( WITH_TIFF "Enable tiff support (kfile-plugins)" OFF )
48
-OPTION( WITH_OPENEXR "Enable openexr support (kfile-plugins)" OFF )
49
-OPTION( WITH_PDF "Enable pdf support (kfile-plugins)" OFF )
47
+OPTION( WITH_TIFF "Enable tiff support (tdefile-plugins)" OFF )
48
+OPTION( WITH_OPENEXR "Enable openexr support (tdefile-plugins)" OFF )
49
+OPTION( WITH_PDF "Enable pdf support (tdefile-plugins)" OFF )
50 50
 
51 51
 
52 52
 ##### options comments ##########################
@@ -60,9 +60,9 @@ OPTION( WITH_PDF "Enable pdf support (kfile-plugins)" OFF )
60 60
 # WITH_PAPER   affects kpdf
61 61
 # WITH_PAPER   description this library is only used to set some default
62 62
 #                          parameters of paper according to system settings.
63
-# WITH_TIFF    affects kfile-plugins(tiff)
64
-# WITH_OPENEXR affects kfile-plugins(exr)
65
-# WITH_PDF     affects kfile-plugins(pdf dependencies/poppler-tqt)
63
+# WITH_TIFF    affects tdefile-plugins(tiff)
64
+# WITH_OPENEXR affects tdefile-plugins(exr)
65
+# WITH_PDF     affects tdefile-plugins(pdf dependencies/poppler-tqt)
66 66
 
67 67
 # NOTE: It seems that libtiff was planned to be used in
68 68
 #       kviewshell(plugins/djvu) but isn't yet implemented
@@ -77,7 +77,7 @@ option( BUILD_KCOLOREDIT "Build kcoloredit" ${BUILD_ALL} )
77 77
 option( BUILD_KDVI "Build kdvi" ${BUILD_ALL} )
78 78
 option( BUILD_KFAX "Build kfax" ${BUILD_ALL} )
79 79
 option( BUILD_KFAXVIEW "Build kfaxview" ${BUILD_ALL} )
80
-option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} )
80
+option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
81 81
 option( BUILD_KGAMMA "Build kgamma" ${BUILD_ALL} )
82 82
 option( BUILD_KGHOSTVIEW "Build kghostview" ${BUILD_ALL} )
83 83
 option( BUILD_KICONEDIT "Build kiconedit" ${BUILD_ALL} )
@@ -113,7 +113,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
113 113
 
114 114
 ##### tdegraphics directories ###################
115 115
 
116
-# kfile-plugins/ps requires dscparse-static library
116
+# tdefile-plugins/ps requires dscparse-static library
117 117
 if( BUILD_KFILE_PLUGINS AND NOT BUILD_KGHOSTVIEW )
118 118
   add_subdirectory( kghostview/dscparse )
119 119
 endif( )
@@ -124,7 +124,7 @@ tde_conditional_add_subdirectory( BUILD_KCOLOREDIT kcoloredit )
124 124
 tde_conditional_add_subdirectory( BUILD_KDVI kdvi )
125 125
 tde_conditional_add_subdirectory( BUILD_KFAX kfax )
126 126
 tde_conditional_add_subdirectory( BUILD_KFAXVIEW kfaxview )
127
-tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins )
127
+tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
128 128
 tde_conditional_add_subdirectory( BUILD_KGAMMA kgamma )
129 129
 tde_conditional_add_subdirectory( BUILD_KGHOSTVIEW kghostview )
130 130
 tde_conditional_add_subdirectory( BUILD_KICONEDIT kiconedit )

+ 1
- 1
Makefile.am.in View File

@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1
5 5
 
6 6
 COMPILE_BEFORE_kooka = libkscan
7 7
 COMPILE_BEFORE_kfaxview = kfax
8
-COMPILE_BEFORE_kfile-plugins = kghostview
8
+COMPILE_BEFORE_tdefile-plugins = kghostview
9 9
 COMPILE_AFTER_kviewshell = kdvi kfaxview
10 10
 
11 11
 DISTCLEANFILES = inst-apps

+ 1
- 1
README View File

@@ -32,7 +32,7 @@ tdegraphics is a collection of graphic oriented applications:
32 32
 * kfaxview
33 33
     An embeddable KPart to display tiffed fax images.
34 34
 
35
-* kfile-plugins
35
+* tdefile-plugins
36 36
     Provide meta information for graphic files.
37 37
 
38 38
 * kghostview

+ 1
- 1
kamera/CMakeLists.txt View File

@@ -11,6 +11,6 @@
11 11
 
12 12
 include( ConfigureChecks.cmake )
13 13
 
14
-add_subdirectory( kioslave )
14
+add_subdirectory( tdeioslave )
15 15
 add_subdirectory( kcontrol )
16 16
 add_subdirectory( pics )

+ 1
- 1
kamera/Makefile.am View File

@@ -1 +1 @@
1
-SUBDIRS = kcontrol kioslave pics
1
+SUBDIRS = kcontrol tdeioslave pics

+ 1
- 1
kamera/kcontrol/CMakeLists.txt View File

@@ -31,6 +31,6 @@ install( FILES kamera.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
31 31
 
32 32
 tde_add_kpart( kcm_kamera SHARED AUTOMOC
33 33
   SOURCES kamera.cpp kameradevice.cpp kameraconfigdialog.cpp
34
-  LINK kio-shared ${GPHOTO2_LIBRARIES}
34
+  LINK tdeio-shared ${GPHOTO2_LIBRARIES}
35 35
   DESTINATION ${PLUGIN_INSTALL_DIR}
36 36
 )

+ 1
- 1
kamera/kcontrol/kamera.desktop View File

@@ -188,6 +188,6 @@ Type=Application
188 188
 X-TDE-Library=kamera
189 189
 X-TDE-ModuleType=Library
190 190
 Icon=camera
191
-Exec=kcmshell kamera
191
+Exec=tdecmshell kamera
192 192
 DocPath=kamera/index.html
193 193
 Categories=Qt;TDE;Settings;X-TDE-settings-hardware;

+ 1
- 1
kamera/kcontrol/kameradevice.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <tqgrid.h>
33 33
 
34 34
 #include <klocale.h>
35
-#include <kconfig.h>
35
+#include <tdeconfig.h>
36 36
 #include <klistview.h>
37 37
 #include <kmessagebox.h>
38 38
 #include <kdebug.h>

kamera/kioslave/CMakeLists.txt → kamera/tdeioslave/CMakeLists.txt View File

@@ -32,6 +32,6 @@ install( FILES camera.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
32 32
 
33 33
 tde_add_kpart( kio_kamera AUTOMOC
34 34
   SOURCES kamera.cpp
35
-  LINK kio-shared ${GPHOTO2_LIBRARIES}
35
+  LINK tdeio-shared ${GPHOTO2_LIBRARIES}
36 36
   DESTINATION ${PLUGIN_INSTALL_DIR}
37 37
 )

kamera/kioslave/Makefile.am → kamera/tdeioslave/Makefile.am View File

@@ -1,5 +1,5 @@
1 1
 # $Id$
2
-# Makefile for tdebase/kioslave/kamera
2
+# Makefile for tdebase/tdeioslave/kamera
3 3
 
4 4
 INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes) $(GPHOTO2_INCS)
5 5
 

kamera/kioslave/camera.protocol → kamera/tdeioslave/camera.protocol View File


kamera/kioslave/kamera.cpp → kamera/tdeioslave/kamera.cpp View File

@@ -35,11 +35,11 @@
35 35
 #include <kdebug.h>
36 36
 #include <kinstance.h>
37 37
 #include <kstandarddirs.h>
38
-#include <kconfig.h>
38
+#include <tdeconfig.h>
39 39
 #include <ksimpleconfig.h>
40 40
 #include <klocale.h>
41 41
 #include <kprotocolinfo.h>
42
-#include <kio/slaveconfig.h>
42
+#include <tdeio/slaveconfig.h>
43 43
 
44 44
 #include <config.h>
45 45
 

kamera/kioslave/kamera.h → kamera/tdeioslave/kamera.h View File

@@ -24,7 +24,7 @@
24 24
 #define __kamera_h__
25 25
 
26 26
 #include <config.h>
27
-#include <kio/slavebase.h>
27
+#include <tdeio/slavebase.h>
28 28
 #include <gphoto2.h>
29 29
 
30 30
 class KSimpleConfig;

+ 1
- 1
kcoloredit/CMakeLists.txt View File

@@ -43,7 +43,7 @@ tde_add_executable( kcoloredit AUTOMOC
43 43
     kxycolorselector.cpp paletteview.cpp paletteviewscrolledarea.cpp
44 44
     editablestreamhistory.cpp color.cpp palette.cpp loadpalettedlg.cpp
45 45
     kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
46
-  LINK kio-shared
46
+  LINK tdeio-shared
47 47
   DESTINATION ${BIN_INSTALL_DIR}
48 48
 )
49 49
 

+ 2
- 2
kcoloredit/kcoloredit.cpp View File

@@ -23,11 +23,11 @@
23 23
 // include files for KDE
24 24
 #include <kiconloader.h>
25 25
 #include <kmessagebox.h>
26
-#include <kfiledialog.h>
26
+#include <tdefiledialog.h>
27 27
 #include <kmenubar.h>
28 28
 #include <klocale.h>
29 29
 #include <kcolordialog.h>
30
-#include <kconfig.h>
30
+#include <tdeconfig.h>
31 31
 #include <kdebug.h>
32 32
 
33 33
 // application specific includes

+ 1
- 1
kcoloredit/loadpalettedlg.cpp View File

@@ -25,7 +25,7 @@
25 25
 #include <klocale.h>
26 26
 #include <kstandarddirs.h>
27 27
 #include <kpalette.h>
28
-#include <kfiledialog.h>
28
+#include <tdefiledialog.h>
29 29
 
30 30
 #include "main.h"
31 31
 #include "palette.h"

+ 3
- 3
kdvi/dviRenderer.cpp View File

@@ -34,9 +34,9 @@
34 34
 #include <kglobal.h>
35 35
 #include <kdebug.h>
36 36
 #include <keditcl.h>
37
-#include <kfiledialog.h>
38
-#include <kio/job.h>
39
-#include <kio/netaccess.h>
37
+#include <tdefiledialog.h>
38
+#include <tdeio/job.h>
39
+#include <tdeio/netaccess.h>
40 40
 #include <klocale.h>
41 41
 #include <kprinter.h>
42 42
 #include <kprocess.h>

+ 3
- 3
kdvi/dviRenderer_export.cpp View File

@@ -30,9 +30,9 @@
30 30
 #include <kapplication.h>
31 31
 #include <kmessagebox.h>
32 32
 #include <kdebug.h>
33
-#include <kfiledialog.h>
34
-#include <kio/job.h>
35
-#include <kio/netaccess.h>
33
+#include <tdefiledialog.h>
34
+#include <tdeio/job.h>
35
+#include <tdeio/netaccess.h>
36 36
 #include <klocale.h>
37 37
 #include <kprinter.h>
38 38
 #include <kprocess.h>

+ 1
- 1
kdvi/infodialog.cpp View File

@@ -6,7 +6,7 @@
6 6
 #include <config.h>
7 7
 
8 8
 #include <kdebug.h>
9
-#include <kio/global.h>
9
+#include <tdeio/global.h>
10 10
 #include <klocale.h>
11 11
 #include <tqfile.h>
12 12
 #include <tqlabel.h>

+ 2
- 2
kdvi/kdvi_multipage.cpp View File

@@ -4,9 +4,9 @@
4 4
 #include <kaboutdialog.h>
5 5
 #include <kapplication.h>
6 6
 #include <kbugreport.h>
7
-#include <kconfigdialog.h>
7
+#include <tdeconfigdialog.h>
8 8
 #include <kdebug.h>
9
-#include <kfiledialog.h>
9
+#include <tdefiledialog.h>
10 10
 #include <kglobal.h>
11 11
 #include <klocale.h>
12 12
 #include <kmessagebox.h>

+ 1
- 1
kdvi/kdvi_multipage_texthandling.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <kaction.h>
30 30
 #include <kdebug.h>
31 31
 #include <keditcl.h>
32
-#include <kfiledialog.h>
32
+#include <tdefiledialog.h>
33 33
 #include <klocale.h>
34 34
 #include <kmessagebox.h>
35 35
 #include <tqapplication.h>

+ 1
- 1
kdvi/prefs.kcfgc View File

@@ -1,4 +1,4 @@
1
-# Code generation options for kconfig_compiler
1
+# Code generation options for tdeconfig_compiler
2 2
 File=kdvi.kcfg
3 3
 ClassName=Prefs
4 4
 Singleton=true

+ 5
- 5
kfax/kfax.cpp View File

@@ -43,14 +43,14 @@
43 43
 #include <kaboutdata.h>
44 44
 #include <kstandarddirs.h>
45 45
 #include <kiconloader.h>
46
-#include <kfiledialog.h>
47
-#include <kfilemetainfo.h>
46
+#include <tdefiledialog.h>
47
+#include <tdefilemetainfo.h>
48 48
 #include <kstdaccel.h>
49
-#include <kconfig.h>
49
+#include <tdeconfig.h>
50 50
 #include <kmenubar.h>
51 51
 #include <kmessagebox.h>
52 52
 #include <kcmdlineargs.h>
53
-#include <kio/netaccess.h>
53
+#include <tdeio/netaccess.h>
54 54
 #include <knotifyclient.h>
55 55
 #include <ktempfile.h>
56 56
 #include <kstdaction.h>
@@ -60,7 +60,7 @@
60 60
 #include <kaction.h>
61 61
 #include <kprocess.h>
62 62
 #include <kprinter.h>
63
-#include <kio/job.h>
63
+#include <tdeio/job.h>
64 64
 #include <kdebug.h>
65 65
 
66 66
 #include "faxexpand.h"

+ 1
- 1
kfaxview/CMakeLists.txt View File

@@ -48,6 +48,6 @@ tde_add_kpart( kfaxviewpart AUTOMOC
48 48
 
49 49
 tde_add_executable( kfaxview AUTOMOC
50 50
   SOURCES main.cpp
51
-  LINK kviewshell-static kio-shared tdeparts-shared
51
+  LINK kviewshell-static tdeio-shared tdeparts-shared
52 52
   DESTINATION ${BIN_INSTALL_DIR}
53 53
 )

+ 1
- 1
kfaxview/faxmultipage.cpp View File

@@ -20,7 +20,7 @@
20 20
 
21 21
 #include <config.h>
22 22
 
23
-#include <kfiledialog.h>
23
+#include <tdefiledialog.h>
24 24
 #include <tdeparts/genericfactory.h>
25 25
 
26 26
 #include "faxmultipage.h"

+ 0
- 22
kfile-plugins/bmp/Makefile.am View File

@@ -1,22 +0,0 @@
1
-## Makefile.am for bmp file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-# these are the headers for your project
7
-noinst_HEADERS   = kfile_bmp.h
8
-
9
-kde_module_LTLIBRARIES = kfile_bmp.la
10
-
11
-kfile_bmp_la_SOURCES = kfile_bmp.cpp 
12
-kfile_bmp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
-kfile_bmp_la_LIBADD = $(LIB_KSYCOCA)
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-messages: rc.cpp
19
-	$(XGETTEXT) kfile_bmp.cpp -o $(podir)/kfile_bmp.pot
20
-
21
-services_DATA = kfile_bmp.desktop
22
-servicesdir = $(kde_servicesdir)

+ 0
- 22
kfile-plugins/dds/Makefile.am View File

@@ -1,22 +0,0 @@
1
-## Makefile.am for dds file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-# these are the headers for your project
7
-noinst_HEADERS   = kfile_dds.h
8
-
9
-kde_module_LTLIBRARIES = kfile_dds.la
10
-
11
-kfile_dds_la_SOURCES = kfile_dds.cpp 
12
-kfile_dds_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
-kfile_dds_la_LIBADD = $(LIB_KSYCOCA)
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-messages: rc.cpp
19
-	$(XGETTEXT) kfile_dds.cpp -o $(podir)/kfile_dds.pot
20
-
21
-services_DATA = kfile_dds.desktop
22
-servicesdir = $(kde_servicesdir)

+ 0
- 22
kfile-plugins/dvi/Makefile.am View File

@@ -1,22 +0,0 @@
1
-## Makefile.am for the dvi file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-# these are the headers for your project
7
-noinst_HEADERS   = kfile_dvi.h
8
-
9
-kde_module_LTLIBRARIES = kfile_dvi.la
10
-
11
-kfile_dvi_la_SOURCES = kfile_dvi.cpp
12
-kfile_dvi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
-kfile_dvi_la_LIBADD = $(LIB_KIO)
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-messages: 
19
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_dvi.pot
20
-
21
-services_DATA = kfile_dvi.desktop
22
-servicesdir = $(kde_servicesdir)

+ 0
- 22
kfile-plugins/ico/Makefile.am View File

@@ -1,22 +0,0 @@
1
-## Makefile.am for ico file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-# these are the headers for your project
7
-noinst_HEADERS   = kfile_ico.h
8
-
9
-kde_module_LTLIBRARIES = kfile_ico.la
10
-
11
-kfile_ico_la_SOURCES = kfile_ico.cpp 
12
-kfile_ico_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
-kfile_ico_la_LIBADD = $(LIB_KSYCOCA)
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-messages: rc.cpp
19
-	$(XGETTEXT) kfile_ico.cpp -o $(podir)/kfile_ico.pot
20
-
21
-services_DATA = kfile_ico.desktop
22
-servicesdir = $(kde_servicesdir)

+ 0
- 24
kfile-plugins/jpeg/Makefile.am View File

@@ -1,24 +0,0 @@
1
-## Makefile.am for jpeg file meta info plugin
2
-
3
-KDE_CXXFLAGS = $(USE_EXCEPTIONS)
4
-
5
-# set the include path for X, qt and KDE
6
-INCLUDES         = $(all_includes)
7
-
8
-# these are the headers for your project
9
-noinst_HEADERS   = kfile_jpeg.h exif.h
10
-
11
-kde_module_LTLIBRARIES = kfile_jpeg.la
12
-
13
-kfile_jpeg_la_SOURCES = kfile_jpeg.cpp exif.cpp kfile_setcomment.cpp
14
-kfile_jpeg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
15
-kfile_jpeg_la_LIBADD = $(LIB_KIO)
16
-
17
-# let automoc handle all of the meta source files (moc)
18
-METASOURCES = AUTO
19
-
20
-messages:
21
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_jpeg.pot
22
-
23
-services_DATA = kfile_jpeg.desktop
24
-servicesdir = $(kde_servicesdir)

+ 0
- 21
kfile-plugins/pcx/Makefile.am View File

@@ -1,21 +0,0 @@
1
-## Makefile.am for PCX file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-noinst_HEADERS   = kfile_pcx.h
7
-
8
-kde_module_LTLIBRARIES = kfile_pcx.la
9
-
10
-kfile_pcx_la_SOURCES = kfile_pcx.cpp
11
-kfile_pcx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
12
-kfile_pcx_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
13
-
14
-# let automoc handle all of the meta source files (moc)
15
-METASOURCES = AUTO
16
-
17
-messages:
18
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_pcx.pot
19
-
20
-services_DATA = kfile_pcx.desktop
21
-servicesdir = $(kde_servicesdir)

+ 0
- 36
kfile-plugins/pdf/CMakeLists.txt View File

@@ -1,36 +0,0 @@
1
-#################################################
2
-#
3
-#  (C) 2010-2011 Calvin Morrison
4
-#  mutantturkey@gmail.com
5
-#
6
-#  Improvements and feedback are welcome
7
-#
8
-#  This file is released under GPL >= 2
9
-#
10
-#################################################
11
-
12
-include_directories(
13
-  ${CMAKE_CURRENT_BINARY_DIR}
14
-  ${CMAKE_BINARY_DIR}
15
-  ${TDE_INCLUDE_DIR}
16
-  ${TQT_INCLUDE_DIRS}
17
-  ${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
18
-)
19
-
20
-link_directories(
21
-  ${TQT_LIBRARY_DIRS}
22
-)
23
-
24
-
25
-#### other data #################################
26
-
27
-install( FILES kfile_pdf.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
28
-
29
-
30
-#### kfile_pdf (module) #########################
31
-
32
-tde_add_kpart( kfile_pdf AUTOMOC
33
-  SOURCES kfile_pdf.cpp
34
-  LINK kio-shared -L${CMAKE_BINARY_DIR}/kfile-plugins/dependencies/poppler-tqt -lpoppler-tqt
35
-  DESTINATION ${PLUGIN_INSTALL_DIR}
36
-)

+ 0
- 22
kfile-plugins/pdf/Makefile.am View File

@@ -1,22 +0,0 @@
1
-## Makefile.am for the pdf file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes) -I$(top_srcdir)/kfile-plugins/dependencies/poppler-tqt
5
-
6
-# these are the headers for your project
7
-noinst_HEADERS   = kfile_pdf.h
8
-
9
-kde_module_LTLIBRARIES = kfile_pdf.la
10
-
11
-kfile_pdf_la_SOURCES = kfile_pdf.cpp
12
-kfile_pdf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
-kfile_pdf_la_LIBADD = $(LIB_KIO) -L$(top_builddir)/kfile-plugins/dependencies/poppler-tqt/ -lpoppler-tqt
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-messages: 
19
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_pdf.pot
20
-
21
-services_DATA = kfile_pdf.desktop
22
-servicesdir = $(kde_servicesdir)

+ 0
- 34
kfile-plugins/png/CMakeLists.txt View File

@@ -1,34 +0,0 @@
1
-#################################################
2
-#
3
-#  (C) 2010-2011 Calvin Morrison
4
-#  mutantturkey@gmail.com
5
-#
6
-#  Improvements and feedback are welcome
7
-#
8
-#  This file is released under GPL >= 2
9
-#
10
-#################################################
11
-
12
-include_directories(
13
-  ${CMAKE_CURRENT_BINARY_DIR}
14
-  ${CMAKE_BINARY_DIR}
15
-  ${TDE_INCLUDE_DIR}
16
-  ${TQT_INCLUDE_DIRS}
17
-)
18
-
19
-link_directories(
20
-  ${TQT_LIBRARY_DIRS}
21
-)
22
-
23
-
24
-#### other data #################################
25
-
26
-install( FILES kfile_png.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
27
-
28
-
29
-#### kfile_png (module) #########################
30
-tde_add_kpart( kfile_png AUTOMOC
31
-  SOURCES kfile_png.cpp
32
-  LINK kio-shared
33
-  DESTINATION ${PLUGIN_INSTALL_DIR}
34
-)

+ 0
- 22
kfile-plugins/png/Makefile.am View File

@@ -1,22 +0,0 @@
1
-## Makefile.am for png file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-# these are the headers for your project
7
-noinst_HEADERS   = kfile_png.h 
8
-
9
-kde_module_LTLIBRARIES = kfile_png.la
10
-
11
-kfile_png_la_SOURCES = kfile_png.cpp
12
-kfile_png_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
-kfile_png_la_LIBADD = $(LIB_KIO)
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-messages:
19
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_png.pot
20
-
21
-services_DATA = kfile_png.desktop
22
-servicesdir = $(kde_servicesdir)

+ 0
- 22
kfile-plugins/pnm/Makefile.am View File

@@ -1,22 +0,0 @@
1
-## Makefile.am for pnm file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-# these are the headers for your project
7
-noinst_HEADERS   = kfile_pnm.h
8
-
9
-kde_module_LTLIBRARIES = kfile_pnm.la
10
-
11
-kfile_pnm_la_SOURCES = kfile_pnm.cpp
12
-kfile_pnm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
-kfile_pnm_la_LIBADD = $(LIB_KIO)
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-messages:
19
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_pnm.pot
20
-
21
-services_DATA = kfile_pnm.desktop
22
-servicesdir = $(kde_servicesdir)

+ 0
- 35
kfile-plugins/rgb/CMakeLists.txt View File

@@ -1,35 +0,0 @@
1
-#################################################
2
-#
3
-#  (C) 2010-2011 Calvin Morrison
4
-#  mutantturkey@gmail.com
5
-#
6
-#  Improvements and feedback are welcome
7
-#
8
-#  This file is released under GPL >= 2
9
-#
10
-#################################################
11
-
12
-include_directories(
13
-  ${CMAKE_CURRENT_BINARY_DIR}
14
-  ${CMAKE_BINARY_DIR}
15
-  ${TDE_INCLUDE_DIR}
16
-  ${TQT_INCLUDE_DIRS}
17
-)
18
-
19
-link_directories(
20
-  ${TQT_LIBRARY_DIRS}
21
-)
22
-
23
-
24
-#### other data #################################
25
-
26
-install( FILES kfile_rgb.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
27
-
28
-
29
-#### kfile_rgb (module) #########################
30
-
31
-tde_add_kpart( kfile_rgb AUTOMOC
32
-  SOURCES kfile_rgb.cpp
33
-  LINK kio-shared
34
-  DESTINATION ${PLUGIN_INSTALL_DIR}
35
-)

+ 0
- 22
kfile-plugins/rgb/Makefile.am View File

@@ -1,22 +0,0 @@
1
-## Makefile.am for rgb file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-# these are the headers for your project
7
-noinst_HEADERS   = kfile_rgb.h
8
-
9
-kde_module_LTLIBRARIES = kfile_rgb.la
10
-
11
-kfile_rgb_la_SOURCES = kfile_rgb.cpp
12
-kfile_rgb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
-kfile_rgb_la_LIBADD = $(LIB_KSYCOCA)
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-messages: rc.cpp
19
-	$(XGETTEXT) kfile_rgb.cpp -o $(podir)/kfile_rgb.pot
20
-
21
-services_DATA = kfile_rgb.desktop
22
-servicesdir = $(kde_servicesdir)

+ 0
- 35
kfile-plugins/tga/CMakeLists.txt View File

@@ -1,35 +0,0 @@
1
-#################################################
2
-#
3
-#  (C) 2010-2011 Calvin Morrison
4
-#  mutantturkey@gmail.com
5
-#
6
-#  Improvements and feedback are welcome
7
-#
8
-#  This file is released under GPL >= 2
9
-#
10
-#################################################
11
-
12
-include_directories(
13
-  ${CMAKE_CURRENT_BINARY_DIR}
14
-  ${CMAKE_BINARY_DIR}
15
-  ${TDE_INCLUDE_DIR}
16
-  ${TQT_INCLUDE_DIRS}
17
-)
18
-
19
-link_directories(
20
-  ${TQT_LIBRARY_DIRS}
21
-)
22
-
23
-
24
-#### other data #################################
25
-
26
-install( FILES kfile_tga.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
27
-
28
-
29
-#### kfile_tga (module) #########################
30
-
31
-tde_add_kpart( kfile_tga AUTOMOC
32
-  SOURCES kfile_tga.cpp
33
-  LINK kio-shared
34
-  DESTINATION ${PLUGIN_INSTALL_DIR}
35
-)

+ 0
- 22
kfile-plugins/tga/Makefile.am View File

@@ -1,22 +0,0 @@
1
-## Makefile.am for tga file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-# these are the headers for your project
7
-noinst_HEADERS   = kfile_tga.h
8
-
9
-kde_module_LTLIBRARIES = kfile_tga.la
10
-
11
-kfile_tga_la_SOURCES = kfile_tga.cpp 
12
-kfile_tga_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
-kfile_tga_la_LIBADD = $(LIB_KSYCOCA)
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-messages: rc.cpp
19
-	$(XGETTEXT) kfile_tga.cpp -o $(podir)/kfile_tga.pot
20
-
21
-services_DATA = kfile_tga.desktop
22
-servicesdir = $(kde_servicesdir)

+ 0
- 21
kfile-plugins/tiff/Makefile.am View File

@@ -1,21 +0,0 @@
1
-## Makefile.am for Tiff file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-noinst_HEADERS   = kfile_tiff.h
7
-
8
-kde_module_LTLIBRARIES = kfile_tiff.la
9
-
10
-kfile_tiff_la_SOURCES = kfile_tiff.cpp
11
-kfile_tiff_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
12
-kfile_tiff_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
13
-
14
-# let automoc handle all of the meta source files (moc)
15
-METASOURCES = AUTO
16
-
17
-messages:
18
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_tiff.pot
19
-
20
-services_DATA = kfile_tiff.desktop
21
-servicesdir = $(kde_servicesdir)

+ 0
- 35
kfile-plugins/xbm/CMakeLists.txt View File

@@ -1,35 +0,0 @@
1
-#################################################
2
-#
3
-#  (C) 2010-2011 Calvin Morrison
4
-#  mutantturkey@gmail.com
5
-#
6
-#  Improvements and feedback are welcome
7
-#
8
-#  This file is released under GPL >= 2
9
-#
10
-#################################################
11
-
12
-include_directories(
13
-  ${CMAKE_CURRENT_BINARY_DIR}
14
-  ${CMAKE_BINARY_DIR}
15
-  ${TDE_INCLUDE_DIR}
16
-  ${TQT_INCLUDE_DIRS}
17
-)
18
-
19
-link_directories(
20
-  ${TQT_LIBRARY_DIRS}
21
-)
22
-
23
-
24
-#### other data #################################
25
-
26
-install( FILES kfile_xbm.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
27
-
28
-
29
-#### kfile_xbm (module) ########################
30
-
31
-tde_add_kpart( kfile_xbm AUTOMOC
32
-  SOURCES kfile_xbm.cpp
33
-  LINK kio-shared
34
-  DESTINATION ${PLUGIN_INSTALL_DIR}
35
-)

+ 0
- 22
kfile-plugins/xbm/Makefile.am View File

@@ -1,22 +0,0 @@
1
-## Makefile.am for xbm file meta info plugin
2
-
3
-# set the include path for X, qt and KDE
4
-INCLUDES         = $(all_includes)
5
-
6
-# these are the headers for your project
7
-noinst_HEADERS   = kfile_xbm.h
8
-
9
-kde_module_LTLIBRARIES = kfile_xbm.la
10
-
11
-kfile_xbm_la_SOURCES = kfile_xbm.cpp 
12
-kfile_xbm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
13
-kfile_xbm_la_LIBADD = $(LIB_KSYCOCA)
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-messages: rc.cpp
19
-	$(XGETTEXT) kfile_xbm.cpp -o $(podir)/kfile_xbm.pot
20
-
21
-services_DATA = kfile_xbm.desktop
22
-servicesdir = $(kde_servicesdir)

+ 0
- 35
kfile-plugins/xpm/CMakeLists.txt View File

@@ -1,35 +0,0 @@
1
-#################################################
2
-#
3
-#  (C) 2010-2011 Calvin Morrison
4
-#  mutantturkey@gmail.com
5
-#
6
-#  Improvements and feedback are welcome
7
-#
8
-#  This file is released under GPL >= 2
9
-#
10
-#################################################
11
-
12
-include_directories(
13
-  ${CMAKE_CURRENT_BINARY_DIR}
14
-  ${CMAKE_BINARY_DIR}
15
-  ${TDE_INCLUDE_DIR}
16
-  ${TQT_INCLUDE_DIRS}
17
-)
18
-
19
-link_directories(
20
-  ${TQT_LIBRARY_DIRS}
21
-)
22
-
23
-
24
-#### other data #################################
25
-
26
-install( FILES kfile_xpm.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
27
-
28
-
29
-#### kfile_xpm (module) #########################
30
-
31
-tde_add_kpart( kfile_xpm AUTOMOC
32
-  SOURCES kfile_xpm.cpp
33
-  LINK kio-shared
34
-  DESTINATION ${PLUGIN_INSTALL_DIR}
35
-)

+ 0
- 21
kfile-plugins/xpm/Makefile.am View File

@@ -1,21 +0,0 @@
1
-## Makefile.am for xpm file meta info plugin
2
-
3
-INCLUDES         = $(all_includes)
4
-
5
-# these are the headers for your project
6
-noinst_HEADERS   = kfile_xpm.h
7
-
8
-kde_module_LTLIBRARIES = kfile_xpm.la
9
-
10
-kfile_xpm_la_SOURCES = kfile_xpm.cpp
11
-kfile_xpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
12
-kfile_xpm_la_LIBADD = $(LIB_KIO)
13
-kfile_xpm_la_METASOURCES = kfile_xpm.moc
14
-
15
-# let automoc handle all of the meta source files (moc)
16
-METASOURCES = AUTO
17
-
18
-kde_services_DATA = kfile_xpm.desktop
19
-
20
-messages:
21
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_xpm.pot

+ 1
- 1
kgamma/kcmkgamma/kgamma.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <tqwidgetstack.h>
29 29
 
30 30
 #include <kstandarddirs.h>
31
-#include <kconfig.h>
31
+#include <tdeconfig.h>
32 32
 #include <klocale.h>
33 33
 #include <kglobal.h>
34 34
 #include <kprocess.h>

+ 1
- 1
kgamma/kcmkgamma/kgamma.desktop View File

@@ -84,7 +84,7 @@ Name[xh]=Unobumba wesithathu konoobumba besiGrike
84 84
 Name[zh_HK]=伽馬(Gamma)
85 85
 
86 86
 DocPath=kgamma
87
-Exec=kcmshell kgamma
87
+Exec=tdecmshell kgamma
88 88
 Icon=kgamma
89 89
 Keywords=KGamma, kgamma, Gamma, gamma
90 90
 Keywords[bg]=калибриране, гама, яркост, цвят, монитор, екран, KGamma, kgamma, Gamma, gamma

+ 1
- 1
kghostview/Makefile.am View File

@@ -59,7 +59,7 @@ messages: rc.cpp
59 59
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kghostview.pot
60 60
 
61 61
 
62
-updatedir = $(kde_datadir)/kconf_update
62
+updatedir = $(kde_datadir)/tdeconf_update
63 63
 update_DATA = kghostview.upd
64 64
 update_SCRIPTS = update-to-xt-names.pl
65 65
 

+ 1
- 1
kghostview/displayoptions.cpp View File

@@ -19,7 +19,7 @@
19 19
 #include <kdebug.h>
20 20
 #include <tqregexp.h>
21 21
 #include <kcmdlineargs.h>
22
-#include <kconfig.h>
22
+#include <tdeconfig.h>
23 23
 
24 24
 namespace {
25 25
 	const double allowedMagnifications[] = {

+ 1
- 1
kghostview/kgv_miniwidget.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include <tqlistbox.h>
22 22
 
23 23
 #include <kapplication.h>
24
-#include <kconfig.h>
24
+#include <tdeconfig.h>
25 25
 #include <kdebug.h>
26 26
 #include <kinstance.h>
27 27
 #include <tdeversion.h>

+ 2
- 2
kghostview/kgv_view.cpp View File

@@ -25,7 +25,7 @@
25 25
 
26 26
 #include <kaction.h>
27 27
 #include <kapplication.h>
28
-#include <kconfig.h>
28
+#include <tdeconfig.h>
29 29
 #include <kdebug.h>
30 30
 #include <kdirwatch.h>
31 31
 #include <kglobalsettings.h>
@@ -36,7 +36,7 @@
36 36
 #include <kstdaction.h>
37 37
 #include <kstdaccel.h>
38 38
 #include <ktempfile.h>
39
-#include <kio/scheduler.h>
39
+#include <tdeio/scheduler.h>
40 40
 #include <kaboutdata.h>
41 41
 
42 42
 

+ 1
- 1
kghostview/kgv_view.h View File

@@ -22,7 +22,7 @@
22 22
 #include <tqcstring.h> // TQByteArray
23 23
 #include <tqfile.h>
24 24
 
25
-#include <kio/job.h>
25
+#include <tdeio/job.h>
26 26
 #include <tdeparts/browserextension.h>
27 27
 #include <krun.h>
28 28
 

+ 3
- 3
kghostview/kgvconfigdialog.cpp View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 #include <tqlayout.h>
23 23
 
24
-#include <kconfig.h>
24
+#include <tdeconfig.h>
25 25
 #include <kdebug.h>
26 26
 #include <kglobal.h>
27 27
 #include <kiconloader.h>
@@ -30,7 +30,7 @@
30 30
 #include <kmessagebox.h>
31 31
 #include <kprocess.h>
32 32
 #include <kstandarddirs.h>
33
-#include <kconfigdialog.h>
33
+#include <tdeconfigdialog.h>
34 34
 
35 35
 #include "configuration.h"
36 36
 #include "kgv_view.h"
@@ -75,7 +75,7 @@ namespace {
75 75
     /* On a related note:
76 76
      * We don't detect upgrades (or downgrades, for that matter) of gs.
77 77
      * I am seeing if I can get the version out of gs as a side effect to displaying a file.
78
-     * This way, using kconfig:/Ghostscript/GS Version we will see whether the version has changed
78
+     * This way, using tdeconfig:/Ghostscript/GS Version we will see whether the version has changed
79 79
      * and trigger a redetection without the trouble of running "gs --version" on each launch.
80 80
      *
81 81
      * LPC (9 April 2003)

+ 3
- 3
kghostview/kgvdocument.cpp View File

@@ -21,8 +21,8 @@
21 21
 
22 22
 #include <tqfileinfo.h>
23 23
 
24
-#include <kconfig.h>
25
-#include <kfiledialog.h>
24
+#include <tdeconfig.h>
25
+#include <tdefiledialog.h>
26 26
 #include <kfilterdev.h>
27 27
 #include <kinstance.h>
28 28
 #include <kmessagebox.h>
@@ -30,7 +30,7 @@
30 30
 #include <kprinter.h>
31 31
 #include <kprocess.h>
32 32
 #include <ktempfile.h>
33
-#include <kio/netaccess.h>
33
+#include <tdeio/netaccess.h>
34 34
 #include <klocale.h>
35 35
 #include <kdebug.h>
36 36
 

+ 1
- 1
kghostview/kgvshell.cpp View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 #include <kaction.h>
23 23
 #include <kapplication.h>
24
-#include <kfiledialog.h>
24
+#include <tdefiledialog.h>
25 25
 #include <kiconloader.h>
26 26
 #include <klibloader.h>
27 27
 #include <klocale.h>

+ 1
- 1
kiconedit/CMakeLists.txt View File

@@ -37,6 +37,6 @@ tde_add_executable( kiconedit AUTOMOC
37 37
     kiconcolors.cpp kcolorgrid.cpp palettetoolbar.cpp
38 38
     kicon.cpp kresize.cpp knew.cpp properties.cpp
39 39
     kiconeditslots.cpp kiconconfig.cpp
40
-  LINK kio-shared tdeprint-shared
40
+  LINK tdeio-shared tdeprint-shared
41 41
   DESTINATION ${BIN_INSTALL_DIR}
42 42
 )

+ 2
- 2
kiconedit/kicon.cpp View File

@@ -23,8 +23,8 @@
23 23
 #include <tqimage.h>
24 24
 
25 25
 #include <kmessagebox.h>
26
-#include <kfiledialog.h>
27
-#include <kio/netaccess.h>
26
+#include <tdefiledialog.h>
27
+#include <tdeio/netaccess.h>
28 28
 #include <kimageio.h>
29 29
 #include <kdebug.h>
30 30
 #include <klocale.h>

+ 1
- 1
kiconedit/kiconconfig.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <kapplication.h>
33 33
 #include <klocale.h>
34 34
 #include <kcolorbutton.h>
35
-#include <kfiledialog.h>
35
+#include <tdefiledialog.h>
36 36
 #include <kmessagebox.h>
37 37
 #include <kdebug.h>
38 38
 #include <kurlrequester.h>

+ 1
- 1
kiconedit/kiconedit.cpp View File

@@ -23,7 +23,7 @@
23 23
 
24 24
 #include <kpopupmenu.h>
25 25
 #include <kstdaction.h>
26
-#include <kconfig.h>
26
+#include <tdeconfig.h>
27 27
 #include <klocale.h>
28 28
 #include <kmessagebox.h>
29 29
 #include <kdebug.h>

+ 1
- 1
kiconedit/knew.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include <tqradiobutton.h>
25 25
 #include <tqpushbutton.h>
26 26
 
27
-#include <kconfig.h>
27
+#include <tdeconfig.h>
28 28
 #include <klocale.h>
29 29
 #include <kglobal.h>
30 30
 #include <kiconloader.h>

+ 1
- 1
kiconedit/main.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include <stdlib.h>
23 23
 
24 24
 #include <klocale.h>
25
-#include <kconfig.h>
25
+#include <tdeconfig.h>
26 26
 #include <kaboutdata.h>
27 27
 #include <kcmdlineargs.h>
28 28
 #include <kdebug.h>

+ 1
- 1
kiconedit/properties.cpp View File

@@ -18,7 +18,7 @@
18 18
     Boston, MA 02110-1301, USA.
19 19
 */
20 20
 
21
-#include <kconfig.h>
21
+#include <tdeconfig.h>
22 22
 #include <kdebug.h>
23 23
 #include <kapplication.h>
24 24
 

+ 1
- 1
kmrml/README View File

@@ -2,7 +2,7 @@ kio_mrml and mrml_part
2 2
 
3 3
 Carsten Pfeiffer <pfeiffer@kde.org>                     2001/05/03
4 4
 ----------------------------------------------------------------------
5
-These are the sources for an mrml kioslave and an accompanying KPart.
5
+These are the sources for an mrml tdeioslave and an accompanying KPart.
6 6
 
7 7
 
8 8
 How does it work in Konqueror?

+ 1
- 1
kmrml/kmrml/CMakeLists.txt View File

@@ -37,7 +37,7 @@ install( FILES mrml-servicemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/konquero
37 37
 
38 38
 tde_add_kpart( kio_mrml AUTOMOC
39 39
   SOURCES mrml.cpp
40
-  LINK kmrmlstuff-static kio-shared
40
+  LINK kmrmlstuff-static tdeio-shared
41 41
   DESTINATION ${PLUGIN_INSTALL_DIR}
42 42
 )
43 43
 

+ 1
- 1
kmrml/kmrml/kcontrol/CMakeLists.txt View File

@@ -33,6 +33,6 @@ tde_add_kpart( kcm_kmrml AUTOMOC
33 33
     kcmkmrml.cpp mainpage.cpp indexer.cpp
34 34
     serverconfigwidget.ui indexcleaner.cpp
35 35
   LINK
36
-    kmrmlstuff-static tdeparts-shared kio-shared
36
+    kmrmlstuff-static tdeparts-shared tdeio-shared
37 37
   DESTINATION ${PLUGIN_INSTALL_DIR}
38 38
 )

+ 1
- 1
kmrml/kmrml/kcontrol/indextest.cpp View File

@@ -3,7 +3,7 @@
3 3
 #include "indextest.moc"
4 4
 
5 5
 #include <kapplication.h>
6
-#include <kconfig.h>
6
+#include <tdeconfig.h>
7 7
 #include <kglobal.h>
8 8
 
9 9
 using namespace KMrmlConfig;

+ 1
- 1
kmrml/kmrml/kcontrol/kcmkmrml.desktop View File

@@ -1,5 +1,5 @@
1 1
 [Desktop Entry]
2
-Exec=kcmshell kcmkmrml
2
+Exec=tdecmshell kcmkmrml
3 3
 Icon=folder_image
4 4
 Type=Application
5 5
 

+ 2
- 2
kmrml/kmrml/kcontrol/mainpage.cpp View File

@@ -36,8 +36,8 @@
36 36
 
37 37
 #include <tdeversion.h>
38 38
 #include <kdebug.h>
39
-#include <kio/slaveconfig.h>
40
-#include <kio/ioslave_defaults.h> // MAX_PORT_VALUE
39
+#include <tdeio/slaveconfig.h>
40
+#include <tdeio/ioslave_defaults.h> // MAX_PORT_VALUE
41 41
 
42 42
 #include "serverconfigwidget.h"
43 43
 #include "mainpage.h"

+ 1
- 1
kmrml/kmrml/lib/kmrml_config.cpp View File

@@ -20,7 +20,7 @@
20 20
 #include <tqfile.h>
21 21
 #include <tqtextcodec.h>
22 22
 
23
-#include <kconfig.h>
23
+#include <tdeconfig.h>
24 24
 #include <kdebug.h>
25 25
 #include <kglobal.h>
26 26
 #include <kprocess.h>

+ 1
- 1
kmrml/kmrml/loader.cpp View File

@@ -17,7 +17,7 @@
17 17
 */
18 18
 
19 19
 #include <kstaticdeleter.h>
20
-#include <kio/scheduler.h>
20
+#include <tdeio/scheduler.h>
21 21
 
22 22
 #include "loader.h"
23 23
 

+ 1
- 1
kmrml/kmrml/loader.h View File

@@ -24,7 +24,7 @@
24 24
 #include <tqmap.h>
25 25
 #include <tqobject.h>
26 26
 
27
-#include <kio/job.h>
27
+#include <tdeio/job.h>
28 28
 #include <kurl.h>
29 29
 
30 30
 class Download

+ 1
- 1
kmrml/kmrml/mrml.cpp View File

@@ -25,7 +25,7 @@
25 25
 #include <unistd.h>
26 26
 #endif
27 27
 
28
-#include <kconfig.h>
28
+#include <tdeconfig.h>
29 29
 #include <kdebug.h>
30 30
 #include <kglobal.h>
31 31
 #include <kinstance.h>

+ 1
- 1
kmrml/kmrml/mrml.h View File

@@ -20,7 +20,7 @@
20 20
 #define MRML_H
21 21
 
22 22
 
23
-#include <kio/tcpslavebase.h>
23
+#include <tdeio/tcpslavebase.h>
24 24
 #include <kurl.h>
25 25
 
26 26
 #include <kmrml_config.h>

+ 1
- 1
kmrml/kmrml/mrml.protocol View File

@@ -7,4 +7,4 @@ reading=true
7 7
 defaultMimetype=text/mrml
8 8
 determineMimetypeFromExtension=false
9 9
 Icon=image
10
-DocPath=kioslave/mrml.html
10
+DocPath=tdeioslave/mrml.html

+ 4
- 4
kmrml/kmrml/mrml_part.cpp View File

@@ -30,15 +30,15 @@
30 30
 #include <kaboutdata.h>
31 31
 #include <kapplication.h>
32 32
 #include <kcombobox.h>
33
-#include <kconfig.h>
33
+#include <tdeconfig.h>
34 34
 #include <kdatastream.h>
35 35
 #include <kdebug.h>
36 36
 #include <kglobal.h>
37 37
 #include <klocale.h>
38 38
 #include <kiconloader.h>
39 39
 #include <kinstance.h>
40
-#include <kio/job.h>
41
-#include <kio/jobclasses.h>
40
+#include <tdeio/job.h>
41
+#include <tdeio/jobclasses.h>
42 42
 #include <kmessagebox.h>
43 43
 #include <knuminput.h>
44 44
 #include <kprotocolinfo.h>
@@ -284,7 +284,7 @@ bool MrmlPart::openURL( const KURL& url )
284 284
                                             "kmrml_ask_configure_gift" )
285 285
                  == KMessageBox::Yes )
286 286
             {
287
-                TDEApplication::tdeinitExec( "kcmshell",
287
+                TDEApplication::tdeinitExec( "tdecmshell",
288 288
                                            TQString::fromLatin1("kcmkmrml"));
289 289
                 setStatus( NeedCollection );
290 290
                 return false;

+ 2
- 2
kmrml/kmrml/mrmlsearch.cpp View File

@@ -21,7 +21,7 @@
21 21
 // from Konqueror and creates a query of the form
22 22
 // mrml://host.com/?relevant=url1;url2;url3;url4....
23 23
 // By default, the mrml URL is mrml://localhost", but you can override that
24
-// by editing ~/.trinity/share/config/kio_mrmlrc and adding
24
+// by editing ~/.trinity/share/config/tdeio_mrmlrc and adding
25 25
 // [MRML Settings]
26 26
 // Default URL=mrml://url.to.your.giftserver.com
27 27
 //
@@ -32,7 +32,7 @@
32 32
 
33 33
 #include <tqfile.h>
34 34
 #include <tqstring.h>
35
-#include <kconfig.h>
35
+#include <tdeconfig.h>
36 36
 #include <kglobal.h>
37 37
 #include <kinstance.h>
38 38
 #include <kurl.h>

+ 1
- 1
kmrml/kmrml/server/CMakeLists.txt View File

@@ -30,6 +30,6 @@ INSTALL( FILES daemonwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
30 30
 
31 31
 tde_add_kpart( kded_daemonwatcher AUTOMOC
32 32
   SOURCES watcher.cpp watcher.skel
33
-  LINK kmrmlstuff-static tdeparts-shared kio-shared tdeinit_kded-shared
33
+  LINK kmrmlstuff-static tdeparts-shared tdeio-shared tdeinit_kded-shared
34 34
   DESTINATION ${PLUGIN_INSTALL_DIR}
35 35
 )

+ 1
- 1
kolourpaint/kpcommandhistory.cpp View File

@@ -37,7 +37,7 @@
37 37
 
38 38
 #include <kactionclasses.h>
39 39
 #include <kapplication.h>
40
-#include <kconfig.h>
40
+#include <tdeconfig.h>
41 41
 #include <kdebug.h>
42 42
 #include <klocale.h>
43 43
 #include <kpopupmenu.h>

+ 1
- 1
kolourpaint/kpdocument.cpp View File

@@ -48,7 +48,7 @@
48 48
 #include <kdebug.h>
49 49
 #include <kglobal.h>
50 50
 #include <kimageio.h>
51
-#include <kio/netaccess.h>
51
+#include <tdeio/netaccess.h>
52 52
 #include <klocale.h>
53 53
 #include <kmessagebox.h>
54 54
 #include <kmimetype.h>

+ 1
- 1
kolourpaint/kpdocumentsaveoptions.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <tqpixmap.h>
34 34
 #include <tqstring.h>
35 35
 
36
-#include <kconfig.h>
36
+#include <tdeconfig.h>
37 37
 #include <kdebug.h>
38 38
 #include <kglobal.h>
39 39
 

+ 1
- 1
kolourpaint/kpdocumentsaveoptionswidget.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <tqtimer.h>
39 39
 
40 40
 #include <kcombobox.h>
41
-#include <kconfig.h>
41
+#include <tdeconfig.h>
42 42
 #include <kdebug.h>
43 43
 #include <kdialog.h>
44 44
 #include <kdialogbase.h>

+ 1
- 1
kolourpaint/kpmainwindow.cpp View File

@@ -35,7 +35,7 @@
35 35
 
36 36
 #include <kactionclasses.h>
37 37
 #include <kapplication.h>
38
-#include <kconfig.h>
38
+#include <tdeconfig.h>
39 39
 #include <kdebug.h>
40 40
 #include <klocale.h>
41 41
 #include <kmessagebox.h>

+ 3
- 3
kolourpaint/kpmainwindow_file.cpp View File

@@ -37,13 +37,13 @@
37 37
 #include <dcopclient.h>
38 38
 #include <kapplication.h>
39 39
 #include <kaction.h>
40
-#include <kconfig.h>
40
+#include <tdeconfig.h>
41 41
 #include <kdebug.h>
42
-#include <kfiledialog.h>
42
+#include <tdefiledialog.h>
43 43
 #include <kiconloader.h>
44 44
 #include <kimagefilepreview.h>
45 45
 #include <kimageio.h>
46
-#include <kio/netaccess.h>
46
+#include <tdeio/netaccess.h>
47 47
 #include <klocale.h>
48 48
 #include <kmessagebox.h>
49 49
 #include <kprinter.h>

+ 2
- 2
kolourpaint/kpmainwindow_help.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <kaction.h>
33 33
 #include <kactivelabel.h>
34 34
 #include <kapplication.h>
35
-#include <kconfig.h>
35
+#include <tdeconfig.h>
36 36
 #include <kdebug.h>
37 37
 #include <kdialogbase.h>
38 38
 #include <krun.h>
@@ -205,7 +205,7 @@ void kpMainWindow::slotHelpTakingScreenshotsFollowLink (const TQString &link)
205 205
 
206 206
     if (link == "configure kde shortcuts")
207 207
     {
208
-        KRun::runCommand ("kcmshell keys");
208
+        KRun::runCommand ("tdecmshell keys");
209 209
     }
210 210
     else if (link == "run ksnapshot")
211 211
     {

+ 1
- 1
kolourpaint/kpmainwindow_image.cpp View File

@@ -34,7 +34,7 @@
34 34
 
35 35
 #include <kaction.h>
36 36
 #include <kapplication.h>
37
-#include <kconfig.h>
37
+#include <tdeconfig.h>
38 38
 #include <kdebug.h>
39 39
 #include <klocale.h>
40 40
 #include <kmenubar.h>

+ 1
- 1
kolourpaint/kpmainwindow_settings.cpp View File

@@ -30,7 +30,7 @@
30 30
 
31 31
 #include <kactionclasses.h>
32 32
 #include <kapplication.h>
33
-#include <kconfig.h>
33
+#include <tdeconfig.h>
34 34
 #include <kdebug.h>
35 35
 #include <kedittoolbar.h>
36 36
 #include <kkeydialog.h>

+ 1
- 1
kolourpaint/kpmainwindow_text.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <kactionclasses.h>
32 32
 #include <kapplication.h>
33 33
 
34
-#include <kconfig.h>
34
+#include <tdeconfig.h>
35 35
 #include <kdebug.h>
36 36
 #include <klocale.h>
37 37
 

+ 1
- 1
kolourpaint/kpmainwindow_tools.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <kpmainwindow.h>
30 30
 
31 31
 #include <kapplication.h>
32
-#include <kconfig.h>
32
+#include <tdeconfig.h>
33 33
 #include <kdebug.h>
34 34
 #include <klocale.h>
35 35
 

+ 1
- 1
kolourpaint/kpmainwindow_view.cpp View File

@@ -36,7 +36,7 @@
36 36
 
37 37
 #include <kactionclasses.h>
38 38
 #include <kapplication.h>
39
-#include <kconfig.h>
39
+#include <tdeconfig.h>
40 40
 #include <kdebug.h>
41 41
 #include <klocale.h>
42 42
 #include <kstdaction.h>

+ 1
- 1
kolourpaint/pixmapfx/kpeffectflatten.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <tqvbox.h>
38 38
 
39 39
 #include <kcolorbutton.h>
40
-#include <kconfig.h>
40
+#include <tdeconfig.h>
41 41
 #include <kdialog.h>
42 42
 #include <kdebug.h>
43 43
 #include <kglobal.h>

+ 1
- 1
kolourpaint/pixmapfx/kpeffectsdialog.cpp View File

@@ -38,7 +38,7 @@
38 38
 
39 39
 #include <kapplication.h>
40 40
 #include <kcombobox.h>
41
-#include <kconfig.h>
41
+#include <tdeconfig.h>
42 42
 #include <kdebug.h>
43 43
 #include <klocale.h>
44 44
 

+ 1
- 1
kolourpaint/pixmapfx/kppixmapfx.cpp View File

@@ -43,7 +43,7 @@
43 43
 #include <tqpointarray.h>
44 44
 #include <tqrect.h>
45 45
 
46
-#include <kconfig.h>
46
+#include <tdeconfig.h>
47 47
 #include <kdebug.h>
48 48
 #include <klocale.h>
49 49
 #include <kmessagebox.h>

+ 1
- 1
kolourpaint/tools/kptoolresizescale.cpp View File

@@ -52,7 +52,7 @@
52 52
 
53 53
 #include <kapplication.h>
54 54
 #include <kcombobox.h>
55
-#include <kconfig.h>
55
+#include <tdeconfig.h>
56 56
 #include <kdebug.h>
57 57
 #include <kglobal.h>
58 58
 #include <kiconeffect.h>

+ 1
- 1
kolourpaint/widgets/kpcolortoolbar.cpp View File

@@ -43,7 +43,7 @@
43 43
 #include <kapplication.h>
44 44
 #include <kcolordialog.h>
45 45
 #include <kcolordrag.h>
46
-#include <kconfig.h>
46
+#include <tdeconfig.h>
47 47
 #include <kdebug.h>
48 48
 #include <kiconloader.h>
49 49
 #include <klocale.h>

+ 1
- 1
kolourpaint/widgets/kptooltoolbar.cpp View File

@@ -39,7 +39,7 @@
39 39
 #include <tqwidget.h>
40 40
 #include <tqwhatsthis.h>
41 41
 
42
-#include <kconfig.h>
42
+#include <tdeconfig.h>
43 43
 #include <kdebug.h>
44 44
 #include <kglobalsettings.h>
45 45
 #include <kicontheme.h>

+ 1
- 1
kolourpaint/widgets/kptoolwidgetbase.cpp View File

@@ -38,7 +38,7 @@
38 38
 #include <tqtooltip.h>
39 39
 
40 40
 #include <kapplication.h>
41
-#include <kconfig.h>
41
+#include <tdeconfig.h>
42 42
 #include <kdebug.h>
43 43
 
44 44
 #include <kpdefs.h>

+ 1
- 1
kooka/CHANGES View File

@@ -82,7 +82,7 @@ the preview page.
82 82
 
83 83
 Nov 2001:
84 84
 Replaced the old ScanPackager object by a new one based on the new KFileTreeView
85
-Widget in tdelibs/kfile. Hopefully soon full KURL support and more than one image
85
+Widget in tdelibs/tdefile. Hopefully soon full KURL support and more than one image
86 86
 repository.
87 87
 
88 88
 Nov 2001:

+ 1
- 1
kooka/imageselectline.cpp View File

@@ -35,7 +35,7 @@
35 35
 #include <klocale.h>
36 36
 #include <kurl.h>
37 37
 #include <kurlcombobox.h>
38
-#include <kfiledialog.h>
38
+#include <tdefiledialog.h>
39 39
 #include <kiconloader.h>
40 40
 
41 41
 #include "imageselectline.h"

+ 5
- 5
kooka/img_saver.cpp View File

@@ -31,17 +31,17 @@
31 31
 
32 32
 
33 33
 #include <kglobal.h>
34
-#include <kconfig.h>
34
+#include <tdeconfig.h>
35 35
 #include <kdialog.h>
36 36
 #include <kimageio.h>
37 37
 #include <kseparator.h>
38 38
 #include <klocale.h>
39 39
 #include <kmessagebox.h>
40 40
 #include <kdebug.h>
41
-#include <kio/jobclasses.h>
42
-#include <kio/file.h>
43
-#include <kio/job.h>
44
-#include <kio/netaccess.h>
41
+#include <tdeio/jobclasses.h>
42
+#include <tdeio/file.h>
43
+#include <tdeio/job.h>
44
+#include <tdeio/netaccess.h>
45 45
 #include <ktempfile.h>
46 46
 #include <kinputdialog.h>
47 47
 

+ 0
- 0
kooka/imgnamecombo.cpp View File


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

Loading…
Cancel
Save