Browse Source

Rename many classes and header files to avoid conflicts with KDE4

Timothy Pearson 6 years ago
parent
commit
81576b1337
100 changed files with 157 additions and 157 deletions
  1. 3
    3
      kamera/kcontrol/kamera.cpp
  2. 1
    1
      kamera/kcontrol/kameradevice.cpp
  3. 1
    1
      kcoloredit/kcoloredit.cpp
  4. 2
    2
      kcoloredit/kcoloredit.h
  5. 1
    1
      kcoloredit/kxycolorselector.h
  6. 1
    1
      kcoloredit/kzcolorselector.h
  7. 2
    2
      kdvi/kdvi_multipage.cpp
  8. 1
    1
      kdvi/kdvi_multipage_texthandling.cpp
  9. 2
    2
      kfax/kfax.cpp
  10. 1
    1
      kfax/kfax.h
  11. 1
    1
      kghostview/CMakeLists.txt
  12. 2
    2
      kghostview/Makefile.am
  13. 1
    1
      kghostview/TODO
  14. 4
    4
      kghostview/kgv_miniwidget.cpp
  15. 6
    6
      kghostview/kgv_view.cpp
  16. 1
    1
      kghostview/kgvdocument.cpp
  17. 3
    3
      kghostview/kgvshell.cpp
  18. 1
    1
      kghostview/martdelist.cpp
  19. 1
    1
      kiconedit/kiconconfig.cpp
  20. 1
    1
      kiconedit/kiconedit.cpp
  21. 4
    4
      kiconedit/kiconedit.h
  22. 1
    1
      kiconedit/palettetoolbar.h
  23. 3
    3
      kolourpaint/kpcommandhistory.cpp
  24. 1
    1
      kolourpaint/kpmainwindow.cpp
  25. 1
    1
      kolourpaint/kpmainwindow.h
  26. 1
    1
      kolourpaint/kpmainwindow_edit.cpp
  27. 2
    2
      kolourpaint/kpmainwindow_file.cpp
  28. 2
    2
      kolourpaint/kpmainwindow_help.cpp
  29. 1
    1
      kolourpaint/kpmainwindow_image.cpp
  30. 1
    1
      kolourpaint/kpmainwindow_settings.cpp
  31. 1
    1
      kolourpaint/kpmainwindow_text.cpp
  32. 1
    1
      kolourpaint/kpmainwindow_view.cpp
  33. 2
    2
      kolourpaint/kpsinglekeytriggersaction.h
  34. 1
    1
      kolourpaint/tools/kptoolaction.h
  35. 1
    1
      kolourpaint/widgets/kpcolortoolbar.h
  36. 1
    1
      kolourpaint/widgets/kptooltoolbar.h
  37. 1
    1
      kooka/dwmenuaction.h
  38. 3
    3
      kooka/kooka.cpp
  39. 1
    1
      kooka/kooka.h
  40. 3
    3
      kooka/kookaview.cpp
  41. 2
    2
      kooka/scanpackager.cpp
  42. 1
    1
      kooka/scanpackager.h
  43. 1
    1
      kpdf/core/generator_pdf/generator_pdf.cpp
  44. 2
    2
      kpdf/part.cpp
  45. 2
    2
      kpdf/shell/shell.cpp
  46. 1
    1
      kpdf/ui/minibar.cpp
  47. 4
    4
      kpdf/ui/pageview.cpp
  48. 3
    3
      kpdf/ui/presentationwidget.cpp
  49. 1
    1
      kpdf/ui/propertiesdialog.cpp
  50. 4
    4
      kpdf/ui/searchwidget.cpp
  51. 1
    1
      kpdf/ui/searchwidget.h
  52. 2
    2
      kpdf/ui/thumbnaillist.cpp
  53. 1
    1
      kpdf/ui/thumbnaillist.h
  54. 1
    1
      kpdf/ui/toc.h
  55. 2
    2
      kpovmodeler/pmactions.cpp
  56. 1
    1
      kpovmodeler/pmactions.h
  57. 3
    3
      kpovmodeler/pmdockwidget.cpp
  58. 2
    2
      kpovmodeler/pmdockwidget.h
  59. 1
    1
      kpovmodeler/pmglview.cpp
  60. 1
    1
      kpovmodeler/pminsertpopup.h
  61. 1
    1
      kpovmodeler/pmlibraryobjectsearch.cpp
  62. 1
    1
      kpovmodeler/pmpart.cpp
  63. 1
    1
      kpovmodeler/pmpart.h
  64. 2
    2
      kpovmodeler/pmshell.cpp
  65. 1
    1
      kpovmodeler/pmviewlayoutmanager.cpp
  66. 2
    2
      kruler/klineal.cpp
  67. 3
    3
      kruler/klineal.h
  68. 2
    2
      ksnapshot/ksnapshot.cpp
  69. 1
    1
      ksvg/plugin/ksvg_plugin.cpp
  70. 1
    1
      ksvg/plugin/ksvg_widget.cpp
  71. 1
    1
      ksvg/plugin/ksvg_widget.h
  72. 1
    1
      kuickshow/src/filewidget.cpp
  73. 1
    1
      kuickshow/src/imagewindow.cpp
  74. 1
    1
      kuickshow/src/imagewindow.h
  75. 1
    1
      kuickshow/src/kuickconfigdlg.cpp
  76. 4
    4
      kuickshow/src/kuickshow.cpp
  77. 1
    1
      kuickshow/src/kuickshow.h
  78. 2
    2
      kview/kview.cpp
  79. 1
    1
      kview/kviewcanvas/config/confmodules.cpp
  80. 1
    1
      kview/kviewcanvas/config/generalconfigwidget.ui
  81. 2
    2
      kview/kviewviewer/kviewviewer.cpp
  82. 1
    1
      kview/modules/browser/kviewbrowser.cpp
  83. 1
    1
      kview/modules/effects/kvieweffects.cpp
  84. 1
    1
      kview/modules/presenter/imagelistdialog.ui
  85. 1
    1
      kview/modules/presenter/imagelistitem.cpp
  86. 1
    1
      kview/modules/presenter/imagelistitem.h
  87. 1
    1
      kview/modules/presenter/kviewpresenter.cpp
  88. 1
    1
      kview/modules/scale/kview_scale.cpp
  89. 1
    1
      kview/modules/scanner/kviewscanner.cpp
  90. 1
    1
      kview/modules/template/kviewtemplate.cpp
  91. 2
    2
      kview/photobook/photobook.cpp
  92. 1
    1
      kviewshell/CMakeLists.txt
  93. 1
    1
      kviewshell/Makefile.am
  94. 1
    1
      kviewshell/documentWidget.cpp
  95. 2
    2
      kviewshell/kviewpart.cpp
  96. 1
    1
      kviewshell/kviewshell.cpp
  97. 3
    3
      kviewshell/martdelist.cpp
  98. 1
    1
      kviewshell/plugins/djvu/djvumultipage.cpp
  99. 1
    1
      kviewshell/tableOfContents.h
  100. 0
    0
      kviewshell/tdemultipage.cpp

+ 3
- 3
kamera/kcontrol/kamera.cpp View File

@@ -25,14 +25,14 @@
25 25
 
26 26
 #include <kgenericfactory.h>
27 27
 #include <ksimpleconfig.h>
28
-#include <kaction.h>
28
+#include <tdeaction.h>
29 29
 #include <kiconloader.h>
30 30
 #include <kmessagebox.h>
31 31
 #include <kiconview.h>
32 32
 #include <kdialog.h>
33 33
 #include <klocale.h>
34
-#include <ktoolbar.h>
35
-#include <kpopupmenu.h>
34
+#include <tdetoolbar.h>
35
+#include <tdepopupmenu.h>
36 36
 #include <kprotocolinfo.h>
37 37
 #include <kdebug.h>
38 38
 

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

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

+ 1
- 1
kcoloredit/kcoloredit.cpp View File

@@ -36,7 +36,7 @@
36 36
 #include "kcoloreditdoc.h"
37 37
 #include "loadpalettedlg.h"
38 38
 #include "resource.h"
39
-#include <kpopupmenu.h>
39
+#include <tdepopupmenu.h>
40 40
 #include <kstatusbar.h>
41 41
 
42 42
 

+ 2
- 2
kcoloredit/kcoloredit.h View File

@@ -27,8 +27,8 @@
27 27
 
28 28
 // include files for KDE
29 29
 #include <kapplication.h>
30
-#include <kmainwindow.h>
31
-#include <kaction.h>
30
+#include <tdemainwindow.h>
31
+#include <tdeaction.h>
32 32
 
33 33
 // application specific includes
34 34
 #include "color.h"

+ 1
- 1
kcoloredit/kxycolorselector.h View File

@@ -19,7 +19,7 @@
19 19
 #define KXYCOLORSELECTOR_H
20 20
 
21 21
 #include <tqwidget.h>
22
-#include <kselect.h>
22
+#include <tdeselect.h>
23 23
 
24 24
 #include "main.h"
25 25
 

+ 1
- 1
kcoloredit/kzcolorselector.h View File

@@ -20,7 +20,7 @@
20 20
 
21 21
 #include "tqcolor.h"
22 22
 #include "tqpixmap.h"
23
-#include "kselect.h"
23
+#include "tdeselect.h"
24 24
 
25 25
 #include "color.h"
26 26
 

+ 2
- 2
kdvi/kdvi_multipage.cpp View File

@@ -1,5 +1,5 @@
1 1
 #include <config.h>
2
-#include <kaction.h>
2
+#include <tdeaction.h>
3 3
 #include <kaboutdata.h>
4 4
 #include <kaboutdialog.h>
5 5
 #include <kapplication.h>
@@ -26,7 +26,7 @@
26 26
 #include "fontpool.h"
27 27
 #include "kprinterwrapper.h"
28 28
 #include "kviewpart.h"
29
-#include "marklist.h"
29
+#include "martdelist.h"
30 30
 #include "optionDialogFontsWidget.h"
31 31
 #include "optionDialogSpecialWidget.h"
32 32
 #include "performanceMeasurement.h"

+ 1
- 1
kdvi/kdvi_multipage_texthandling.cpp View File

@@ -26,7 +26,7 @@
26 26
 
27 27
 #include <config.h>
28 28
 
29
-#include <kaction.h>
29
+#include <tdeaction.h>
30 30
 #include <kdebug.h>
31 31
 #include <keditcl.h>
32 32
 #include <tdefiledialog.h>

+ 2
- 2
kfax/kfax.cpp View File

@@ -45,7 +45,7 @@
45 45
 #include <kiconloader.h>
46 46
 #include <tdefiledialog.h>
47 47
 #include <tdefilemetainfo.h>
48
-#include <kstdaccel.h>
48
+#include <tdestdaccel.h>
49 49
 #include <tdeconfig.h>
50 50
 #include <kmenubar.h>
51 51
 #include <kmessagebox.h>
@@ -57,7 +57,7 @@
57 57
 #include <kdebug.h>
58 58
 #include <kurldrag.h>
59 59
 #include <kstatusbar.h>
60
-#include <kaction.h>
60
+#include <tdeaction.h>
61 61
 #include <kprocess.h>
62 62
 #include <kprinter.h>
63 63
 #include <tdeio/job.h>

+ 1
- 1
kfax/kfax.h View File

@@ -29,7 +29,7 @@
29 29
 #define _KFAX_H_
30 30
 
31 31
 #include <kapplication.h>
32
-#include <kmainwindow.h>
32
+#include <tdemainwindow.h>
33 33
 #include <tqptrlist.h>
34 34
 #include <kurl.h>
35 35
 

+ 1
- 1
kghostview/CMakeLists.txt View File

@@ -41,7 +41,7 @@ install( PROGRAMS update-to-xt-names.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR}
41 41
 tde_add_library( kghostviewlib SHARED AUTOMOC
42 42
   SOURCES
43 43
     kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp
44
-    marklist.cpp logwindow.cpp infodialog.cpp kgvpageview.cpp ps.c
44
+    martdelist.cpp logwindow.cpp infodialog.cpp kgvpageview.cpp ps.c
45 45
     kgv_view.cpp scrollbox.cpp  kgvpagedecorator.cpp
46 46
     kgvconfigdialog.cpp kgvmainwidget.cpp  kdscerrordialog.cpp
47 47
     displayoptions.cpp kpswidget.cpp fullscreenfilter.cpp

+ 2
- 2
kghostview/Makefile.am View File

@@ -17,7 +17,7 @@ libkghostviewpart_la_LIBADD = libkghostviewlib.la
17 17
 
18 18
 # Check "make final" after making changes to the following line!!
19 19
 libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
20
-	marklist.cpp logwindow.cpp infodialog.cpp \
20
+	martdelist.cpp logwindow.cpp infodialog.cpp \
21 21
 	kgvpageview.cpp ps.c kgv_view.cpp scrollbox.cpp  kgvpagedecorator.cpp \
22 22
 	kgvconfigdialog.cpp kgvmainwidget.cpp \
23 23
 	kdscerrordialog.cpp displayoptions.cpp kpswidget.cpp \
@@ -35,7 +35,7 @@ libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
35 35
 libdscparse_la_LIBADD = $(LIB_QT)
36 36
 libdscparse_la_SOURCES = $(top_srcdir)/kghostview/dscparse/dscparse.cpp $(top_srcdir)/kghostview/dscparse/dscparse_adapter.cpp
37 37
 
38
-noinst_HEADERS =  marklist.h logwindow.h infodialog.h kgvshell.h \
38
+noinst_HEADERS =  martdelist.h logwindow.h infodialog.h kgvshell.h \
39 39
 	kpswidget.h kgvpageview.h ps.h kgv_miniwidget.h kgv_view.h scrollbox.h \
40 40
 	kgvpagedecorator.h kgvconfigdialog.h kgvmainwidget.h $(top_srcdir)/kghostview/dscparse/dscparse.h \
41 41
 	$(top_srcdir)/kghostview/dscparse/dscparse_adapter.h kdscerrordialog.h kgvdocument.h displayoptions.h \

+ 1
- 1
kghostview/TODO View File

@@ -34,7 +34,7 @@
34 34
 Done:
35 35
 - Scrollbox should show a thumbnail (like kdvi).
36 36
 
37
-- New implementation for the marklist because QTableView won't be in Qt-3.0 
37
+- New implementation for the martdelist because QTableView won't be in Qt-3.0 
38 38
   anymore. (I'll keep using QTableView, simply because there's no suitable
39 39
   alternative in Qt3.)
40 40
 

+ 4
- 4
kghostview/kgv_miniwidget.cpp View File

@@ -41,7 +41,7 @@
41 41
 #include <stdlib.h>
42 42
 
43 43
 #include "infodialog.h"
44
-#include "marklist.h"
44
+#include "martdelist.h"
45 45
 #include "kgvdocument.h"
46 46
 #include "kgv_view.h"
47 47
 #include "version.h"
@@ -508,7 +508,7 @@ void KGVMiniWidget::buildTOC()
508 508
 
509 509
     int last_page = 0;
510 510
 
511
-    MarkList*  marklist = _part->markList();
511
+    MarkList*  martdelist = _part->markList();
512 512
 
513 513
     if( dsc()->isStructured() ) {
514 514
 	if( _usePageLabels )
@@ -530,11 +530,11 @@ void KGVMiniWidget::buildTOC()
530 530
 	    else
531 531
 		s = tip;
532 532
 
533
-	    marklist->insertItem( s, i, tip );
533
+	    martdelist->insertItem( s, i, tip );
534 534
 	}
535 535
     }
536 536
     else {
537
-	marklist->insertItem( TQString::fromLatin1( "1" ), 0 );
537
+	martdelist->insertItem( TQString::fromLatin1( "1" ), 0 );
538 538
     }
539 539
 }
540 540
 

+ 6
- 6
kghostview/kgv_view.cpp View File

@@ -23,7 +23,7 @@
23 23
 #include <tqlayout.h>
24 24
 #include <tqregexp.h>
25 25
 
26
-#include <kaction.h>
26
+#include <tdeaction.h>
27 27
 #include <kapplication.h>
28 28
 #include <tdeconfig.h>
29 29
 #include <kdebug.h>
@@ -32,9 +32,9 @@
32 32
 #include <kiconloader.h>
33 33
 #include <kinstance.h>
34 34
 #include <klocale.h>
35
-#include <kpopupmenu.h>
35
+#include <tdepopupmenu.h>
36 36
 #include <kstdaction.h>
37
-#include <kstdaccel.h>
37
+#include <tdestdaccel.h>
38 38
 #include <ktempfile.h>
39 39
 #include <tdeio/scheduler.h>
40 40
 #include <kaboutdata.h>
@@ -50,7 +50,7 @@
50 50
 #include "kpswidget.h"
51 51
 #include "kgvfactory.h"
52 52
 #include "logwindow.h"
53
-#include "marklist.h"
53
+#include "martdelist.h"
54 54
 #include "scrollbox.h"
55 55
 #include "version.h"
56 56
 #include "configuration.h"
@@ -162,7 +162,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
162 162
     _docManager->setPSWidget( _psWidget );
163 163
     _docManager->setDocument( document() );
164 164
 
165
-    _markList = new MarkList( _mainWidget, "marklist", _docManager );
165
+    _markList = new MarkList( _mainWidget, "martdelist", _docManager );
166 166
     _markList->setFixedWidth( PAGELIST_WIDTH );
167 167
     vlay->addWidget( _markList, 1 );
168 168
     connect( TQT_TQOBJECT(_markList), TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ),
@@ -192,7 +192,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
192 192
                  actionCollection(), "info" );
193 193
 
194 194
     //-- Edit Menu -----------------------------------------------------
195
-    _popup = new TDEPopupMenu( _markList, "marklist_menu" );
195
+    _popup = new TDEPopupMenu( _markList, "martdelist_menu" );
196 196
 
197 197
     TDEAction *act = new TDEAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
198 198
                  TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ),

+ 1
- 1
kghostview/kgvdocument.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include "configuration.h"
38 38
 #include "kdscerrordialog.h"
39 39
 #include "kgv_miniwidget.h"
40
-#include "marklist.h"
40
+#include "martdelist.h"
41 41
 #include "kgvfactory.h"
42 42
 
43 43
 extern "C" {

+ 3
- 3
kghostview/kgvshell.cpp View File

@@ -19,7 +19,7 @@
19 19
 #include <assert.h>
20 20
 #include <stdlib.h>
21 21
 
22
-#include <kaction.h>
22
+#include <tdeaction.h>
23 23
 #include <kapplication.h>
24 24
 #include <tdefiledialog.h>
25 25
 #include <kiconloader.h>
@@ -29,7 +29,7 @@
29 29
 #include <kstandarddirs.h>
30 30
 #include <kstatusbar.h>
31 31
 #include <kstdaction.h>
32
-#include <kstdaccel.h>
32
+#include <tdestdaccel.h>
33 33
 #include <ktempfile.h>
34 34
 #include <kmenubar.h>
35 35
 #include <kedittoolbar.h>
@@ -37,7 +37,7 @@
37 37
 
38 38
 #include <kicontheme.h>
39 39
 #include <kglobal.h>
40
-#include <kpopupmenu.h>
40
+#include <tdepopupmenu.h>
41 41
 #include <tdeparts/componentfactory.h>
42 42
 
43 43
 #include <twin.h>

+ 1
- 1
kghostview/martdelist.cpp View File

@@ -16,7 +16,7 @@
16 16
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
17 17
  */
18 18
 
19
-#include "marklist.moc"
19
+#include "martdelist.moc"
20 20
 
21 21
 #include <cassert>
22 22
 

+ 1
- 1
kiconedit/kiconconfig.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <tqbuttongroup.h>
28 28
 #include <tqradiobutton.h>
29 29
 
30
-#include <kaccel.h>
30
+#include <tdeaccel.h>
31 31
 #include <kbuttonbox.h>
32 32
 #include <kapplication.h>
33 33
 #include <klocale.h>

+ 1
- 1
kiconedit/kiconedit.cpp View File

@@ -21,7 +21,7 @@
21 21
 #include <tqwhatsthis.h>
22 22
 #include <tqtooltip.h>
23 23
 
24
-#include <kpopupmenu.h>
24
+#include <tdepopupmenu.h>
25 25
 #include <kstdaction.h>
26 26
 #include <tdeconfig.h>
27 27
 #include <klocale.h>

+ 4
- 4
kiconedit/kiconedit.h View File

@@ -25,14 +25,14 @@
25 25
 #include <tqpixmap.h>
26 26
 #include <tqptrlist.h>
27 27
 
28
-#include <kmainwindow.h>
28
+#include <tdemainwindow.h>
29 29
 #include <kiconloader.h>
30 30
 #include <kmenubar.h>
31 31
 #include <kstatusbar.h>
32
-#include <ktoolbar.h>
33
-#include <kaccel.h>
32
+#include <tdetoolbar.h>
33
+#include <tdeaccel.h>
34 34
 #include <kurl.h>
35
-#include <kaction.h>
35
+#include <tdeaction.h>
36 36
 
37 37
 #include "knew.h"
38 38
 #include "kicon.h"

+ 1
- 1
kiconedit/palettetoolbar.h View File

@@ -22,7 +22,7 @@
22 22
 #ifndef PALLETTETOOLBAR_H
23 23
 #define PALLETTETOOLBAR_H
24 24
 
25
-#include <ktoolbar.h>
25
+#include <tdetoolbar.h>
26 26
 
27 27
 class TQBoxLayout;
28 28
 class TQLabel;

+ 3
- 3
kolourpaint/kpcommandhistory.cpp View File

@@ -35,13 +35,13 @@
35 35
 
36 36
 #include <tqdatetime.h>
37 37
 
38
-#include <kactionclasses.h>
38
+#include <tdeactionclasses.h>
39 39
 #include <kapplication.h>
40 40
 #include <tdeconfig.h>
41 41
 #include <kdebug.h>
42 42
 #include <klocale.h>
43
-#include <kpopupmenu.h>
44
-#include <kstdaccel.h>
43
+#include <tdepopupmenu.h>
44
+#include <tdestdaccel.h>
45 45
 #include <kstdaction.h>
46 46
 
47 47
 #include <kpdefs.h>

+ 1
- 1
kolourpaint/kpmainwindow.cpp View File

@@ -33,7 +33,7 @@
33 33
 #include <tqpainter.h>
34 34
 #include <tqtimer.h>
35 35
 
36
-#include <kactionclasses.h>
36
+#include <tdeactionclasses.h>
37 37
 #include <kapplication.h>
38 38
 #include <tdeconfig.h>
39 39
 #include <kdebug.h>

+ 1
- 1
kolourpaint/kpmainwindow.h View File

@@ -37,7 +37,7 @@
37 37
 #include <tqsize.h>
38 38
 #include <tqvaluevector.h>
39 39
 
40
-#include <kmainwindow.h>
40
+#include <tdemainwindow.h>
41 41
 #include <kurl.h>
42 42
 
43 43
 #include <kpdefs.h>

+ 1
- 1
kolourpaint/kpmainwindow_edit.cpp View File

@@ -35,7 +35,7 @@
35 35
 #include <tqpixmap.h>
36 36
 #include <tqvaluevector.h>
37 37
 
38
-#include <kaction.h>
38
+#include <tdeaction.h>
39 39
 #include <kdebug.h>
40 40
 #include <klocale.h>
41 41
 #include <kmessagebox.h>

+ 2
- 2
kolourpaint/kpmainwindow_file.cpp View File

@@ -36,7 +36,7 @@
36 36
 
37 37
 #include <dcopclient.h>
38 38
 #include <kapplication.h>
39
-#include <kaction.h>
39
+#include <tdeaction.h>
40 40
 #include <tdeconfig.h>
41 41
 #include <kdebug.h>
42 42
 #include <tdefiledialog.h>
@@ -47,7 +47,7 @@
47 47
 #include <klocale.h>
48 48
 #include <kmessagebox.h>
49 49
 #include <kprinter.h>
50
-#include <kstdaccel.h>
50
+#include <tdestdaccel.h>
51 51
 #include <kstdaction.h>
52 52
 #include <kscan.h>
53 53
 

+ 2
- 2
kolourpaint/kpmainwindow_help.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <kpmainwindow_p.h>
30 30
 
31 31
 #include <dcopclient.h>
32
-#include <kaction.h>
32
+#include <tdeaction.h>
33 33
 #include <kactivelabel.h>
34 34
 #include <kapplication.h>
35 35
 #include <tdeconfig.h>
@@ -37,7 +37,7 @@
37 37
 #include <kdialogbase.h>
38 38
 #include <krun.h>
39 39
 #include <klocale.h>
40
-#include <kshortcut.h>
40
+#include <tdeshortcut.h>
41 41
 
42 42
 #include <kptool.h>
43 43
 

+ 1
- 1
kolourpaint/kpmainwindow_image.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <tqcolor.h>
33 33
 #include <tqsize.h>
34 34
 
35
-#include <kaction.h>
35
+#include <tdeaction.h>
36 36
 #include <kapplication.h>
37 37
 #include <tdeconfig.h>
38 38
 #include <kdebug.h>

+ 1
- 1
kolourpaint/kpmainwindow_settings.cpp View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 #include <kpmainwindow.h>
30 30
 
31
-#include <kactionclasses.h>
31
+#include <tdeactionclasses.h>
32 32
 #include <kapplication.h>
33 33
 #include <tdeconfig.h>
34 34
 #include <kdebug.h>

+ 1
- 1
kolourpaint/kpmainwindow_text.cpp View File

@@ -28,7 +28,7 @@
28 28
 
29 29
 #include <kpmainwindow.h>
30 30
 
31
-#include <kactionclasses.h>
31
+#include <tdeactionclasses.h>
32 32
 #include <kapplication.h>
33 33
 
34 34
 #include <tdeconfig.h>

+ 1
- 1
kolourpaint/kpmainwindow_view.cpp View File

@@ -34,7 +34,7 @@
34 34
 #include <tqpainter.h>
35 35
 #include <tqtimer.h>
36 36
 
37
-#include <kactionclasses.h>
37
+#include <tdeactionclasses.h>
38 38
 #include <kapplication.h>
39 39
 #include <tdeconfig.h>
40 40
 #include <kdebug.h>

+ 2
- 2
kolourpaint/kpsinglekeytriggersaction.h View File

@@ -29,7 +29,7 @@
29 29
 #define KP_SINGLE_KEY_TRIGGERS_ACTION_H
30 30
 
31 31
 
32
-#include <kshortcut.h>
32
+#include <tdeshortcut.h>
33 33
 
34 34
 
35 35
 class kpSingleKeyTriggersActionInterface
@@ -53,7 +53,7 @@ protected:
53 53
 };
54 54
 
55 55
 
56
-#include <kaction.h>
56
+#include <tdeaction.h>
57 57
 
58 58
 
59 59
 class kpSingleKeyTriggersAction : public TDEAction,

+ 1
- 1
kolourpaint/tools/kptoolaction.h View File

@@ -28,7 +28,7 @@
28 28
 #ifndef KP_TOOL_ACTION_H
29 29
 #define KP_TOOL_ACTION_H
30 30
 
31
-#include <kactionclasses.h>
31
+#include <tdeactionclasses.h>
32 32
 
33 33
 #include <kpsinglekeytriggersaction.h>
34 34
 

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

@@ -34,7 +34,7 @@
34 34
 #include <tqwidget.h>
35 35
 
36 36
 #include <kcolordialog.h>
37
-#include <ktoolbar.h>
37
+#include <tdetoolbar.h>
38 38
 
39 39
 #include <kpcolor.h>
40 40
 #include <kpcolorsimilaritycube.h>

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

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include <tqvaluevector.h>
33 33
 
34
-#include <ktoolbar.h>
34
+#include <tdetoolbar.h>
35 35
 
36 36
 
37 37
 class TQBoxLayout;

+ 1
- 1
kooka/dwmenuaction.h View File

@@ -31,7 +31,7 @@
31 31
 #define __DW_MENU_ACTION
32 32
 #include <kdockwidget.h>
33 33
 #include <tqstring.h>
34
-#include <kaction.h>
34
+#include <tdeaction.h>
35 35
 
36 36
 /**
37 37
  * This class is just a helper class since the KDockWidget classes do not yet

+ 3
- 3
kooka/kooka.cpp View File

@@ -41,7 +41,7 @@
41 41
 #include <kdebug.h>
42 42
 #include <kiconloader.h>
43 43
 #include <kmenubar.h>
44
-#include <kaccel.h>
44
+#include <tdeaccel.h>
45 45
 #include <tdeio/netaccess.h>
46 46
 #include <tdefiledialog.h>
47 47
 #include <tdeconfig.h>
@@ -54,8 +54,8 @@
54 54
 #include <kmessagebox.h>
55 55
 #include <kdockwidget.h>
56 56
 #include <tdeparts/partmanager.h>
57
-#include <kstdaccel.h>
58
-#include <kaction.h>
57
+#include <tdestdaccel.h>
58
+#include <tdeaction.h>
59 59
 #include <kstdaction.h>
60 60
 #include <tqiconset.h>
61 61
 #include <kurldrag.h>

+ 1
- 1
kooka/kooka.h View File

@@ -32,7 +32,7 @@
32 32
 #endif
33 33
 
34 34
 #include <kapplication.h>
35
-#include <kmainwindow.h>
35
+#include <tdemainwindow.h>
36 36
 #include <kdockwidget.h>
37 37
 #include <tdeparts/dockmainwindow.h>
38 38
 

+ 3
- 3
kooka/kookaview.cpp View File

@@ -68,15 +68,15 @@
68 68
 #include <keditcl.h>
69 69
 #include <kled.h>
70 70
 #include <kcombobox.h>
71
-#include <kaction.h>
71
+#include <tdeaction.h>
72 72
 #include <kiconloader.h>
73
-#include <kshortcut.h>
73
+#include <tdeshortcut.h>
74 74
 #include <kdockwidget.h>
75 75
 #include <tqobject.h>
76 76
 
77 77
 #include <tdeparts/componentfactory.h>
78 78
 #include <tqimage.h>
79
-#include <kpopupmenu.h>
79
+#include <tdepopupmenu.h>
80 80
 
81 81
 
82 82
 #define STARTUP_IMG_SELECTION   "SelectedImageOnStartup"

+ 2
- 2
kooka/scanpackager.cpp View File

@@ -50,8 +50,8 @@
50 50
 #include <tdefiletreebranch.h>
51 51
 
52 52
 #include <kurldrag.h>
53
-#include <kpopupmenu.h>
54
-#include <kaction.h>
53
+#include <tdepopupmenu.h>
54
+#include <tdeaction.h>
55 55
 #include <kinputdialog.h>
56 56
 #include <kiconloader.h>
57 57
 #include <tdefiledialog.h>

+ 1
- 1
kooka/scanpackager.h View File

@@ -33,7 +33,7 @@
33 33
 #include <tqpixmap.h>
34 34
 #include <tqdragobject.h>
35 35
 #include <tqmap.h>
36
-#include <klistview.h>
36
+#include <tdelistview.h>
37 37
 #include <tdeio/job.h>
38 38
 #include <tdeio/global.h>
39 39
 #include <tdeio/file.h>

+ 1
- 1
kpdf/core/generator_pdf/generator_pdf.cpp View File

@@ -17,7 +17,7 @@
17 17
 #include <tqregexp.h>
18 18
 #include <tqvariant.h>
19 19
 #include <kapplication.h>
20
-#include <klistview.h>
20
+#include <tdelistview.h>
21 21
 #include <klocale.h>
22 22
 #include <kpassdlg.h>
23 23
 #include <tdewallet.h>

+ 2
- 2
kpdf/part.cpp View File

@@ -35,7 +35,7 @@
35 35
 #include <dcopobject.h>
36 36
 #include <dcopclient.h>
37 37
 #include <kapplication.h>
38
-#include <kaction.h>
38
+#include <tdeaction.h>
39 39
 #include <kdirwatch.h>
40 40
 #include <kinstance.h>
41 41
 #include <kprinter.h>
@@ -51,7 +51,7 @@
51 51
 #include <kiconloader.h>
52 52
 #include <tdeio/netaccess.h>
53 53
 #include <tdeio/job.h>
54
-#include <kpopupmenu.h>
54
+#include <tdepopupmenu.h>
55 55
 #include <kprocess.h>
56 56
 #include <kstandarddirs.h>
57 57
 #include <ktempfile.h>

+ 2
- 2
kpdf/shell/shell.cpp View File

@@ -20,7 +20,7 @@
20 20
 // qt/kde includes
21 21
 #include <tqcursor.h>
22 22
 #include <tqtimer.h>
23
-#include <kaction.h>
23
+#include <tdeaction.h>
24 24
 #include <kapplication.h>
25 25
 #include <kedittoolbar.h>
26 26
 #include <tdefiledialog.h>
@@ -33,7 +33,7 @@
33 33
 #include <kmenubar.h>
34 34
 #include <tdeparts/componentfactory.h>
35 35
 #include <tdeio/netaccess.h>
36
-#include <kmainwindowiface.h>
36
+#include <tdemainwindowiface.h>
37 37
 
38 38
 // local includes
39 39
 #include "shell.h"

+ 1
- 1
kpdf/ui/minibar.cpp View File

@@ -17,7 +17,7 @@
17 17
 #include <tqvalidator.h>
18 18
 #include <tqpainter.h>
19 19
 #include <kiconloader.h>
20
-#include <kaccelmanager.h>
20
+#include <tdeaccelmanager.h>
21 21
 #include <tdeversion.h>
22 22
 
23 23
 // local includes

+ 4
- 4
kpdf/ui/pageview.cpp View File

@@ -29,10 +29,10 @@
29 29
 #include <kcursor.h>
30 30
 #include <kiconloader.h>
31 31
 #include <kurldrag.h>
32
-#include <kaction.h>
33
-#include <kstdaccel.h>
34
-#include <kactioncollection.h>
35
-#include <kpopupmenu.h>
32
+#include <tdeaction.h>
33
+#include <tdestdaccel.h>
34
+#include <tdeactioncollection.h>
35
+#include <tdepopupmenu.h>
36 36
 #include <klocale.h>
37 37
 #include <tdefiledialog.h>
38 38
 #include <kimageeffect.h>

+ 3
- 3
kpdf/ui/presentationwidget.cpp View File

@@ -14,11 +14,11 @@
14 14
 #include <tqapplication.h>
15 15
 #include <tqdesktopwidget.h>
16 16
 #include <tqtooltip.h>
17
-#include <kaccel.h>
18
-#include <kactioncollection.h>
17
+#include <tdeaccel.h>
18
+#include <tdeactioncollection.h>
19 19
 #include <kapplication.h>
20 20
 #include <kcursor.h>
21
-#include <ktoolbar.h>
21
+#include <tdetoolbar.h>
22 22
 #include <kdebug.h>
23 23
 #include <klocale.h>
24 24
 #include <kiconloader.h>

+ 1
- 1
kpdf/ui/propertiesdialog.cpp View File

@@ -10,7 +10,7 @@
10 10
 // qt/kde includes
11 11
 #include <tqlayout.h>
12 12
 #include <tqlabel.h>
13
-#include <klistview.h>
13
+#include <tdelistview.h>
14 14
 #include <klocale.h>
15 15
 #include <ksqueezedtextlabel.h>
16 16
 #include <kglobalsettings.h>

+ 4
- 4
kpdf/ui/searchwidget.cpp View File

@@ -11,13 +11,13 @@
11 11
 #include <tqtooltip.h>
12 12
 #include <tqapplication.h>
13 13
 #include <tqtimer.h>
14
-#include <kaction.h>
15
-#include <kactioncollection.h>
14
+#include <tdeaction.h>
15
+#include <tdeactioncollection.h>
16 16
 #include <klocale.h>
17 17
 #include <kiconloader.h>
18 18
 #include <klineedit.h>
19
-#include <kpopupmenu.h>
20
-#include <ktoolbarbutton.h>
19
+#include <tdepopupmenu.h>
20
+#include <tdetoolbarbutton.h>
21 21
 
22 22
 // local includes
23 23
 #include "searchwidget.h"

+ 1
- 1
kpdf/ui/searchwidget.h View File

@@ -10,7 +10,7 @@
10 10
 #ifndef _KPDF_SEARCHWIDGET_H_
11 11
 #define _KPDF_SEARCHWIDGET_H_
12 12
 
13
-#include <ktoolbar.h>
13
+#include <tdetoolbar.h>
14 14
 
15 15
 class TDEPopupMenu;
16 16
 class KPDFDocument;

+ 2
- 2
kpdf/ui/thumbnaillist.cpp View File

@@ -13,9 +13,9 @@
13 13
 #include <klocale.h>
14 14
 #include <kurl.h>
15 15
 #include <kurldrag.h>
16
-#include <kaction.h>
16
+#include <tdeaction.h>
17 17
 #include <kiconloader.h>
18
-#include <kactioncollection.h>
18
+#include <tdeactioncollection.h>
19 19
 
20 20
 // local includes
21 21
 #include "thumbnaillist.h"

+ 1
- 1
kpdf/ui/thumbnaillist.h View File

@@ -13,7 +13,7 @@
13 13
 #include <tqscrollview.h>
14 14
 #include <tqvaluevector.h>
15 15
 #include <tqvbox.h>
16
-#include <ktoolbar.h>
16
+#include <tdetoolbar.h>
17 17
 #include "core/observer.h"
18 18
 
19 19
 class TQTimer;

+ 1
- 1
kpdf/ui/toc.h View File

@@ -11,7 +11,7 @@
11 11
 #define _KPDF_TOC_H_
12 12
 
13 13
 #include <tqdom.h>
14
-#include <klistview.h>
14
+#include <tdelistview.h>
15 15
 #include "core/document.h"
16 16
 #include "core/observer.h"
17 17
 

+ 2
- 2
kpovmodeler/pmactions.cpp View File

@@ -23,8 +23,8 @@
23 23
 #include <tqlabel.h>
24 24
 #include <tqstyle.h>
25 25
 #include <tqpainter.h>
26
-#include <ktoolbar.h>
27
-#include <ktoolbarbutton.h>
26
+#include <tdetoolbar.h>
27
+#include <tdetoolbarbutton.h>
28 28
 
29 29
 #include "pmdebug.h"
30 30
 

+ 1
- 1
kpovmodeler/pmactions.h View File

@@ -21,7 +21,7 @@
21 21
 #define PMACTIONS_H
22 22
 
23 23
 #include <tqguardedptr.h>
24
-#include <kaction.h>
24
+#include <tdeaction.h>
25 25
 
26 26
 class TQComboBox;
27 27
 class TQSpinBox;

+ 3
- 3
kpovmodeler/pmdockwidget.cpp View File

@@ -32,8 +32,8 @@
32 32
 #ifndef NO_KDE2
33 33
 #include <tdeconfig.h>
34 34
 #include <kglobal.h>
35
-#include <ktoolbar.h>
36
-#include <kpopupmenu.h>
35
+#include <tdetoolbar.h>
36
+#include <tdepopupmenu.h>
37 37
 #include <twin.h>
38 38
 #include <kdebug.h>
39 39
 #ifdef TQ_WS_X11
@@ -50,7 +50,7 @@
50 50
 
51 51
 #include <tdeparts/event.h>
52 52
 #include <tdeparts/part.h>
53
-#include <kaccel.h>
53
+#include <tdeaccel.h>
54 54
 #include <tdeparts/plugin.h>
55 55
 #include <kstatusbar.h>
56 56
 #include <kinstance.h>

+ 2
- 2
kpovmodeler/pmdockwidget.h View File

@@ -64,14 +64,14 @@
64 64
 #include <tqtabwidget.h>
65 65
 
66 66
 #ifndef NO_KDE2
67
-#include <kmainwindow.h>
67
+#include <tdemainwindow.h>
68 68
 #include <netwm_def.h>
69 69
 #undef  EXPORT_DOCKCLASS
70 70
 #define EXPORT_DOCKCLASS
71 71
 #else
72 72
 #include <tqmainwindow.h>
73 73
 #include "exportdockclass.h"
74
-#include "dummykmainwindow.h"
74
+#include "dummytdemainwindow.h"
75 75
 #endif
76 76
 
77 77
 #include <tdeparts/part.h>

+ 1
- 1
kpovmodeler/pmglview.cpp View File

@@ -37,7 +37,7 @@
37 37
 #include <tqdom.h>
38 38
 
39 39
 #include <kxmlguifactory.h>
40
-#include <kaction.h>
40
+#include <tdeaction.h>
41 41
 #include <tdeconfig.h>
42 42
 #include <kstaticdeleter.h>
43 43
 #include <klocale.h>

+ 1
- 1
kpovmodeler/pminsertpopup.h View File

@@ -24,7 +24,7 @@
24 24
 #include <config.h>
25 25
 #endif
26 26
 
27
-#include <kpopupmenu.h>
27
+#include <tdepopupmenu.h>
28 28
 
29 29
 /**
30 30
  * Popup menu. Ask the user where to insert new objects

+ 1
- 1
kpovmodeler/pmlibraryobjectsearch.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include <kurl.h>
33 33
 #include <klocale.h>
34 34
 #include <kdialog.h>
35
-#include <klistview.h>
35
+#include <tdelistview.h>
36 36
 
37 37
 PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* parent ) :
38 38
    TQWidget( parent, "" )

+ 1
- 1
kpovmodeler/pmpart.cpp View File

@@ -34,7 +34,7 @@
34 34
 #include <kiconloader.h>
35 35
 #include <tdeconfig.h>
36 36
 #include <kstdaction.h>
37
-#include <kaction.h>
37
+#include <tdeaction.h>
38 38
 #include <kmessagebox.h>
39 39
 #include <ktempfile.h>
40 40
 #include <tdeio/netaccess.h>

+ 1
- 1
kpovmodeler/pmpart.h View File

@@ -26,7 +26,7 @@
26 26
 #endif
27 27
 
28 28
 #include <kapplication.h>
29
-#include <kaccel.h>
29
+#include <tdeaccel.h>
30 30
 #include <kurl.h>
31 31
 #include <tdeparts/part.h>
32 32
 #include <tdeparts/browserextension.h>

+ 2
- 2
kpovmodeler/pmshell.cpp View File

@@ -18,7 +18,7 @@
18 18
 #include <klocale.h>
19 19
 #include <khelpmenu.h>
20 20
 #include <kstdaction.h>
21
-#include <kaction.h>
21
+#include <tdeaction.h>
22 22
 #include <kstatusbar.h>
23 23
 #include <tdefiledialog.h>
24 24
 #include <kmessagebox.h>
@@ -26,7 +26,7 @@
26 26
 #include <kedittoolbar.h>
27 27
 #include <kkeydialog.h>
28 28
 #include <kaboutdialog.h>
29
-#include <kpopupmenu.h>
29
+#include <tdepopupmenu.h>
30 30
 #include <tqtimer.h>
31 31
 
32 32
 #include "pmshell.h"

+ 1
- 1
kpovmodeler/pmviewlayoutmanager.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include <kstandarddirs.h>
25 25
 #include <klocale.h>
26 26
 #include <kfilterdev.h>
27
-#include <kpopupmenu.h>
27
+#include <tdepopupmenu.h>
28 28
 #include <kiconloader.h>
29 29
 
30 30
 #include <tqfile.h>

+ 2
- 2
kruler/klineal.cpp View File

@@ -25,9 +25,9 @@
25 25
 #include <kiconloader.h>
26 26
 #include <kimageeffect.h>
27 27
 #include <klocale.h>
28
-#include <kmainwindow.h>
28
+#include <tdemainwindow.h>
29 29
 #include <knotifyclient.h>
30
-#include <kpopupmenu.h>
30
+#include <tdepopupmenu.h>
31 31
 #include <kstandarddirs.h>
32 32
 #include <twin.h>
33 33
 #include <kstdguiitem.h>

+ 3
- 3
kruler/klineal.h View File

@@ -19,11 +19,11 @@
19 19
 #define KLINEAL_H
20 20
 
21 21
 #include <kapplication.h>
22
-#include <kpopupmenu.h>
23
-#include <kmainwindow.h>
22
+#include <tdepopupmenu.h>
23
+#include <tdemainwindow.h>
24 24
 
25 25
 #include <kcolordialog.h>
26
-#include <kfontdialog.h>
26
+#include <tdefontdialog.h>
27 27
 
28 28
 #include <tqlabel.h>
29 29
 #include <tqpainter.h>

+ 2
- 2
ksnapshot/ksnapshot.cpp View File

@@ -29,10 +29,10 @@
29 29
 #include <tqclipboard.h>
30 30
 #include <tqvbox.h>
31 31
 
32
-#include <kaccel.h>
32
+#include <tdeaccel.h>
33 33
 #include <knotifyclient.h>
34 34
 #include <khelpmenu.h>
35
-#include <kpopupmenu.h>
35
+#include <tdepopupmenu.h>
36 36
 #include <kpushbutton.h>
37 37
 #include <kstartupinfo.h>
38 38
 

+ 1
- 1
ksvg/plugin/ksvg_plugin.cpp View File

@@ -20,7 +20,7 @@
20 20
 
21 21
 #include <krun.h>
22 22
 #include <kdebug.h>
23
-#include <kaction.h>
23
+#include <tdeaction.h>
24 24
 #include <tdefiledialog.h>
25 25
 #include <klocale.h>
26 26
 #include <ktempfile.h>

+ 1
- 1
ksvg/plugin/ksvg_widget.cpp View File

@@ -19,7 +19,7 @@
19 19
 */
20 20
 
21 21
 #include <kcursor.h>
22
-#include <kpopupmenu.h>
22
+#include <tdepopupmenu.h>
23 23
 #include <kxmlguifactory.h>
24 24
 #include "ksvg_widget.moc"
25 25
 

+ 1
- 1
ksvg/plugin/ksvg_widget.h View File

@@ -23,7 +23,7 @@
23 23
 
24 24
 #include <tqwidget.h>
25 25
 
26
-#include <kpopupmenu.h>
26
+#include <tdepopupmenu.h>
27 27
 
28 28
 #include <SVGEventImpl.h>
29 29
 

+ 1
- 1
kuickshow/src/filewidget.cpp View File

@@ -22,7 +22,7 @@
22 22
 #include <kglobal.h>
23 23
 #include <kglobalsettings.h>
24 24
 #include <klocale.h>
25
-#include <kpopupmenu.h>
25
+#include <tdepopupmenu.h>
26 26
 #include <kpropertiesdialog.h>
27 27
 #include <kurlcompletion.h>
28 28
 

+ 1
- 1
kuickshow/src/imagewindow.cpp View File

@@ -51,7 +51,7 @@
51 51
 #include <kmessagebox.h>
52 52
 #include <kprinter.h>
53 53
 #include <kpropertiesdialog.h>
54
-#include <kstdaccel.h>
54
+#include <tdestdaccel.h>
55 55
 #include <kstdguiitem.h>
56 56
 #include <kstandarddirs.h>
57 57
 #include <kglobalsettings.h>

+ 1
- 1
kuickshow/src/imagewindow.h View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 #include <tqevent.h>
23 23
 
24
-#include <kaction.h>
24
+#include <tdeaction.h>
25 25
 #include <kurl.h>
26 26
 
27 27
 #include "imlibwidget.h"

+ 1
- 1
kuickshow/src/kuickconfigdlg.cpp View File

@@ -25,7 +25,7 @@
25 25
 #include <tqkeycode.h>
26 26
 #include <tqvbox.h>
27 27
 
28
-#include <kaccel.h>
28
+#include <tdeaccel.h>
29 29
 #include <tdeconfig.h>
30 30
 #include <kglobal.h>
31 31
 #include <klocale.h>

+ 4
- 4
kuickshow/src/kuickshow.cpp View File

@@ -29,8 +29,8 @@
29 29
 #include <tqstring.h>
30 30
 
31 31
 #include <kaboutdata.h>
32
-#include <kaccel.h>
33
-#include <kaction.h>
32
+#include <tdeaccel.h>
33
+#include <tdeaction.h>
34 34
 #include <kapplication.h>
35 35
 #include <kcmdlineargs.h>
36 36
 #include <tdeconfig.h>
@@ -45,7 +45,7 @@
45 45
 #include <klocale.h>
46 46
 #include <kmenubar.h>
47 47
 #include <kmessagebox.h>
48
-#include <kpopupmenu.h>
48
+#include <tdepopupmenu.h>
49 49
 #include <kprotocolinfo.h>
50 50
 #include <kpropertiesdialog.h>
51 51
 #include <kprotocolinfo.h>
@@ -53,7 +53,7 @@
53 53
 #include <kstdaction.h>
54 54
 #include <kstandarddirs.h>
55 55
 #include <kstartupinfo.h>
56
-#include <ktoolbar.h>
56
+#include <tdetoolbar.h>
57 57
 #include <kurlcombobox.h>
58 58
 #include <kurlcompletion.h>
59 59
 #include <kurldrag.h>

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

@@ -25,7 +25,7 @@
25 25
 #include <tqvaluelist.h>
26 26
 
27 27
 #include <tdefileitem.h>
28
-#include <kmainwindow.h>
28
+#include <tdemainwindow.h>
29 29
 #include <kurl.h>
30 30
 
31 31
 #include <Imlib.h>

+ 2
- 2
kview/kview.cpp View File

@@ -29,7 +29,7 @@
29 29
 #include <tdeparts/plugin.h>
30 30
 #include <tdeparts/part.h>
31 31
 #include <kapplication.h>
32
-#include <kaction.h>
32
+#include <tdeaction.h>
33 33
 #include <kstdaction.h>
34 34
 #include <kimageio.h>
35 35
 #include <tdefiledialog.h>
@@ -39,7 +39,7 @@
39 39
 #include <kstatusbar.h>
40 40
 #include <kdebug.h>
41 41
 #include <kedittoolbar.h>
42
-#include <kstdaccel.h>
42
+#include <tdestdaccel.h>
43 43
 #include <kprogress.h>
44 44
 
45 45
 #include <tqimage.h>

+ 1
- 1
kview/kviewcanvas/config/confmodules.cpp View File

@@ -27,7 +27,7 @@
27 27
 #include <klocale.h>
28 28
 #include <ksimpleconfig.h>
29 29
 #include <kcolorbutton.h>
30
-#include <klistview.h>
30
+#include <tdelistview.h>
31 31
 #include <knuminput.h>
32 32
 #include <kgenericfactory.h>
33 33
 

+ 1
- 1
kview/kviewcanvas/config/generalconfigwidget.ui View File

@@ -294,7 +294,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
294 294
     <includehint>knuminput.h</includehint>
295 295
     <includehint>knuminput.h</includehint>
296 296
     <includehint>knuminput.h</includehint>
297
-    <includehint>klistview.h</includehint>
297
+    <includehint>tdelistview.h</includehint>
298 298
     <includehint>kcolorbutton.h</includehint>
299 299
 </includehints>
300 300
 </UI>

+ 2
- 2
kview/kviewviewer/kviewviewer.cpp View File

@@ -47,10 +47,10 @@
47 47
 #include <ktempfile.h>
48 48
 #include <kapplication.h>
49 49
 #include <kimageio.h>
50
-#include <kstdaccel.h>
50
+#include <tdestdaccel.h>
51 51
 #include <kdirwatch.h>
52 52
 #include <kurldrag.h>
53
-#include <krecentdocument.h>
53
+#include <tderecentdocument.h>
54 54
 
55 55
 typedef KParts::GenericFactory<KViewViewer> KViewViewerFactory;
56 56
 K_EXPORT_COMPONENT_FACTORY( libkviewviewer, KViewViewerFactory )

+ 1
- 1
kview/modules/browser/kviewbrowser.cpp View File

@@ -23,7 +23,7 @@
23 23
 #include <tqcursor.h>
24 24
 
25 25
 #include <kdirlister.h>
26
-#include <kaction.h>
26
+#include <tdeaction.h>
27 27
 #include <klocale.h>
28 28
 #include <kgenericfactory.h>
29 29
 #include <kdebug.h>

+ 1
- 1
kview/modules/effects/kvieweffects.cpp View File

@@ -6,7 +6,7 @@
6 6
 
7 7
 #include <tqobjectlist.h>
8 8
 
9
-#include <kaction.h>
9
+#include <tdeaction.h>
10 10
 #include <klocale.h>
11 11
 #include <kgenericfactory.h>
12 12
 #include <kdebug.h>

+ 1
- 1
kview/modules/presenter/imagelistdialog.ui View File

@@ -275,7 +275,7 @@
275 275
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
276 276
 <includehints>
277 277
     <includehint>kdialog.h</includehint>
278
-    <includehint>klistview.h</includehint>
278
+    <includehint>tdelistview.h</includehint>
279 279
     <includehint>kpushbutton.h</includehint>
280 280
     <includehint>kpushbutton.h</includehint>
281 281
     <includehint>kpushbutton.h</includehint>

+ 1
- 1
kview/modules/presenter/imagelistitem.cpp View File

@@ -22,7 +22,7 @@
22 22
 
23 23
 #include <tqimage.h>
24 24
 
25
-#include <klistview.h>
25
+#include <tdelistview.h>
26 26
 
27 27
 ImageListItem::ImageListItem( TDEListView * parent, const KURL & url )
28 28
 	: TDEListViewItem( parent, parent->lastItem(), url.prettyURL() )

+ 1
- 1
kview/modules/presenter/imagelistitem.h View File

@@ -21,7 +21,7 @@
21 21
 #ifndef IMAGELISTITEM_H
22 22
 #define IMAGELISTITEM_H
23 23
 
24
-#include <klistview.h>
24
+#include <tdelistview.h>
25 25
 #include <kurl.h>
26 26
 #include <tqstring.h>
27 27
 

+ 1
- 1
kview/modules/presenter/kviewpresenter.cpp View File

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include <kpushbutton.h>
34 34
 #include <kapplication.h>
35
-#include <kaction.h>
35
+#include <tdeaction.h>
36 36
 #include <klocale.h>
37 37
 #include <kgenericfactory.h>
38 38
 #include <kdebug.h>

+ 1
- 1
kview/modules/scale/kview_scale.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include <tqimage.h>
25 25
 #include <tqvbox.h>
26 26
 
27
-#include <kaction.h>
27
+#include <tdeaction.h>
28 28
 #include <klocale.h>
29 29
 #include <kgenericfactory.h>
30 30
 #include <kdebug.h>

+ 1
- 1
kview/modules/scanner/kviewscanner.cpp View File

@@ -23,7 +23,7 @@
23 23
 #include <tqimage.h>
24 24
 #include <tqobjectlist.h>
25 25
 
26
-#include <kaction.h>
26
+#include <tdeaction.h>
27 27
 #include <kinstance.h>
28 28
 #include <klocale.h>
29 29
 #include <kgenericfactory.h>

+ 1
- 1
kview/modules/template/kviewtemplate.cpp View File

@@ -6,7 +6,7 @@
6 6
 
7 7
 #include <tqobjectlist.h>
8 8
 
9
-#include <kaction.h>
9
+#include <tdeaction.h>
10 10
 /*#include <klocale.h>*/
11 11
 #include <kgenericfactory.h>
12 12
 #include <kdebug.h>

+ 2
- 2
kview/photobook/photobook.cpp View File

@@ -40,8 +40,8 @@ Copyright (c) 2004,2005 Charles Samuels <charles@kde.org>
40 40
 #include "photobook.h"
41 41
 
42 42
 #include <tdeparts/componentfactory.h>
43
-#include <kaction.h>
44
-#include <kstdaccel.h>
43
+#include <tdeaction.h>
44
+#include <tdestdaccel.h>
45 45
 #include <kstandarddirs.h>
46 46
 
47 47
 Previews::Previews(PhotoBook *parent, const TQStringList &mimetypes)

+ 1
- 1
kviewshell/CMakeLists.txt View File

@@ -71,7 +71,7 @@ tde_add_library( kviewshell STATIC_PIC AUTOMOC
71 71
 
72 72
 tde_add_library( tdemultipage SHARED AUTOMOC
73 73
   SOURCES
74
-    tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel
74
+    tdemultipage.cpp pageView.cpp martdelist.cpp tdemultipageInterface.skel
75 75
     units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp
76 76
     renderedDocumentPagePixmap.cpp renderedDocumentPagePrinter.cpp
77 77
     documentPageCache.cpp documentWidget.cpp searchWidget.cpp

+ 1
- 1
kviewshell/Makefile.am View File

@@ -20,7 +20,7 @@ kviewerpart_la_SOURCES = kviewpart.cpp pageSizeWidget_base.ui \
20 20
 kviewerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
21 21
 kviewerpart_la_LIBADD = ./libifaces.la $(LIB_TDEFILE) -ltdeparts
22 22
 
23
-libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel \
23
+libtdemultipage_la_SOURCES = tdemultipage.cpp pageView.cpp martdelist.cpp tdemultipageInterface.skel \
24 24
 		units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp renderedDocumentPagePixmap.cpp \
25 25
 		renderedDocumentPagePrinter.cpp documentPageCache.cpp documentWidget.cpp searchWidget.cpp \
26 26
 		selection.cpp documentRenderer.cpp history.cpp kvsprefs.kcfgc tableOfContents.cpp \

+ 1
- 1
kviewshell/documentWidget.cpp View File

@@ -11,7 +11,7 @@
11 11
 
12 12
 #include <config.h>
13 13
 
14
-#include <kaction.h>
14
+#include <tdeaction.h>
15 15
 #include <kapplication.h>
16 16
 #include <kdebug.h>
17 17
 #include <kglobalsettings.h>

+ 2
- 2
kviewshell/kviewpart.cpp View File

@@ -9,8 +9,8 @@
9 9
 #include <tqprintdialog.h>
10 10
 
11 11
 #include <kaboutdialog.h>
12
-#include <kaccel.h>
13
-#include <kaction.h>
12
+#include <tdeaccel.h>
13
+#include <tdeaction.h>
14 14
 #include <kapplication.h>
15 15
 #include <tdeconfig.h>
16 16
 #include <tdeconfigdialog.h>

+ 1
- 1
kviewshell/kviewshell.cpp View File

@@ -15,7 +15,7 @@
15 15
 #include <kiconloader.h>
16 16
 #include <kstandarddirs.h>
17 17
 #include <kapplication.h>
18
-#include <kaction.h>
18
+#include <tdeaction.h>
19 19
 #include <tdeconfig.h>
20 20
 #include <kdebug.h>
21 21
 #include <klocale.h>

+ 3
- 3
kviewshell/martdelist.cpp View File

@@ -32,16 +32,16 @@
32 32
 #include <kapplication.h>
33 33
 #include <kglobalsettings.h>
34 34
 #include <klocale.h>
35
-#include <kpopupmenu.h>
35
+#include <tdepopupmenu.h>
36 36
 #include <kiconloader.h>
37 37
 #include <kdebug.h>
38 38
 
39 39
 #include "documentPageCache.h"
40 40
 #include "kvsprefs.h"
41
-#include "marklist.h"
41
+#include "martdelist.h"
42 42
 
43 43
 
44
-#include "marklist.moc"
44
+#include "martdelist.moc"
45 45
 
46 46
 
47 47
 namespace {

+ 1
- 1
kviewshell/plugins/djvu/djvumultipage.cpp View File

@@ -21,7 +21,7 @@
21 21
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
22 22
  ***************************************************************************/
23 23
 
24
-#include <kaction.h>
24
+#include <tdeaction.h>
25 25
 #include <kdialogbase.h>
26 26
 #include <tdefiledialog.h>
27 27
 #include <tdeparts/genericfactory.h>

+ 1
- 1
kviewshell/tableOfContents.h View File

@@ -24,7 +24,7 @@
24 24
 
25 25
 #include "anchor.h"
26 26
 
27
-#include <klistview.h>
27
+#include <tdelistview.h>
28 28
 
29 29
 class Bookmark;
30 30
 

+ 0
- 0
kviewshell/tdemultipage.cpp View File


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

Loading…
Cancel
Save