Browse Source

Rename a number of classes to enhance compatibility with KDE4

Timothy Pearson 6 years ago
parent
commit
65eca7929c
100 changed files with 796 additions and 796 deletions
  1. 10
    10
      kamera/kcontrol/kamera.cpp
  2. 6
    6
      kamera/kcontrol/kamera.h
  3. 1
    1
      kamera/kcontrol/kameradevice.cpp
  4. 2
    2
      kamera/kcontrol/kameradevice.h
  5. 8
    8
      kcoloredit/kcoloredit.cpp
  6. 16
    16
      kcoloredit/kcoloredit.h
  7. 1
    1
      kcoloredit/kcoloreditdoc.h
  8. 1
    1
      kcoloredit/kcoloreditview.h
  9. 1
    1
      kcoloredit/kzcolorselector.cpp
  10. 1
    1
      kcoloredit/kzcolorselector.h
  11. 1
    1
      kdvi/dviRenderer.h
  12. 5
    5
      kdvi/kdvi_multipage.cpp
  13. 4
    4
      kdvi/kdvi_multipage.h
  14. 1
    1
      kfax/ChangeLog
  15. 6
    6
      kfax/kfax.cpp
  16. 8
    8
      kfax/kfax.h
  17. 25
    25
      kghostview/kgv_view.cpp
  18. 25
    25
      kghostview/kgv_view.h
  19. 7
    7
      kghostview/kgvshell.cpp
  20. 8
    8
      kghostview/kgvshell.h
  21. 1
    1
      kiconedit/kiconconfig.h
  22. 30
    30
      kiconedit/kiconedit.cpp
  23. 4
    4
      kiconedit/kiconedit.h
  24. 1
    1
      kiconedit/kiconeditslots.cpp
  25. 1
    1
      kiconedit/palettetoolbar.cpp
  26. 1
    1
      kiconedit/palettetoolbar.h
  27. 7
    7
      kolourpaint/kpcommandhistory.cpp
  28. 4
    4
      kolourpaint/kpcommandhistory.h
  29. 9
    9
      kolourpaint/kpmainwindow.cpp
  30. 24
    24
      kolourpaint/kpmainwindow.h
  31. 8
    8
      kolourpaint/kpmainwindow_edit.cpp
  32. 13
    13
      kolourpaint/kpmainwindow_file.cpp
  33. 3
    3
      kolourpaint/kpmainwindow_help.cpp
  34. 12
    12
      kolourpaint/kpmainwindow_image.cpp
  35. 4
    4
      kolourpaint/kpmainwindow_p.h
  36. 3
    3
      kolourpaint/kpmainwindow_settings.cpp
  37. 10
    10
      kolourpaint/kpmainwindow_text.cpp
  38. 1
    1
      kolourpaint/kpmainwindow_tools.cpp
  39. 9
    9
      kolourpaint/kpmainwindow_view.cpp
  40. 6
    6
      kolourpaint/kpsinglekeytriggersaction.cpp
  41. 10
    10
      kolourpaint/kpsinglekeytriggersaction.h
  42. 9
    9
      kolourpaint/kptool.cpp
  43. 6
    6
      kolourpaint/kptool.h
  44. 11
    11
      kolourpaint/tools/kptoolaction.cpp
  45. 7
    7
      kolourpaint/tools/kptoolaction.h
  46. 1
    1
      kolourpaint/tools/kptoolairspray.h
  47. 1
    1
      kolourpaint/tools/kptoolpen.h
  48. 3
    3
      kolourpaint/widgets/kpcolortoolbar.cpp
  49. 1
    1
      kolourpaint/widgets/kpcolortoolbar.h
  50. 3
    3
      kolourpaint/widgets/kptooltoolbar.cpp
  51. 1
    1
      kolourpaint/widgets/kptooltoolbar.h
  52. 2
    2
      kooka/dwmenuaction.cpp
  53. 3
    3
      kooka/dwmenuaction.h
  54. 27
    27
      kooka/kooka.cpp
  55. 6
    6
      kooka/kooka.h
  56. 12
    12
      kooka/kookaview.cpp
  57. 6
    6
      kooka/kookaview.h
  58. 2
    2
      kooka/scanpackager.cpp
  59. 1
    1
      kpdf/core/document.cpp
  60. 2
    2
      kpdf/core/document.h
  61. 2
    2
      kpdf/core/generator.h
  62. 1
    1
      kpdf/core/generator_kimgio/generator_kimgio.cpp
  63. 1
    1
      kpdf/core/generator_kimgio/generator_kimgio.h
  64. 4
    4
      kpdf/core/generator_pdf/generator_pdf.cpp
  65. 3
    3
      kpdf/core/generator_pdf/generator_pdf.h
  66. 12
    12
      kpdf/part.cpp
  67. 19
    19
      kpdf/part.h
  68. 3
    3
      kpdf/shell/shell.cpp
  69. 5
    5
      kpdf/shell/shell.h
  70. 1
    1
      kpdf/ui/minibar.cpp
  71. 29
    29
      kpdf/ui/pageview.cpp
  72. 2
    2
      kpdf/ui/pageview.h
  73. 3
    3
      kpdf/ui/presentationwidget.cpp
  74. 6
    6
      kpdf/ui/presentationwidget.h
  75. 1
    1
      kpdf/ui/propertiesdialog.cpp
  76. 2
    2
      kpdf/ui/searchwidget.cpp
  77. 3
    3
      kpdf/ui/searchwidget.h
  78. 1
    1
      kpdf/ui/thumbnaillist.cpp
  79. 2
    2
      kpdf/ui/thumbnaillist.h
  80. 7
    7
      kpdf/ui/toc.cpp
  81. 2
    2
      kpdf/ui/toc.h
  82. 18
    18
      kpovmodeler/pmactions.cpp
  83. 3
    3
      kpovmodeler/pmactions.h
  84. 6
    6
      kpovmodeler/pmdockwidget.cpp
  85. 5
    5
      kpovmodeler/pmdockwidget.h
  86. 1
    1
      kpovmodeler/pminsertpopup.cpp
  87. 1
    1
      kpovmodeler/pminsertpopup.h
  88. 1
    1
      kpovmodeler/pmlibraryobjectsearch.cpp
  89. 2
    2
      kpovmodeler/pmlibraryobjectsearch.h
  90. 1
    1
      kpovmodeler/pmobjectaction.h
  91. 88
    88
      kpovmodeler/pmpart.cpp
  92. 107
    107
      kpovmodeler/pmpart.h
  93. 16
    16
      kpovmodeler/pmshell.cpp
  94. 23
    23
      kpovmodeler/pmshell.h
  95. 1
    1
      kpovmodeler/pmviewlayoutmanager.cpp
  96. 1
    1
      kpovmodeler/pmviewlayoutmanager.h
  97. 7
    7
      kruler/klineal.cpp
  98. 3
    3
      kruler/klineal.h
  99. 1
    1
      kruler/main.cpp
  100. 0
    0
      ksnapshot/ksnapshot.cpp

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

@@ -51,8 +51,8 @@ KKameraConfig *KKameraConfig::m_instance = NULL;
51 51
 KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &)
52 52
 	: TDECModule(KKameraConfigFactory::instance(), parent, name)
53 53
 {
54
-	m_devicePopup = new KPopupMenu(this);
55
-	m_actions = new KActionCollection(this);
54
+	m_devicePopup = new TDEPopupMenu(this);
55
+	m_actions = new TDEActionCollection(this);
56 56
 	m_config = new KSimpleConfig(KProtocolInfo::config("camera"));
57 57
 	
58 58
 	m_context = gp_context_new();
@@ -100,7 +100,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
100 100
 	TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0);
101 101
 	topLayout->setAutoAdd(true);
102 102
 	
103
-	m_toolbar = new KToolBar(this, "ToolBar");
103
+	m_toolbar = new TDEToolBar(this, "ToolBar");
104 104
 	m_toolbar->setMovingEnabled(false);
105 105
 	
106 106
 	// create list of devices
@@ -116,26 +116,26 @@ void KKameraConfig::displayGPSuccessDialogue(void)
116 116
 	m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
117 117
 	
118 118
 	// create actions
119
-	KAction *act;
119
+	TDEAction *act;
120 120
 	
121
-	act = new KAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
121
+	act = new TDEAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
122 122
 	act->setWhatsThis(i18n("Click this button to add a new camera."));
123 123
 	act->plug(m_toolbar);
124 124
 	m_toolbar->insertLineSeparator();
125
-	act = new KAction(i18n("Test"), "camera_test", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
125
+	act = new TDEAction(i18n("Test"), "camera_test", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
126 126
 	act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
127 127
 	act->plug(m_toolbar);
128
-	act = new KAction(i18n("Remove"), "edittrash", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
128
+	act = new TDEAction(i18n("Remove"), "edittrash", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
129 129
 	act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
130 130
 	act->plug(m_toolbar);
131
-	act = new KAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
131
+	act = new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
132 132
 	act->setWhatsThis(i18n("Click this button to change the configuration of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
133 133
 	act->plug(m_toolbar);
134
-	act = new KAction(i18n("Information"), "hwinfo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
134
+	act = new TDEAction(i18n("Information"), "hwinfo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
135 135
 	act->setWhatsThis(i18n("Click this button to view a summary of the current status of the selected camera.<br><br>The availability of this feature and the contents of the Configuration dialog depend on the camera model."));
136 136
 	act->plug(m_toolbar);
137 137
 	m_toolbar->insertLineSeparator();
138
-	act = new KAction(i18n("Cancel"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
138
+	act = new TDEAction(i18n("Cancel"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
139 139
 	act->setWhatsThis(i18n("Click this button to cancel the current camera operation."));
140 140
 	act->setEnabled(false);
141 141
 	act->plug(m_toolbar);

+ 6
- 6
kamera/kcontrol/kamera.h View File

@@ -40,9 +40,9 @@ class KCamera;
40 40
 class KameraDeviceSelectDialog;
41 41
 class KSimpleConfig;
42 42
 class KIconView;
43
-class KActionCollection;
44
-class KToolBar;
45
-class KPopupMenu;
43
+class TDEActionCollection;
44
+class TDEToolBar;
45
+class TDEPopupMenu;
46 46
 
47 47
 class KKameraConfig : public TDECModule
48 48
 {
@@ -101,10 +101,10 @@ private:
101 101
 
102 102
 	// widgets for the cameras listview
103 103
 	KIconView *m_deviceSel;
104
-	KActionCollection *m_actions;
104
+	TDEActionCollection *m_actions;
105 105
 	TQPushButton *m_addCamera, *m_removeCamera, *m_testCamera, *m_configureCamera;
106
-	KToolBar *m_toolbar;
107
-	KPopupMenu *m_devicePopup;
106
+	TDEToolBar *m_toolbar;
107
+	TDEPopupMenu *m_devicePopup;
108 108
 
109 109
 	// true if libgphoto2 was initialised successfully in
110 110
 	// the constructor

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

@@ -288,7 +288,7 @@ KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *de
288 288
 	TQHBoxLayout *topLayout = new TQHBoxLayout(page, 0, KDialog::spacingHint());
289 289
 
290 290
 	// the models list
291
-	m_modelSel = new KListView(page);
291
+	m_modelSel = new TDEListView(page);
292 292
 	topLayout->addWidget( m_modelSel );
293 293
 	m_modelSel->addColumn(i18n("Supported Cameras"));
294 294
 	m_modelSel->setColumnWidthMode(0, TQListView::Maximum);

+ 2
- 2
kamera/kcontrol/kameradevice.h View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 class TDEConfig;
31 31
 class TQString;
32
-class KListView;
32
+class TDEListView;
33 33
 class TQWidgetStack;
34 34
 class TQVButtonGroup;
35 35
 class TQVGroupBox;
@@ -105,7 +105,7 @@ protected:
105 105
 	void setPortType(int type);
106 106
 
107 107
 	// port settings widgets
108
-	KListView *m_modelSel;
108
+	TDEListView *m_modelSel;
109 109
 	TQLineEdit *m_nameEdit;
110 110
 	TQWidgetStack *m_settingsStack;
111 111
 	TQVButtonGroup *m_portSelectGroup;

+ 8
- 8
kcoloredit/kcoloredit.cpp View File

@@ -40,7 +40,7 @@
40 40
 #include <kstatusbar.h>
41 41
 
42 42
 
43
-KColorEditApp::KColorEditApp() : KMainWindow(0) {
43
+KColorEditApp::KColorEditApp() : TDEMainWindow(0) {
44 44
   config=kapp->config();
45 45
 
46 46
   ///////////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ void KColorEditApp::initActions()
74 74
   m_actRecent = KStdAction::openRecent( TQT_TQOBJECT(this),
75 75
           TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
76 76
 
77
-  ( void ) new KAction( i18n("New &Window"), kapp->miniIcon(), KShortcut(),
77
+  ( void ) new TDEAction( i18n("New &Window"), kapp->miniIcon(), TDEShortcut(),
78 78
           TQT_TQOBJECT(this), TQT_SLOT( slotFileNewWindow() ), actionCollection(),
79 79
           "file_new_window" );
80 80
 
@@ -89,14 +89,14 @@ void KColorEditApp::initActions()
89 89
   m_actPaste->setEnabled( false );
90 90
 
91 91
   // Color Menu
92
-  m_actNames = new KToggleAction( i18n("Show &Color Names"), KShortcut(), TQT_TQOBJECT(this),
92
+  m_actNames = new TDEToggleAction( i18n("Show &Color Names"), TDEShortcut(), TQT_TQOBJECT(this),
93 93
           TQT_SLOT( slotViewColorNames() ), actionCollection(),
94 94
           "color_view_names" );
95 95
   m_actNames->setCheckedState(i18n("Hide &Color Names"));
96
-  m_actPalette = new KAction( i18n("From &Palette"), KShortcut(), TQT_TQOBJECT(this),
96
+  m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), TQT_TQOBJECT(this),
97 97
           TQT_SLOT( slotColorFromPalette() ), actionCollection(),
98 98
           "color_from_palette" );
99
-  ( void ) new KAction( i18n("From &Screen"), KShortcut(), TQT_TQOBJECT(this),
99
+  ( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), TQT_TQOBJECT(this),
100 100
           TQT_SLOT( slotColorFromScreen() ), actionCollection(),
101 101
           "color_from_screen" );
102 102
 }
@@ -125,7 +125,7 @@ void KColorEditApp::initDocument()
125 125
 void KColorEditApp::initView()
126 126
 {
127 127
   ////////////////////////////////////////////////////////////////////
128
-  // create the main widget here that is managed by KMainWindow's view-region
128
+  // create the main widget here that is managed by TDEMainWindow's view-region
129 129
   // and connect the widget to your document to display document contents.
130 130
 
131 131
   view = new KColorEditView(this);
@@ -303,7 +303,7 @@ void KColorEditApp::slotQuit()
303 303
   saveOptions();
304 304
   // close the first window, the list makes the next one the first again.
305 305
   // This ensures that queryClose() is called on each window to ask for closing
306
-  KMainWindow* w;
306
+  TDEMainWindow* w;
307 307
   if(memberList)
308 308
   {
309 309
     for(w=memberList->first(); w!=0; w=memberList->next())
@@ -357,7 +357,7 @@ void KColorEditApp::mouseReleaseEvent(TQMouseEvent* event) {
357 357
 		color.setComponents(rgbColor.red(), rgbColor.green(), rgbColor.blue());
358 358
 		view->chooseColor(&color);
359 359
 	} else
360
-		KMainWindow::mouseReleaseEvent(event);
360
+		TDEMainWindow::mouseReleaseEvent(event);
361 361
 }
362 362
 
363 363
 #include "kcoloredit.moc"

+ 16
- 16
kcoloredit/kcoloredit.h View File

@@ -41,17 +41,17 @@ class KColorEditView;
41 41
   * window and reads the config file as well as providing a menubar, toolbar
42 42
   * and statusbar. An instance of KColorEditView creates your center view, which is connected
43 43
   * to the window's Doc object.
44
-  * KColorEditApp reimplements the methods that KMainWindow provides for main window handling and supports
45
-  * full session management as well as keyboard accelerator configuration by using KAccel.
46
-  * @see KMainWindow
44
+  * KColorEditApp reimplements the methods that TDEMainWindow provides for main window handling and supports
45
+  * full session management as well as keyboard accelerator configuration by using TDEAccel.
46
+  * @see TDEMainWindow
47 47
   * @see TDEApplication
48 48
   * @see TDEConfig
49
-  * @see KAccel
49
+  * @see TDEAccel
50 50
   *
51 51
   * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
52 52
   * @version KDevelop version 0.4 code generation
53 53
   */
54
-class KColorEditApp : public KMainWindow
54
+class KColorEditApp : public TDEMainWindow
55 55
 {
56 56
   Q_OBJECT
57 57
   
@@ -68,7 +68,7 @@ class KColorEditApp : public KMainWindow
68 68
     /** opens a file specified by commandline option
69 69
      */
70 70
     void openDocumentFile(const char *_cmdl=0);
71
-    /** returns a pointer to the current document connected to the KMainWindow instance and is used by
71
+    /** returns a pointer to the current document connected to the TDEMainWindow instance and is used by
72 72
      * the View class to access the document object's methods
73 73
      */
74 74
     KColorEditDoc *document() const;
@@ -92,21 +92,21 @@ class KColorEditApp : public KMainWindow
92 92
      * @see initView();
93 93
      */
94 94
     void initDocument();
95
-    /** creates the centerwidget of the KMainWindow instance and sets it as the view
95
+    /** creates the centerwidget of the TDEMainWindow instance and sets it as the view
96 96
      */
97 97
     void initView();
98
-    /** queryClose is called by KMainWindow on each closeEvent of a window. Against the
98
+    /** queryClose is called by TDEMainWindow on each closeEvent of a window. Against the
99 99
      * default implementation (only returns true), this calles saveModified() on the document object to ask if the document shall
100 100
      * be saved if Modified; on cancel the closeEvent is rejected.
101
-     * @see KMainWindow#queryClose
102
-     * @see KMainWindow#closeEvent
101
+     * @see TDEMainWindow#queryClose
102
+     * @see TDEMainWindow#closeEvent
103 103
      */
104 104
     virtual bool queryClose();
105
-    /** queryExit is called by KMainWindow when the last window of the application is going to be closed during the closeEvent().
105
+    /** queryExit is called by TDEMainWindow when the last window of the application is going to be closed during the closeEvent().
106 106
      * Against the default implementation that just returns true, this calls saveOptions() to save the settings of the last window's
107 107
      * properties.
108
-     * @see KMainWindow#queryExit
109
-     * @see KMainWindow#closeEvent
108
+     * @see TDEMainWindow#queryExit
109
+     * @see TDEMainWindow#closeEvent
110 110
      */
111 111
     virtual bool queryExit();
112 112
 
@@ -168,9 +168,9 @@ class KColorEditApp : public KMainWindow
168 168
     /** the configuration object of the application */
169 169
     TDEConfig *config;
170 170
 
171
-    KAction *m_actSave, *m_actCut, *m_actCopy, *m_actPaste, *m_actPalette;
172
-    KToggleAction *m_actNames;
173
-    KRecentFilesAction *m_actRecent;
171
+    TDEAction *m_actSave, *m_actCut, *m_actCopy, *m_actPaste, *m_actPalette;
172
+    TDEToggleAction *m_actNames;
173
+    TDERecentFilesAction *m_actRecent;
174 174
 
175 175
     /** view is the main widget which represents your working area. The View
176 176
      * class should handle all events of the view widget.  It is kept empty so

+ 1
- 1
kcoloredit/kcoloreditdoc.h View File

@@ -37,7 +37,7 @@ class KColorEditView;
37 37
 /**	KColorEditDoc provides a document object for a document-view model.
38 38
   *
39 39
   * The KColorEditDoc class provides a document object that can be used in conjunction with the classes KColorEditApp and KColorEditView
40
-  * to create a document-view model for standard TDE applications based on TDEApplication and KMainWindow. Thereby, the document object
40
+  * to create a document-view model for standard TDE applications based on TDEApplication and TDEMainWindow. Thereby, the document object
41 41
   * is created by the KColorEditApp instance and contains the document structure with the according methods for manipulation of the document
42 42
   * data by KColorEditView objects. Also, KColorEditDoc contains the methods for serialization of the document data from and to files.
43 43
   *

+ 1
- 1
kcoloredit/kcoloreditview.h View File

@@ -34,7 +34,7 @@
34 34
 class KColorEditDoc;
35 35
 
36 36
 /** The KColorEditView class provides the view widget for the KColorEditApp instance.	
37
- * The View instance inherits TQWidget as a base class and represents the view object of a KMainWindow. As KColorEditView is part of the
37
+ * The View instance inherits TQWidget as a base class and represents the view object of a TDEMainWindow. As KColorEditView is part of the
38 38
  * docuement-view model, it needs a reference to the document object connected with it by the KColorEditApp class to manipulate and display
39 39
  * the document structure provided by the KColorEditDoc class.
40 40
  * 	

+ 1
- 1
kcoloredit/kzcolorselector.cpp View File

@@ -24,7 +24,7 @@
24 24
 #include "kzcolorselector.h"
25 25
 
26 26
 KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *parent, const char *name) :
27
-	KSelector(o, parent, name) {
27
+	TDESelector(o, parent, name) {
28 28
 	baseColorH = -1;
29 29
 	baseColorS = 0;
30 30
 	baseColorV = 0;

+ 1
- 1
kcoloredit/kzcolorselector.h View File

@@ -27,7 +27,7 @@
27 27
 /** A widget for selecting a color component
28 28
  * @author Artur Rataj
29 29
  */
30
-class KZColorSelector : public KSelector {
30
+class KZColorSelector : public TDESelector {
31 31
    Q_OBJECT
32 32
   
33 33
 	

+ 1
- 1
kdvi/dviRenderer.h View File

@@ -27,7 +27,7 @@ class dviRenderer;
27 27
 class fontProgressDialog;
28 28
 class ghostscript_interface;
29 29
 class infoDialog;
30
-class KAction;
30
+class TDEAction;
31 31
 class KDVIMultiPage;
32 32
 class KPrinter;
33 33
 class TDEProcess;

+ 5
- 5
kdvi/kdvi_multipage.cpp View File

@@ -67,11 +67,11 @@ KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQO
67 67
   DVIRenderer.setName("DVI renderer");
68 68
   setRenderer(&DVIRenderer);
69 69
 
70
-  docInfoAction    = new KAction(i18n("Document &Info"), "info", 0, &DVIRenderer, TQT_SLOT(showInfo()), actionCollection(), "info_dvi");
71
-  embedPSAction    = new KAction(i18n("Embed External PostScript Files..."), 0, this, TQT_SLOT(slotEmbedPostScript()), actionCollection(), "embed_postscript");
72
-  new KAction(i18n("Enable All Warnings && Messages"), 0, this, TQT_SLOT(doEnableWarnings()), actionCollection(), "enable_msgs");
73
-  exportPSAction   = new KAction(i18n("PostScript..."), 0, &DVIRenderer, TQT_SLOT(exportPS()), actionCollection(), "export_postscript");
74
-  exportPDFAction  = new KAction(i18n("PDF..."), 0, &DVIRenderer, TQT_SLOT(exportPDF()), actionCollection(), "export_pdf");
70
+  docInfoAction    = new TDEAction(i18n("Document &Info"), "info", 0, &DVIRenderer, TQT_SLOT(showInfo()), actionCollection(), "info_dvi");
71
+  embedPSAction    = new TDEAction(i18n("Embed External PostScript Files..."), 0, this, TQT_SLOT(slotEmbedPostScript()), actionCollection(), "embed_postscript");
72
+  new TDEAction(i18n("Enable All Warnings && Messages"), 0, this, TQT_SLOT(doEnableWarnings()), actionCollection(), "enable_msgs");
73
+  exportPSAction   = new TDEAction(i18n("PostScript..."), 0, &DVIRenderer, TQT_SLOT(exportPS()), actionCollection(), "export_postscript");
74
+  exportPDFAction  = new TDEAction(i18n("PDF..."), 0, &DVIRenderer, TQT_SLOT(exportPDF()), actionCollection(), "export_pdf");
75 75
 
76 76
   KStdAction::tipOfDay(this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday");
77 77
 

+ 4
- 4
kdvi/kdvi_multipage.h View File

@@ -87,10 +87,10 @@ private:
87 87
 
88 88
   /** Pointers to several actions which are disabled if no file is
89 89
       loaded. */
90
-  KAction      *docInfoAction;
91
-  KAction      *embedPSAction;
92
-  KAction      *exportPDFAction;
93
-  KAction      *exportPSAction;
90
+  TDEAction      *docInfoAction;
91
+  TDEAction      *embedPSAction;
92
+  TDEAction      *exportPDFAction;
93
+  TDEAction      *exportPSAction;
94 94
 };
95 95
 
96 96
 

+ 1
- 1
kfax/ChangeLog View File

@@ -19,7 +19,7 @@ Sun Oct  5 22:17:09 1997  Bernd Johannes Wuebben  <wuebben@petit.cornell.edu>
19 19
 
20 20
 Sun Aug  3 09:55:52 1997  Bernd Johannes Wuebben  <wuebben@petit.cornell.edu>
21 21
 
22
-	* Made kfax work with the new KToolBar etc.
22
+	* Made kfax work with the new TDEToolBar etc.
23 23
 
24 24
 Thu Jul 24 20:44:33 1997  Bernd Johannes Wuebben  <wuebben@petit.cornell.edu>
25 25
 

+ 6
- 6
kfax/kfax.cpp View File

@@ -189,7 +189,7 @@ bool MyApp::x11EventFilter( XEvent * ev)
189 189
 }
190 190
 
191 191
 TopLevel::TopLevel (TQWidget *, const char *name)
192
-    : KMainWindow (0, name)
192
+    : TDEMainWindow (0, name)
193 193
 {
194 194
   setMinimumSize (100, 100);
195 195
 
@@ -244,7 +244,7 @@ void TopLevel::setupMenuBar()
244 244
           actionCollection() );
245 245
   actPrint = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection() );
246 246
   KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
247
-  actAdd = new KAction( i18n( "A&dd..." ), "filenew", KShortcut(), TQT_TQOBJECT(this),
247
+  actAdd = new TDEAction( i18n( "A&dd..." ), "filenew", TDEShortcut(), TQT_TQOBJECT(this),
248 248
       TQT_SLOT( faxAdd() ), actionCollection(), "file_add_fax" );
249 249
 
250 250
   actRecent->setMaxItems( 5 );
@@ -256,11 +256,11 @@ void TopLevel::setupMenuBar()
256 256
   actZoomOut = KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( zoomout() ),
257 257
       actionCollection() );
258 258
 
259
-  actRotate = new KAction( i18n( "&Rotate Page" ), "rotate", KShortcut(), TQT_TQOBJECT(this),
259
+  actRotate = new TDEAction( i18n( "&Rotate Page" ), "rotate", TDEShortcut(), TQT_TQOBJECT(this),
260 260
       TQT_SLOT( rotatePage() ), actionCollection(), "view_rotate" );
261
-  actMirror = new KAction( i18n( "Mirror Page" ), KShortcut(), TQT_TQOBJECT(this),
261
+  actMirror = new TDEAction( i18n( "Mirror Page" ), TDEShortcut(), TQT_TQOBJECT(this),
262 262
       TQT_SLOT( mirrorPage() ), actionCollection(), "view_mirror" );
263
-  actFlip = new KAction( i18n( "&Flip Page" ), KShortcut(), TQT_TQOBJECT(this),
263
+  actFlip = new TDEAction( i18n( "&Flip Page" ), TDEShortcut(), TQT_TQOBJECT(this),
264 264
       TQT_SLOT( flipPage() ), actionCollection(), "view_flip" );
265 265
 
266 266
   // Go menu
@@ -560,7 +560,7 @@ void TopLevel::openadd(TQString filename)
560 560
 
561 561
 void TopLevel::resizeEvent(TQResizeEvent *e)
562 562
 {
563
-  KMainWindow::resizeEvent(e);
563
+  TDEMainWindow::resizeEvent(e);
564 564
 
565 565
   resizeView();
566 566
 }

+ 8
- 8
kfax/kfax.h View File

@@ -38,20 +38,20 @@
38 38
 class TQPopupMenu;
39 39
 class TDEConfig;
40 40
 class KStatusBar;
41
-class KAction;
42
-class KRecentFilesAction;
41
+class TDEAction;
42
+class TDERecentFilesAction;
43 43
 class KPrinter;
44 44
 class TQPainter;
45 45
 class TQScrollBar;
46 46
 
47
-typedef KToolBar::BarPosition BarPosition;
47
+typedef TDEToolBar::BarPosition BarPosition;
48 48
 
49 49
 class MyApp:public TDEApplication {
50 50
 public:
51 51
    virtual bool x11EventFilter( XEvent * );
52 52
 };
53 53
 
54
-class TopLevel : public KMainWindow
54
+class TopLevel : public TDEMainWindow
55 55
 {
56 56
     Q_OBJECT
57 57
   
@@ -105,10 +105,10 @@ private:
105 105
     KURL fileURL;
106 106
     KStatusBar *statusbar;
107 107
 
108
-    KRecentFilesAction *actRecent;
109
-    KAction *actAdd, *actSave, *actSaveAs, *actPrint;
110
-    KAction *actSize, *actZoomIn, *actZoomOut, *actRotate, *actMirror;
111
-    KAction *actFlip, *actNext, *actPrev, *actFirst, *actLast;
108
+    TDERecentFilesAction *actRecent;
109
+    TDEAction *actAdd, *actSave, *actSaveAs, *actPrint;
110
+    TDEAction *actSize, *actZoomIn, *actZoomOut, *actRotate, *actMirror;
111
+    TDEAction *actFlip, *actNext, *actPrev, *actFirst, *actLast;
112 112
 
113 113
     int open_mode;
114 114
 

+ 25
- 25
kghostview/kgv_view.cpp View File

@@ -187,34 +187,34 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
187 187
     //-- File Menu ----------------------------------------------------------
188 188
     KStdAction::saveAs( document(), TQT_SLOT( saveAs() ),
189 189
                         actionCollection() );
190
-    new KAction( i18n( "Document &Info" ), 0,
190
+    new TDEAction( i18n( "Document &Info" ), 0,
191 191
                  miniWidget(), TQT_SLOT( info() ),
192 192
                  actionCollection(), "info" );
193 193
 
194 194
     //-- Edit Menu -----------------------------------------------------
195
-    _popup = new KPopupMenu( _markList, "marklist_menu" );
195
+    _popup = new TDEPopupMenu( _markList, "marklist_menu" );
196 196
 
197
-    KAction *act = new KAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
197
+    TDEAction *act = new TDEAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
198 198
                  TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ),
199 199
                  actionCollection(), "mark_current" );
200 200
     act->plug( _popup );
201
-    act = new KAction( i18n( "Mark &All Pages" ), 0,
201
+    act = new TDEAction( i18n( "Mark &All Pages" ), 0,
202 202
                  TQT_TQOBJECT(_markList), TQT_SLOT( markAll() ),
203 203
                  actionCollection(), "mark_all" );
204 204
     act->plug( _popup );
205
-    act = new KAction( i18n( "Mark &Even Pages" ), 0,
205
+    act = new TDEAction( i18n( "Mark &Even Pages" ), 0,
206 206
                  TQT_TQOBJECT(_markList), TQT_SLOT( markEven() ),
207 207
                  actionCollection(), "mark_even" );
208 208
     act->plug( _popup );
209
-    act = new KAction( i18n( "Mark &Odd Pages" ), 0,
209
+    act = new TDEAction( i18n( "Mark &Odd Pages" ), 0,
210 210
                  TQT_TQOBJECT(_markList), TQT_SLOT( markOdd() ),
211 211
                  actionCollection(), "mark_odd" );
212 212
     act->plug( _popup );
213
-    act = new KAction( i18n( "&Toggle Page Marks" ), 0,
213
+    act = new TDEAction( i18n( "&Toggle Page Marks" ), 0,
214 214
                  TQT_TQOBJECT(_markList), TQT_SLOT( toggleMarks() ),
215 215
                  actionCollection(), "toggle" );
216 216
     act->plug( _popup );
217
-    act = new KAction( i18n("&Remove Page Marks"), 0,
217
+    act = new TDEAction( i18n("&Remove Page Marks"), 0,
218 218
                  TQT_TQOBJECT(_markList), TQT_SLOT( removeMarks() ),
219 219
                  actionCollection(), "remove" );
220 220
     act->plug( _popup );
@@ -222,12 +222,12 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
222 222
     // TODO -- disable entry if there aren't any page names
223 223
 
224 224
     //-- View Menu ----------------------------------------------------------
225
-    _selectOrientation = new KSelectAction( i18n( "&Orientation" ), 0, 0, 0,
225
+    _selectOrientation = new TDESelectAction( i18n( "&Orientation" ), 0, 0, 0,
226 226
                                     actionCollection(), "orientation_menu" );
227
-    _selectMedia       = new KSelectAction( i18n( "Paper &Size" ), 0, 0, 0,
227
+    _selectMedia       = new TDESelectAction( i18n( "Paper &Size" ), 0, 0, 0,
228 228
                                     actionCollection(), "media_menu" );
229 229
 
230
-    _flick = new KToggleAction( i18n( "No &Flicker" ), 0,
230
+    _flick = new TDEToggleAction( i18n( "No &Flicker" ), 0,
231 231
                                 this, TQT_SLOT( slotFlicker() ),
232 232
                                 actionCollection(), "no_flicker" );
233 233
     
@@ -245,7 +245,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
245 245
              this, TQT_SLOT( slotMedia( int ) ) );
246 246
 
247 247
     {
248
-	KShortcut zoomInShort = KStdAccel::zoomIn();
248
+	TDEShortcut zoomInShort = TDEStdAccel::zoomIn();
249 249
 	zoomInShort.append( KKey( CTRL+Key_Equal ) );
250 250
 	_zoomIn = KStdAction::zoomIn( this, TQT_SLOT( slotZoomIn() ),
251 251
 				    actionCollection(), "zoomIn" );
@@ -253,7 +253,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
253 253
     }
254 254
     _zoomOut = KStdAction::zoomOut( this,  TQT_SLOT( slotZoomOut() ),
255 255
                                     actionCollection(), "zoomOut" );
256
-    _zoomTo = new KSelectAction(  i18n( "Zoom" ), "viewmag", 0, actionCollection(), "zoomTo" );
256
+    _zoomTo = new TDESelectAction(  i18n( "Zoom" ), "viewmag", 0, actionCollection(), "zoomTo" );
257 257
     connect(  _zoomTo, TQT_SIGNAL(  activated(  const TQString & ) ), this, TQT_SLOT(  slotZoom( const TQString& ) ) );
258 258
     _zoomTo->setEditable(  true );
259 259
     _zoomTo->clear();
@@ -273,18 +273,18 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
273 273
     _zoomTo->setItems( zooms );
274 274
     _zoomTo->setCurrentItem( idx );
275 275
 
276
-    _fitWidth = new KAction( i18n( "&Fit to Page Width" ), 0, this,
276
+    _fitWidth = new TDEAction( i18n( "&Fit to Page Width" ), 0, this,
277 277
 	    TQT_SLOT( slotFitToPage() ), actionCollection(),
278 278
 	    "fit_to_page");
279
-    _fitScreen = new KAction( i18n( "&Fit to Screen" ), Key_S, this,
279
+    _fitScreen = new TDEAction( i18n( "&Fit to Screen" ), Key_S, this,
280 280
 	    TQT_SLOT( slotFitToScreen() ), actionCollection(),
281 281
 	    "fit_to_screen");
282 282
 
283
-    _prevPage  = new KAction( i18n( "Previous Page" ), CTRL+Key_PageUp, this, TQT_SLOT( slotPrevPage() ),
283
+    _prevPage  = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, this, TQT_SLOT( slotPrevPage() ),
284 284
                                     actionCollection(), "prevPage" );
285 285
     _prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
286 286
 
287
-    _nextPage  = new KAction( i18n( "Next Page" ), CTRL + Key_PageDown, this, TQT_SLOT( slotNextPage() ),
287
+    _nextPage  = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, this, TQT_SLOT( slotNextPage() ),
288 288
                                    actionCollection(), "nextPage" );
289 289
     _nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
290 290
 
@@ -296,15 +296,15 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
296 296
                                    actionCollection(), "goToEnd" );
297 297
     _lastPage->setWhatsThis( i18n( "Moves to the last page of the document" ) );
298 298
 
299
-    KShortcut readUpShort = KStdAccel::shortcut( KStdAccel::Prior );
299
+    TDEShortcut readUpShort = TDEStdAccel::shortcut( TDEStdAccel::Prior );
300 300
     readUpShort.append( KKey( SHIFT+Key_Space ) );
301
-    _readUp    = new KAction( i18n( "Read Up" ), "up",
301
+    _readUp    = new TDEAction( i18n( "Read Up" ), "up",
302 302
                               readUpShort, this, TQT_SLOT( slotReadUp() ),
303 303
                               actionCollection(), "readUp" );
304 304
 
305
-    KShortcut readDownShort = KStdAccel::shortcut( KStdAccel::Next );
305
+    TDEShortcut readDownShort = TDEStdAccel::shortcut( TDEStdAccel::Next );
306 306
     readDownShort.append( KKey( Key_Space ) );
307
-    _readDown  = new KAction( i18n( "Read Down" ), "down",
307
+    _readDown  = new TDEAction( i18n( "Read Down" ), "down",
308 308
                               readDownShort, this, TQT_SLOT( slotReadDown() ),
309 309
                               actionCollection(), "readDown" );
310 310
 
@@ -312,16 +312,16 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
312 312
                                       actionCollection(), "goToPage" );
313 313
 
314 314
     //-- Settings Menu ------------------------------------------------------
315
-    _showScrollBars = new KToggleAction( i18n( "Show &Scrollbars" ), 0,
315
+    _showScrollBars = new TDEToggleAction( i18n( "Show &Scrollbars" ), 0,
316 316
                                 actionCollection(), "show_scrollbars" );
317 317
     _showScrollBars->setCheckedState(i18n("Hide &Scrollbars"));
318
-    _watchFile	    = new KToggleAction( i18n( "&Watch File" ), 0,
318
+    _watchFile	    = new TDEToggleAction( i18n( "&Watch File" ), 0,
319 319
                                 this, TQT_SLOT( slotWatchFile() ),
320 320
                                 actionCollection(), "watch_file" );
321
-    _showPageList   = new KToggleAction( i18n( "Show &Page List" ), 0,
321
+    _showPageList   = new TDEToggleAction( i18n( "Show &Page List" ), 0,
322 322
                                 actionCollection(), "show_page_list" );
323 323
     _showPageList->setCheckedState(i18n("Hide &Page List"));
324
-    _showPageLabels = new KToggleAction( i18n("Show Page &Labels"), 0,
324
+    _showPageLabels = new TDEToggleAction( i18n("Show Page &Labels"), 0,
325 325
                                 actionCollection(), "show_page_labels" );
326 326
     _showPageLabels->setCheckedState(i18n("Hide Page &Labels"));
327 327
     KStdAction::preferences( this, TQT_SLOT( slotConfigure() ), actionCollection() );

+ 25
- 25
kghostview/kgv_view.h View File

@@ -32,13 +32,13 @@ class TQFrame;
32 32
 class TQWidget;
33 33
 
34 34
 class TDEAboutData;
35
-class KAction;
36
-class KActionCollection;
35
+class TDEAction;
36
+class TDEActionCollection;
37 37
 class KDirWatch;
38 38
 class TDEInstance;
39
-class KPopupMenu;
40
-class KSelectAction;
41
-class KToggleAction;
39
+class TDEPopupMenu;
40
+class TDESelectAction;
41
+class TDEToggleAction;
42 42
 
43 43
 class KGVBrowserExtension;
44 44
 class KGVConfigDialog;
@@ -187,26 +187,26 @@ private:
187 187
 
188 188
     TQTimer*		_fitTimer;
189 189
 
190
-    KSelectAction* _selectOrientation;
191
-    KSelectAction* _selectMedia;
192
-    KAction*       _zoomIn;
193
-    KAction*       _zoomOut;
194
-    KSelectAction* _zoomTo;
195
-    KAction *      _fitWidth;
196
-    KAction *      _fitScreen;
197
-    KAction*       _prevPage;
198
-    KAction*       _nextPage;
199
-    KAction*       _firstPage;
200
-    KAction*       _lastPage;
201
-    KAction*       _readUp;
202
-    KAction*       _readDown;
203
-    KAction*       _gotoPage;
204
-    KToggleAction* _showScrollBars;
205
-    KToggleAction* _watchFile;
206
-    KToggleAction* _flick;
207
-    KToggleAction* _showPageList;
208
-    KToggleAction* _showPageLabels;
209
-    KPopupMenu*    _popup;
190
+    TDESelectAction* _selectOrientation;
191
+    TDESelectAction* _selectMedia;
192
+    TDEAction*       _zoomIn;
193
+    TDEAction*       _zoomOut;
194
+    TDESelectAction* _zoomTo;
195
+    TDEAction *      _fitWidth;
196
+    TDEAction *      _fitScreen;
197
+    TDEAction*       _prevPage;
198
+    TDEAction*       _nextPage;
199
+    TDEAction*       _firstPage;
200
+    TDEAction*       _lastPage;
201
+    TDEAction*       _readUp;
202
+    TDEAction*       _readDown;
203
+    TDEAction*       _gotoPage;
204
+    TDEToggleAction* _showScrollBars;
205
+    TDEToggleAction* _watchFile;
206
+    TDEToggleAction* _flick;
207
+    TDEToggleAction* _showPageList;
208
+    TDEToggleAction* _showPageLabels;
209
+    TDEPopupMenu*    _popup;
210 210
 
211 211
     TQFile             _tmpFile;
212 212
     TDEIO::TransferJob* _job;

+ 7
- 7
kghostview/kgvshell.cpp View File

@@ -75,11 +75,11 @@ KGVShell::KGVShell() :
75 75
 	    KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() );
76 76
 
77 77
     /*---- View -----------------------------------------------------------*/
78
-            new KAction( i18n(  "&Reload" ), "reload",
79
-		    KStdAccel::shortcut( KStdAccel::Reload ),
78
+            new TDEAction( i18n(  "&Reload" ), "reload",
79
+		    TDEStdAccel::shortcut( TDEStdAccel::Reload ),
80 80
 		    m_gvpart, TQT_SLOT(  reloadFile() ),
81 81
 		    actionCollection(), "reload" );
82
-	    new KAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this),
82
+	    new TDEAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this),
83 83
 			 TQT_SLOT( slotMaximize() ), actionCollection(),
84 84
 			 "maximize");
85 85
     _showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection() );
@@ -93,14 +93,14 @@ KGVShell::KGVShell() :
93 93
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
94 94
     m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
95 95
 #else
96
-    m_fullScreenAction = new KToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
96
+    m_fullScreenAction = new TDEToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
97 97
 #endif
98 98
     KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
99 99
     KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
100 100
 actionCollection());
101 101
 
102
-    //_popup = new KPopupMenu( i18n( "Full Screen Options" ), this, "rmb popup" );
103
-    _popup = new KPopupMenu( this, "rmb popup" );
102
+    //_popup = new TDEPopupMenu( i18n( "Full Screen Options" ), this, "rmb popup" );
103
+    _popup = new TDEPopupMenu( this, "rmb popup" );
104 104
     _popup->insertTitle( i18n( "Full Screen Options" ) );
105 105
     m_fullScreenAction->plug( _popup );
106 106
     _showMenuBarAction->plug( _popup );
@@ -339,7 +339,7 @@ void KGVShell::slotUpdateFullScreen()
339 339
 	m_gvpart->updateFullScreen( false );
340 340
 	menuBar()->show();
341 341
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
342
-	KToggleAction *statusbarAction = dynamic_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar)));
342
+	TDEToggleAction *statusbarAction = dynamic_cast<TDEToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar)));
343 343
 	assert( statusbarAction );
344 344
 	if (statusbarAction->isChecked()) statusBar()->show();
345 345
 #endif

+ 8
- 8
kghostview/kgvshell.h View File

@@ -25,13 +25,13 @@
25 25
 
26 26
 class TQTimer;
27 27
 
28
-class KRecentFilesAction;
28
+class TDERecentFilesAction;
29 29
 class ScrollBox;
30 30
 class KGVPart;
31
-class KAction;
31
+class TDEAction;
32 32
 class TDEConfig;
33 33
 class KTempFile;
34
-class KPopupMenu;
34
+class TDEPopupMenu;
35 35
 class DisplayOptions;
36 36
 class FullScreenFilter;
37 37
 
@@ -79,12 +79,12 @@ private:
79 79
     KGVPart* m_gvpart;
80 80
     TQString cwd;
81 81
 
82
-    KAction* openact;
83
-    KToggleAction* _showMenuBarAction;
84
-    KToggleAction* m_fullScreenAction;
82
+    TDEAction* openact;
83
+    TDEToggleAction* _showMenuBarAction;
84
+    TDEToggleAction* m_fullScreenAction;
85 85
     FullScreenFilter* m_fsFilter;
86
-    KPopupMenu* _popup;
87
-    KRecentFilesAction* recent;
86
+    TDEPopupMenu* _popup;
87
+    TDERecentFilesAction* recent;
88 88
     KTempFile* _tmpFile; // Used for storing data received from stdin
89 89
 };
90 90
 

+ 1
- 1
kiconedit/kiconconfig.h View File

@@ -32,7 +32,7 @@
32 32
 #include "config.h"
33 33
 #endif
34 34
 
35
-class KAccel;
35
+class TDEAccel;
36 36
 class KKeyChooser;
37 37
 class KColorButton;
38 38
 class KURLRequester;

+ 30
- 30
kiconedit/kiconedit.cpp View File

@@ -34,7 +34,7 @@
34 34
 WindowList KIconEdit::windowList;
35 35
 
36 36
 KIconEdit::KIconEdit(const TQImage image, const char *name)
37
- : KMainWindow(0, name)
37
+ : TDEMainWindow(0, name)
38 38
 {
39 39
     init();
40 40
     img = image;
@@ -44,7 +44,7 @@ KIconEdit::KIconEdit(const TQImage image, const char *name)
44 44
 }
45 45
 
46 46
 KIconEdit::KIconEdit(KURL url, const char *name)
47
- : KMainWindow(0, name)
47
+ : TDEMainWindow(0, name)
48 48
 {
49 49
     init();
50 50
     icon->open(&img, url);
@@ -234,12 +234,12 @@ void KIconEdit::setupActions()
234 234
 {
235 235
   kdDebug(4640) << "setupActions" << endl;
236 236
 
237
-  KAction *action;
238
-  KRadioAction *toolAction;
239
-  KShortcut cut;
237
+  TDEAction *action;
238
+  TDERadioAction *toolAction;
239
+  TDEShortcut cut;
240 240
 
241 241
   // File Menu
242
-  action = new KAction(i18n("New &Window"), "window_new", cut,
242
+  action = new TDEAction(i18n("New &Window"), "window_new", cut,
243 243
       TQT_TQOBJECT(this),  TQT_SLOT(slotNewWin()), actionCollection(), "file_new_window");
244 244
   action->setWhatsThis(i18n("New window\n\nOpens a new icon editor window."));
245 245
 
@@ -284,18 +284,18 @@ void KIconEdit::setupActions()
284 284
        "(Tip: Select \"Paste transparent pixels\" in the configuration dialog"
285 285
        " if you also want to paste transparency.)"));
286 286
 
287
-  m_actPasteNew = new KAction( i18n( "Paste as &New" ), cut, TQT_TQOBJECT(grid),
287
+  m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, TQT_TQOBJECT(grid),
288 288
       TQT_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" );
289 289
 
290 290
   KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actionCollection());
291 291
   KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection());
292 292
 
293
-  action = new KAction(i18n("Resi&ze..."), "transform", cut,
293
+  action = new TDEAction(i18n("Resi&ze..."), "transform", cut,
294 294
       TQT_TQOBJECT(grid),  TQT_SLOT(editResize()), actionCollection(), "edit_resize");
295 295
   action->setWhatsThis(i18n("Resize\n\nSmoothly resizes the icon while"
296 296
       " trying to preserve the contents"));
297 297
 
298
-  action = new KAction(i18n("&GrayScale"), "grayscale", cut,
298
+  action = new TDEAction(i18n("&GrayScale"), "grayscale", cut,
299 299
       TQT_TQOBJECT(grid),  TQT_SLOT(grayScale()), actionCollection(), "edit_grayscale");
300 300
   action->setWhatsThis(i18n("Gray scale\n\nGray scale the current icon.\n"
301 301
       "(Warning: The result is likely to contain colors not in the icon"
@@ -310,23 +310,23 @@ void KIconEdit::setupActions()
310 310
       actionCollection());
311 311
   m_actZoomOut->setWhatsThis(i18n("Zoom out\n\nZoom out by one."));
312 312
 
313
-  KActionMenu *actMenu = new KActionMenu( i18n( "&Zoom" ), "viewmag",
313
+  TDEActionMenu *actMenu = new TDEActionMenu( i18n( "&Zoom" ), "viewmag",
314 314
       actionCollection(), "view_zoom" );
315 315
 
316 316
   // xgettext:no-c-format
317
-  action = new KAction( i18n( "100%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom1() ),
317
+  action = new TDEAction( i18n( "100%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom1() ),
318 318
       actionCollection(), "view_zoom_1" );
319 319
   actMenu->insert( action );
320 320
   // xgettext:no-c-format
321
-  action = new KAction( i18n( "200%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom2() ),
321
+  action = new TDEAction( i18n( "200%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom2() ),
322 322
       actionCollection(), "view_zoom_2" );
323 323
   actMenu->insert( action );
324 324
   // xgettext:no-c-format
325
-  action = new KAction( i18n( "500%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom5() ),
325
+  action = new TDEAction( i18n( "500%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom5() ),
326 326
       actionCollection(), "view_zoom_5" );
327 327
   actMenu->insert( action );
328 328
   // xgettext:no-c-format
329
-  action = new KAction( i18n( "1000%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom10() ),
329
+  action = new TDEAction( i18n( "1000%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom10() ),
330 330
       actionCollection(), "view_zoom_10" );
331 331
   actMenu->insert( action );
332 332
 
@@ -338,9 +338,9 @@ void KIconEdit::setupActions()
338 338
 
339 339
   createStandardStatusBarAction();
340 340
 
341
-  KToggleAction *toggle;
341
+  TDEToggleAction *toggle;
342 342
 
343
-  toggle = new KToggleAction( i18n( "Show &Grid" ), "grid",
343
+  toggle = new TDEToggleAction( i18n( "Show &Grid" ), "grid",
344 344
       cut, TQT_TQOBJECT(this), TQT_SLOT( slotShowGrid() ), actionCollection(),
345 345
       "options_show_grid" );
346 346
   toggle->setCheckedState(i18n("Hide &Grid"));
@@ -349,14 +349,14 @@ void KIconEdit::setupActions()
349 349
   toggle->setChecked( KIconEditProperties::self()->showGrid() );
350 350
 
351 351
   // Tools Menu
352
-  toolAction = new KRadioAction(i18n("Color Picker"), "colorpicker",
352
+  toolAction = new TDERadioAction(i18n("Color Picker"), "colorpicker",
353 353
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolPointer()), actionCollection(),
354 354
       "tool_find_pixel");
355 355
   toolAction->setExclusiveGroup("toolActions");
356 356
   toolAction->setWhatsThis(i18n("Color Picker\n\nThe color of the pixel clicked"
357 357
       " on will be the current draw color"));
358 358
 
359
-  toolAction = new KRadioAction(i18n("Freehand"), "paintbrush",
359
+  toolAction = new TDERadioAction(i18n("Freehand"), "paintbrush",
360 360
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFreehand()), actionCollection(),
361 361
       "tool_freehand");
362 362
   toolAction->setExclusiveGroup("toolActions");
@@ -365,64 +365,64 @@ void KIconEdit::setupActions()
365 365
   toolAction->setChecked( true );
366 366
   grid->setTool(KIconEditGrid::Freehand);
367 367
 
368
-  toolAction = new KRadioAction(i18n("Rectangle"), "rectangle",
368
+  toolAction = new TDERadioAction(i18n("Rectangle"), "rectangle",
369 369
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolRectangle()), actionCollection(),
370 370
       "tool_rectangle");
371 371
   toolAction->setExclusiveGroup("toolActions");
372 372
   toolAction->setWhatsThis(i18n("Rectangle\n\nDraw a rectangle"));
373 373
 
374
-  toolAction = new KRadioAction(i18n("Filled Rectangle"), "filledrectangle",
374
+  toolAction = new TDERadioAction(i18n("Filled Rectangle"), "filledrectangle",
375 375
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledRectangle()), actionCollection(),
376 376
       "tool_filled_rectangle");
377 377
   toolAction->setExclusiveGroup("toolActions");
378 378
   toolAction->setWhatsThis(i18n("Filled rectangle\n\nDraw a filled rectangle"));
379 379
 
380
-  toolAction = new KRadioAction(i18n("Circle"), "circle",
380
+  toolAction = new TDERadioAction(i18n("Circle"), "circle",
381 381
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolCircle()), actionCollection(),
382 382
       "tool_circle");
383 383
   toolAction->setExclusiveGroup("toolActions");
384 384
   toolAction->setWhatsThis(i18n("Circle\n\nDraw a circle"));
385 385
 
386
-  toolAction = new KRadioAction(i18n("Filled Circle"), "filledcircle",
386
+  toolAction = new TDERadioAction(i18n("Filled Circle"), "filledcircle",
387 387
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledCircle()), actionCollection(),
388 388
       "tool_filled_circle");
389 389
   toolAction->setExclusiveGroup("toolActions");
390 390
   toolAction->setWhatsThis(i18n("Filled circle\n\nDraw a filled circle"));
391 391
 
392
-  toolAction = new KRadioAction(i18n("Ellipse"), "ellipse",
392
+  toolAction = new TDERadioAction(i18n("Ellipse"), "ellipse",
393 393
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolEllipse()), actionCollection(),
394 394
       "tool_ellipse");
395 395
   toolAction->setExclusiveGroup("toolActions");
396 396
   toolAction->setWhatsThis(i18n("Ellipse\n\nDraw an ellipse"));
397 397
 
398
-  toolAction = new KRadioAction(i18n("Filled Ellipse"), "filledellipse",
398
+  toolAction = new TDERadioAction(i18n("Filled Ellipse"), "filledellipse",
399 399
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledEllipse()), actionCollection(),
400 400
       "tool_filled_ellipse");
401 401
   toolAction->setExclusiveGroup("toolActions");
402 402
   toolAction->setWhatsThis(i18n("Filled ellipse\n\nDraw a filled ellipse"));
403 403
 
404
-  toolAction = new KRadioAction(i18n("Spray"), "airbrush",
404
+  toolAction = new TDERadioAction(i18n("Spray"), "airbrush",
405 405
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolSpray()), actionCollection(),
406 406
       "tool_spray");
407 407
   toolAction->setExclusiveGroup("toolActions");
408 408
   toolAction->setWhatsThis(i18n("Spray\n\nDraw scattered pixels in the"
409 409
       " current color"));
410 410
 
411
-  toolAction = new KRadioAction(i18n("Flood Fill"), "fill",
411
+  toolAction = new TDERadioAction(i18n("Flood Fill"), "fill",
412 412
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFlood()), actionCollection(),
413 413
       "tool_flood_fill");
414 414
   toolAction->setExclusiveGroup("toolActions");
415 415
   toolAction->setWhatsThis(i18n("Flood fill\n\nFill adjoining pixels with"
416 416
       " the same color with the current color"));
417 417
 
418
-  toolAction = new KRadioAction(i18n("Line"), "line",
418
+  toolAction = new TDERadioAction(i18n("Line"), "line",
419 419
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolLine()), actionCollection(),
420 420
       "tool_line");
421 421
   toolAction->setExclusiveGroup("toolActions");
422 422
   toolAction->setWhatsThis(i18n("Line\n\nDraw a straight line vertically,"
423 423
       " horizontally or at 45 deg. angles"));
424 424
 
425
-  toolAction = new KRadioAction(i18n("Eraser (Transparent)"), "eraser",
425
+  toolAction = new TDERadioAction(i18n("Eraser (Transparent)"), "eraser",
426 426
       cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolEraser()), actionCollection(),
427 427
       "tool_eraser");
428 428
   toolAction->setExclusiveGroup("toolActions");
@@ -431,14 +431,14 @@ void KIconEdit::setupActions()
431 431
       " different tool, first click on \"Erase\" then on the tool you want"
432 432
       " to use)"));
433 433
 
434
-  toolAction = new KRadioAction(i18n("Rectangular Selection"),
434
+  toolAction = new TDERadioAction(i18n("Rectangular Selection"),
435 435
       "selectrect", cut, TQT_TQOBJECT(this),  TQT_SLOT(slotToolSelectRect()),
436 436
       actionCollection(), "edit_select_rectangle");
437 437
   toolAction->setExclusiveGroup( "toolActions" );
438 438
   toolAction->setWhatsThis(i18n("Select\n\nSelect a rectangular section"
439 439
       " of the icon using the mouse."));
440 440
 
441
-  toolAction = new KRadioAction(i18n("Circular Selection"),
441
+  toolAction = new TDERadioAction(i18n("Circular Selection"),
442 442
       "selectcircle", cut, TQT_TQOBJECT(this),  TQT_SLOT(slotToolSelectCircle()),
443 443
       actionCollection(), "edit_select_circle");
444 444
   toolAction->setExclusiveGroup( "toolActions" );

+ 4
- 4
kiconedit/kiconedit.h View File

@@ -56,7 +56,7 @@ class PaletteToolBar;
56 56
 * @author Thomas Tanghus <tanghus@kde.org>
57 57
 * @version 0.4
58 58
 */
59
-class KIconEdit : public KMainWindow
59
+class KIconEdit : public TDEMainWindow
60 60
 {
61 61
     Q_OBJECT
62 62
   
@@ -150,9 +150,9 @@ protected:
150 150
   TQImage img;
151 151
   TQString m_name;
152 152
 
153
-  KAction *m_actCopy, *m_actPaste, *m_actCut, *m_actPasteNew;
154
-  KAction *m_actZoomIn, *m_actZoomOut;
155
-  KRecentFilesAction *m_actRecent;
153
+  TDEAction *m_actCopy, *m_actPaste, *m_actCut, *m_actPasteNew;
154
+  TDEAction *m_actZoomIn, *m_actZoomOut;
155
+  TDERecentFilesAction *m_actRecent;
156 156
 };
157 157
 
158 158
 #endif //__KICONEDIT_H__

+ 1
- 1
kiconedit/kiconeditslots.cpp View File

@@ -256,7 +256,7 @@ void KIconEdit::slotCut()
256 256
 
257 257
 void KIconEdit::slotPaste()
258 258
 {
259
-    static_cast<KRadioAction*>(actionCollection()
259
+    static_cast<TDERadioAction*>(actionCollection()
260 260
         ->action("tool_find_pixel"))->setChecked(true);
261 261
     grid->setTool(KIconEditGrid::Find);
262 262
     grid->editPaste();

+ 1
- 1
kiconedit/palettetoolbar.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include "palettetoolbar.h"
32 32
 
33 33
 PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
34
-    : KToolBar( parent, name )
34
+    : TDEToolBar( parent, name )
35 35
 {
36 36
   TQWidget *base = new TQWidget( this );
37 37
 

+ 1
- 1
kiconedit/palettetoolbar.h View File

@@ -29,7 +29,7 @@ class TQLabel;
29 29
 class KSysColors;
30 30
 class KCustomColors;
31 31
 
32
-class PaletteToolBar : public KToolBar
32
+class PaletteToolBar : public TDEToolBar
33 33
 {
34 34
   Q_OBJECT
35 35
   

+ 7
- 7
kolourpaint/kpcommandhistory.cpp View File

@@ -253,18 +253,18 @@ struct kpCommandHistoryBasePrivate
253 253
 
254 254
 
255 255
 kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig,
256
-                                            KActionCollection *ac)
256
+                                            TDEActionCollection *ac)
257 257
     : d (new kpCommandHistoryBasePrivate ())
258 258
 {
259
-    m_actionUndo = new KToolBarPopupAction (undoActionText (),
259
+    m_actionUndo = new TDEToolBarPopupAction (undoActionText (),
260 260
         TQString::fromLatin1 ("undo"),
261
-        KStdAccel::shortcut (KStdAccel::Undo),
261
+        TDEStdAccel::shortcut (TDEStdAccel::Undo),
262 262
         this, TQT_SLOT (undo ()),
263 263
         ac, KStdAction::name (KStdAction::Undo));
264 264
 
265
-    m_actionRedo = new KToolBarPopupAction (redoActionText (),
265
+    m_actionRedo = new TDEToolBarPopupAction (redoActionText (),
266 266
         TQString::fromLatin1 ("redo"),
267
-        KStdAccel::shortcut (KStdAccel::Redo),
267
+        TDEStdAccel::shortcut (TDEStdAccel::Redo),
268 268
         this, TQT_SLOT (redo ()),
269 269
         ac, KStdAction::name (KStdAction::Redo));
270 270
 
@@ -771,7 +771,7 @@ void kpCommandHistoryBase::trimCommandLists ()
771 771
 }
772 772
 
773 773
 
774
-static void populatePopupMenu (KPopupMenu *popupMenu,
774
+static void populatePopupMenu (TDEPopupMenu *popupMenu,
775 775
                                const TQString &undoOrRedo,
776 776
                                const TQValueList <kpCommand *> &commandList)
777 777
 {
@@ -791,7 +791,7 @@ static void populatePopupMenu (KPopupMenu *popupMenu,
791 791
     if (it != commandList.end ())
792 792
     {
793 793
         // TODO: maybe have a scrollview show all the items instead
794
-        KPopupTitle *title = new KPopupTitle (popupMenu);
794
+        TDEPopupTitle *title = new TDEPopupTitle (popupMenu);
795 795
         title->setTitle (i18n ("%n more item", "%n more items",
796 796
                                commandList.size () - i));
797 797
 

+ 4
- 4
kolourpaint/kpcommandhistory.h View File

@@ -34,8 +34,8 @@
34 34
 #include <tqvaluelist.h>
35 35
 
36 36
 
37
-class KActionCollection;
38
-class KToolBarPopupAction;
37
+class TDEActionCollection;
38
+class TDEToolBarPopupAction;
39 39
 
40 40
 class kpDocument;
41 41
 class kpMainWindow;
@@ -136,7 +136,7 @@ Q_OBJECT
136 136
   
137 137
 
138 138
 public:
139
-    kpCommandHistoryBase (bool doReadConfig, KActionCollection *ac);
139
+    kpCommandHistoryBase (bool doReadConfig, TDEActionCollection *ac);
140 140
     virtual ~kpCommandHistoryBase ();
141 141
 
142 142
 public:
@@ -198,7 +198,7 @@ signals:
198 198
     void documentRestored ();
199 199
 
200 200
 protected:
201
-    KToolBarPopupAction *m_actionUndo, *m_actionRedo;
201
+    TDEToolBarPopupAction *m_actionUndo, *m_actionRedo;
202 202
 
203 203
     // (Front element is the next one)
204 204
     TQValueList <kpCommand *> m_undoCommandList;

+ 9
- 9
kolourpaint/kpmainwindow.cpp View File

@@ -64,7 +64,7 @@
64 64
 
65 65
 
66 66
 kpMainWindow::kpMainWindow ()
67
-    : KMainWindow (0/*parent*/, "mainWindow"),
67
+    : TDEMainWindow (0/*parent*/, "mainWindow"),
68 68
       m_isFullyConstructed (false)
69 69
 {
70 70
     init ();
@@ -74,7 +74,7 @@ kpMainWindow::kpMainWindow ()
74 74
 }
75 75
 
76 76
 kpMainWindow::kpMainWindow (const KURL &url)
77
-    : KMainWindow (0/*parent*/, "mainWindow"),
77
+    : TDEMainWindow (0/*parent*/, "mainWindow"),
78 78
       m_isFullyConstructed (false)
79 79
 {
80 80
     init ();
@@ -84,7 +84,7 @@ kpMainWindow::kpMainWindow (const KURL &url)
84 84
 }
85 85
 
86 86
 kpMainWindow::kpMainWindow (kpDocument *newDoc)
87
-    : KMainWindow (0/*parent*/, "mainWindow"),
87
+    : TDEMainWindow (0/*parent*/, "mainWindow"),
88 88
       m_isFullyConstructed (false)
89 89
 {
90 90
     init ();
@@ -295,8 +295,8 @@ void kpMainWindow::init ()
295 295
         kdDebug () << "\tfirstTime: positioning toolbars" << endl;
296 296
     #endif
297 297
 
298
-        m_toolToolBar->setBarPos (KToolBar::Left);
299
-        m_colorToolBar->setBarPos (KToolBar::Bottom);
298
+        m_toolToolBar->setBarPos (TDEToolBar::Left);
299
+        m_colorToolBar->setBarPos (TDEToolBar::Bottom);
300 300
 
301 301
         TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
302 302
         TDEConfigBase *cfg = cfgGroupSaver.config ();
@@ -311,7 +311,7 @@ void kpMainWindow::init ()
311 311
 }
312 312
 
313 313
 
314
-// private virtual [base KMainWindow]
314
+// private virtual [base TDEMainWindow]
315 315
 void kpMainWindow::readProperties (TDEConfig *cfg)
316 316
 {
317 317
 #if DEBUG_KP_MAIN_WINDOW
@@ -363,8 +363,8 @@ void kpMainWindow::readProperties (TDEConfig *cfg)
363 363
 
364 364
 }
365 365
 
366
-// private virtual [base KMainWindow]
367
-// WARNING: KMainWindow API Doc says "No user interaction is allowed
366
+// private virtual [base TDEMainWindow]
367
+// WARNING: TDEMainWindow API Doc says "No user interaction is allowed
368 368
 //          in this function!"
369 369
 void kpMainWindow::saveProperties (TDEConfig *cfg)
370 370
 {
@@ -839,7 +839,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
839 839
 }
840 840
 
841 841
 
842
-// private virtual [base KMainWindow]
842
+// private virtual [base TDEMainWindow]
843 843
 bool kpMainWindow::queryClose ()
844 844
 {
845 845
 #if DEBUG_KP_MAIN_WINDOW

+ 24
- 24
kolourpaint/kpmainwindow.h View File

@@ -52,16 +52,16 @@ class TQRect;
52 52
 class TQSize;
53 53
 class TQStringList;
54 54
 
55
-class KAction;
56
-class KFontAction;
57
-class KFontSizeAction;
58
-class KSelectAction;
59
-class KToggleAction;
60
-class KToolBar;
55
+class TDEAction;
56
+class TDEFontAction;
57
+class TDEFontSizeAction;
58
+class TDESelectAction;
59
+class TDEToggleAction;
60
+class TDEToolBar;
61 61
 class KPrinter;
62
-class KRecentFilesAction;
62
+class TDERecentFilesAction;
63 63
 class KScanDialog;
64
-class KToggleFullScreenAction;
64
+class TDEToggleFullScreenAction;
65 65
 
66 66
 class kpColor;
67 67
 class kpColorToolBar;
@@ -85,7 +85,7 @@ class kpToolToolBar;
85 85
 class kpZoomedView;
86 86
 
87 87
 
88
-class kpMainWindow : public KMainWindow
88
+class kpMainWindow : public TDEMainWindow
89 89
 {
90 90
 Q_OBJECT
91 91
   
@@ -313,9 +313,9 @@ private:
313 313
     void setupFileMenuActions ();
314 314
     void enableFileMenuDocumentActions (bool enable = true);
315 315
 
316
-    KAction *m_actionNew, *m_actionOpen;
317
-    KRecentFilesAction *m_actionOpenRecent;
318
-    KAction *m_actionScan, *m_actionSave, *m_actionSaveAs, *m_actionExport,
316
+    TDEAction *m_actionNew, *m_actionOpen;
317
+    TDERecentFilesAction *m_actionOpenRecent;
318
+    TDEAction *m_actionScan, *m_actionSave, *m_actionSaveAs, *m_actionExport,
319 319
             *m_actionReload,
320 320
             *m_actionPrint, *m_actionPrintPreview,
321 321
             *m_actionMail,
@@ -426,7 +426,7 @@ private:
426 426
 
427 427
     bool m_editMenuDocumentActionsEnabled;
428 428
 
429
-    KAction *m_actionUndo, *m_actionRedo,
429
+    TDEAction *m_actionUndo, *m_actionRedo,
430 430
             *m_actionCut, *m_actionCopy,
431 431
             *m_actionPaste, *m_actionPasteInNewWindow,
432 432
             *m_actionDelete,
@@ -491,12 +491,12 @@ private:
491 491
     void enableViewMenuDocumentActions (bool enable = true);
492 492
     void actionShowGridUpdate ();
493 493
 
494
-    KAction *m_actionFullScreenBIC,
494
+    TDEAction *m_actionFullScreenBIC,
495 495
             *m_actionActualSize,
496 496
             *m_actionFitToPage, *m_actionFitToWidth, *m_actionFitToHeight,
497 497
             *m_actionZoomIn, *m_actionZoomOut;
498
-    KSelectAction *m_actionZoom;
499
-    KToggleAction *m_actionShowGrid,
498
+    TDESelectAction *m_actionZoom;
499
+    TDEToggleAction *m_actionShowGrid,
500 500
                   *m_actionShowThumbnail, *m_actionZoomedThumbnail;
501 501
 
502 502
     TQValueVector <int> m_zoomList;
@@ -581,7 +581,7 @@ private:
581 581
 
582 582
     bool m_imageMenuDocumentActionsEnabled;
583 583
 
584
-    KAction *m_actionResizeScale,
584
+    TDEAction *m_actionResizeScale,
585 585
             *m_actionCrop, *m_actionAutoCrop,
586 586
             *m_actionFlip, *m_actionRotate, *m_actionSkew,
587 587
             *m_actionConvertToBlackAndWhite, *m_actionConvertToGrayscale,
@@ -621,9 +621,9 @@ private:
621 621
     void setupSettingsMenuActions ();
622 622
     void enableSettingsMenuDocumentActions (bool enable = true);
623 623
 
624
-    KToggleAction *m_actionShowPath;
625
-    KAction *m_actionKeyBindings, *m_actionConfigureToolbars, *m_actionConfigure;
626
-    KToggleFullScreenAction *m_actionFullScreen;
624
+    TDEToggleAction *m_actionShowPath;
625
+    TDEAction *m_actionKeyBindings, *m_actionConfigureToolbars, *m_actionConfigure;
626
+    TDEToggleFullScreenAction *m_actionFullScreen;
627 627
 
628 628
 private slots:
629 629
     void slotFullScreen ();
@@ -700,16 +700,16 @@ private slots:
700 700
     void slotTextStrikeThruChanged ();
701 701
 
702 702
 public:
703
-    KToolBar *textToolBar ();
703
+    TDEToolBar *textToolBar ();
704 704
     bool isTextStyleBackgroundOpaque () const;
705 705
     kpTextStyle textStyle () const;
706 706
     void setTextStyle (const kpTextStyle &textStyle_);
707 707
     int settingTextStyle () const;
708 708
 
709 709
 private:
710
-    KFontAction *m_actionTextFontFamily;
711
-    KFontSizeAction *m_actionTextFontSize;
712
-    KToggleAction *m_actionTextBold, *m_actionTextItalic,
710
+    TDEFontAction *m_actionTextFontFamily;
711
+    TDEFontSizeAction *m_actionTextFontSize;
712
+    TDEToggleAction *m_actionTextBold, *m_actionTextItalic,
713 713
                   *m_actionTextUnderline, *m_actionTextStrikeThru;
714 714
 
715 715
     int m_settingTextStyle;

+ 8
- 8
kolourpaint/kpmainwindow_edit.cpp View File

@@ -89,7 +89,7 @@ kpPixmapFX::WarnAboutLossInfo kpMainWindow::pasteWarnAboutLossInfo ()
89 89
 // private
90 90
 void kpMainWindow::setupEditMenuActions ()
91 91
 {
92
-    KActionCollection *ac = actionCollection ();
92
+    TDEActionCollection *ac = actionCollection ();
93 93
 
94 94
 
95 95
     // Undo/Redo
@@ -106,21 +106,21 @@ void kpMainWindow::setupEditMenuActions ()
106 106
     m_actionCut = KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT (slotCut ()), ac);
107 107
     m_actionCopy = KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT (slotCopy ()), ac);
108 108
     m_actionPaste = KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT (slotPaste ()), ac);
109
-    m_actionPasteInNewWindow = new KAction (i18n ("Paste in &New Window"),
109
+    m_actionPasteInNewWindow = new TDEAction (i18n ("Paste in &New Window"),
110 110
         TQt::CTRL + TQt::SHIFT + TQt::Key_V,
111 111
         TQT_TQOBJECT(this), TQT_SLOT (slotPasteInNewWindow ()), ac, "edit_paste_in_new_window");
112 112
 
113 113
     //m_actionDelete = KStdAction::clear (this, TQT_SLOT (slotDelete ()), ac);
114
-    m_actionDelete = new KAction (i18n ("&Delete Selection"), 0,
114
+    m_actionDelete = new TDEAction (i18n ("&Delete Selection"), 0,
115 115
         TQT_TQOBJECT(this), TQT_SLOT (slotDelete ()), ac, "edit_clear");
116 116
 
117 117
     m_actionSelectAll = KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT (slotSelectAll ()), ac);
118 118
     m_actionDeselect = KStdAction::deselect (TQT_TQOBJECT(this), TQT_SLOT (slotDeselect ()), ac);
119 119
 
120 120
 
121
-    m_actionCopyToFile = new KAction (i18n ("C&opy to File..."), 0,
121
+    m_actionCopyToFile = new TDEAction (i18n ("C&opy to File..."), 0,
122 122
         TQT_TQOBJECT(this), TQT_SLOT (slotCopyToFile ()), ac, "edit_copy_to_file");
123
-    m_actionPasteFromFile = new KAction (i18n ("Paste &From File..."), 0,
123
+    m_actionPasteFromFile = new TDEAction (i18n ("Paste &From File..."), 0,
124 124
         TQT_TQOBJECT(this), TQT_SLOT (slotPasteFromFile ()), ac, "edit_paste_from_file");
125 125
 
126 126
 
@@ -724,14 +724,14 @@ void kpMainWindow::slotPaste ()
724 724
             i18n ("Cannot Paste"));
725 725
 
726 726
         // TODO: PROPAGATE: interprocess
727
-        if (KMainWindow::memberList)
727
+        if (TDEMainWindow::memberList)
728 728
         {
729 729
         #if DEBUG_KP_MAIN_WINDOW
730 730
             kdDebug () << "\thave memberList" << endl;
731 731
         #endif
732 732
 
733
-            for (TQPtrList <KMainWindow>::const_iterator it = KMainWindow::memberList->begin ();
734
-                 it != KMainWindow::memberList->end ();
733
+            for (TQPtrList <TDEMainWindow>::const_iterator it = TDEMainWindow::memberList->begin ();
734
+                 it != TDEMainWindow::memberList->end ();
735 735
                  it++)
736 736
             {
737 737
                 kpMainWindow *mw = dynamic_cast <kpMainWindow *> (*it);

+ 13
- 13
kolourpaint/kpmainwindow_file.cpp View File

@@ -65,7 +65,7 @@ void kpMainWindow::setupFileMenuActions ()
65 65
 #if DEBUG_KP_MAIN_WINDOW
66 66
     kdDebug () << "kpMainWindow::setupFileMenuActions()" << endl;
67 67
 #endif
68
-    KActionCollection *ac = actionCollection ();
68
+    TDEActionCollection *ac = actionCollection ();
69 69
 
70 70
     m_actionNew = KStdAction::openNew (TQT_TQOBJECT(this), TQT_SLOT (slotNew ()), ac);
71 71
     m_actionOpen = KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT (slotOpen ()), ac);
@@ -79,14 +79,14 @@ void kpMainWindow::setupFileMenuActions ()
79 79
     m_actionSave = KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT (slotSave ()), ac);
80 80
     m_actionSaveAs = KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (slotSaveAs ()), ac);
81 81
 
82
-    m_actionExport = new KAction (i18n ("E&xport..."), 0,
82
+    m_actionExport = new TDEAction (i18n ("E&xport..."), 0,
83 83
         TQT_TQOBJECT(this), TQT_SLOT (slotExport ()), ac, "file_export");
84 84
 
85
-    m_actionScan = new KAction (i18n ("Scan..."), SmallIcon ("scanner"), 0,
85
+    m_actionScan = new TDEAction (i18n ("Scan..."), SmallIcon ("scanner"), 0,
86 86
         TQT_TQOBJECT(this), TQT_SLOT (slotScan ()), ac, "file_scan");
87 87
 
88 88
     //m_actionRevert = KStdAction::revert (this, TQT_SLOT (slotRevert ()), ac);
89
-    m_actionReload = new KAction (i18n ("Reloa&d"), KStdAccel::reload (),
89
+    m_actionReload = new TDEAction (i18n ("Reloa&d"), TDEStdAccel::reload (),
90 90
         TQT_TQOBJECT(this), TQT_SLOT (slotReload ()), ac, "file_revert");
91 91
     slotEnableReload ();
92 92
 
@@ -95,9 +95,9 @@ void kpMainWindow::setupFileMenuActions ()
95 95
 
96 96
     m_actionMail = KStdAction::mail (TQT_TQOBJECT(this), TQT_SLOT (slotMail ()), ac);
97 97
 
98
-    m_actionSetAsWallpaperCentered = new KAction (i18n ("Set as Wa&llpaper (Centered)"), 0,
98
+    m_actionSetAsWallpaperCentered = new TDEAction (i18n ("Set as Wa&llpaper (Centered)"), 0,
99 99
         TQT_TQOBJECT(this), TQT_SLOT (slotSetAsWallpaperCentered ()), ac, "file_set_as_wallpaper_centered");
100
-    m_actionSetAsWallpaperTiled = new KAction (i18n ("Set as Wallpaper (&Tiled)"), 0,
100
+    m_actionSetAsWallpaperTiled = new TDEAction (i18n ("Set as Wallpaper (&Tiled)"), 0,
101 101
         TQT_TQOBJECT(this), TQT_SLOT (slotSetAsWallpaperTiled ()), ac, "file_set_as_wallpaper_tiled");
102 102
 
103 103
     m_actionClose = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT (slotClose ()), ac);
@@ -167,14 +167,14 @@ void kpMainWindow::addRecentURL (const KURL &url)
167 167
 
168 168
 
169 169
     // TODO: PROPAGATE: interprocess
170
-    if (KMainWindow::memberList)
170
+    if (TDEMainWindow::memberList)
171 171
     {
172 172
     #if DEBUG_KP_MAIN_WINDOW
173 173
         kdDebug () << "\thave memberList" << endl;
174 174
     #endif
175 175
 
176
-        for (TQPtrList <KMainWindow>::const_iterator it = KMainWindow::memberList->begin ();
177
-             it != KMainWindow::memberList->end ();
176
+        for (TQPtrList <TDEMainWindow>::const_iterator it = TDEMainWindow::memberList->begin ();
177
+             it != TDEMainWindow::memberList->end ();
178 178
              it++)
179 179
         {
180 180
             kpMainWindow *mw = dynamic_cast <kpMainWindow *> (*it);
@@ -190,12 +190,12 @@ void kpMainWindow::addRecentURL (const KURL &url)
190 190
 
191 191
             if (mw != this)
192 192
             {
193
-                // WARNING: Do not use KRecentFilesAction::setItems()
193
+                // WARNING: Do not use TDERecentFilesAction::setItems()
194 194
                 //          - it does not work since only its superclass,
195
-                //          KSelectAction, implements setItems() and can't
196
-                //          update KRecentFilesAction's URL list.
195
+                //          TDESelectAction, implements setItems() and can't
196
+                //          update TDERecentFilesAction's URL list.
197 197
 
198
-                // Avoid URL memory leak in KRecentFilesAction::loadEntries().
198
+                // Avoid URL memory leak in TDERecentFilesAction::loadEntries().
199 199
                 mw->m_actionOpenRecent->clearURLList ();
200 200
 
201 201
                 mw->m_actionOpenRecent->loadEntries (cfg);

+ 3
- 3
kolourpaint/kpmainwindow_help.cpp View File

@@ -45,7 +45,7 @@
45 45
 // private
46 46
 void kpMainWindow::setupHelpMenuActions ()
47 47
 {
48
-    KActionCollection *ac = actionCollection ();
48
+    TDEActionCollection *ac = actionCollection ();
49 49
 
50 50
 
51 51
     // Explanation for action name:
@@ -55,7 +55,7 @@ void kpMainWindow::setupHelpMenuActions ()
55 55
     // from a digital camera in future versions of KolourPaint.  Hence
56 56
     // "Acquiring" is more appropriate.
57 57
     // -- Thurston
58
-    d->m_actionHelpTakingScreenshots = new KAction (
58
+    d->m_actionHelpTakingScreenshots = new TDEAction (
59 59
         i18n ("Acquiring &Screenshots"), 0,
60 60
         TQT_TQOBJECT(this), TQT_SLOT (slotHelpTakingScreenshots ()),
61 61
         ac, "help_taking_screenshots");
@@ -83,7 +83,7 @@ static TQString printScreenShortcutString ()
83 83
 
84 84
     // (only use 1st key sequence, if it exists)
85 85
     const TQString humanReadableShortcut =
86
-        KShortcut (cfgEntryString).seq (0).toString ();
86
+        TDEShortcut (cfgEntryString).seq (0).toString ();
87 87
 
88 88
     if (!humanReadableShortcut.isEmpty ())
89 89
     {

+ 12
- 12
kolourpaint/kpmainwindow_image.cpp View File

@@ -87,39 +87,39 @@ TQString kpMainWindow::autoCropText () const
87 87
 // private
88 88
 void kpMainWindow::setupImageMenuActions ()
89 89
 {
90
-    KActionCollection *ac = actionCollection ();
90
+    TDEActionCollection *ac = actionCollection ();
91 91
 
92
-    m_actionResizeScale = new KAction (i18n ("R&esize / Scale..."), TQt::CTRL + TQt::Key_E,
92
+    m_actionResizeScale = new TDEAction (i18n ("R&esize / Scale..."), TQt::CTRL + TQt::Key_E,
93 93
         TQT_TQOBJECT(this), TQT_SLOT (slotResizeScale ()), ac, "image_resize_scale");
94 94
 
95
-    m_actionCrop = new KAction (i18n ("Se&t as Image (Crop)"), TQt::CTRL + TQt::Key_T,
95
+    m_actionCrop = new TDEAction (i18n ("Se&t as Image (Crop)"), TQt::CTRL + TQt::Key_T,
96 96
         TQT_TQOBJECT(this), TQT_SLOT (slotCrop ()), ac, "image_crop");
97 97
 
98
-    m_actionAutoCrop = new KAction (autoCropText (), TQt::CTRL + TQt::Key_U,
98
+    m_actionAutoCrop = new TDEAction (autoCropText (), TQt::CTRL + TQt::Key_U,
99 99
         TQT_TQOBJECT(this), TQT_SLOT (slotAutoCrop ()), ac, "image_auto_crop");
100 100
 
101
-    m_actionFlip = new KAction (i18n ("&Flip..."), TQt::CTRL + TQt::Key_F,
101
+    m_actionFlip = new TDEAction (i18n ("&Flip..."), TQt::CTRL + TQt::Key_F,
102 102
         TQT_TQOBJECT(this), TQT_SLOT (slotFlip ()), ac, "image_flip");
103 103
 
104
-    m_actionRotate = new KAction (i18n ("&Rotate..."), TQt::CTRL + TQt::Key_R,
104
+    m_actionRotate = new TDEAction (i18n ("&Rotate..."), TQt::CTRL + TQt::Key_R,
105 105
         TQT_TQOBJECT(this), TQT_SLOT (slotRotate ()), ac, "image_rotate");
106 106
 
107
-    m_actionSkew = new KAction (i18n ("S&kew..."), TQt::CTRL + TQt::Key_K,
107
+    m_actionSkew = new TDEAction (i18n ("S&kew..."), TQt::CTRL + TQt::Key_K,
108 108
         TQT_TQOBJECT(this), TQT_SLOT (slotSkew ()), ac, "image_skew");
109 109
 
110
-    m_actionConvertToBlackAndWhite = new KAction (i18n ("Reduce to Mo&nochrome (Dithered)"), 0,
110
+    m_actionConvertToBlackAndWhite = new TDEAction (i18n ("Reduce to Mo&nochrome (Dithered)"), 0,
111 111
         TQT_TQOBJECT(this), TQT_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white");
112 112
 
113
-    m_actionConvertToGrayscale = new KAction (i18n ("Reduce to &Grayscale"), 0,
113
+    m_actionConvertToGrayscale = new TDEAction (i18n ("Reduce to &Grayscale"), 0,
114 114
         TQT_TQOBJECT(this), TQT_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale");
115 115
 
116
-    m_actionInvertColors = new KAction (i18n ("&Invert Colors"), TQt::CTRL + TQt::Key_I,
116
+    m_actionInvertColors = new TDEAction (i18n ("&Invert Colors"), TQt::CTRL + TQt::Key_I,
117 117
         TQT_TQOBJECT(this), TQT_SLOT (slotInvertColors ()), ac, "image_invert_colors");
118 118
 
119
-    m_actionClear = new KAction (i18n ("C&lear"), TQt::CTRL + TQt::SHIFT + TQt::Key_N,
119
+    m_actionClear = new TDEAction (i18n ("C&lear"), TQt::CTRL + TQt::SHIFT + TQt::Key_N,
120 120
         TQT_TQOBJECT(this), TQT_SLOT (slotClear ()), ac, "image_clear");
121 121
 
122
-    m_actionMoreEffects = new KAction (i18n ("&More Effects..."), TQt::CTRL + TQt::Key_M,
122
+    m_actionMoreEffects = new TDEAction (i18n ("&More Effects..."), TQt::CTRL + TQt::Key_M,
123 123
         TQT_TQOBJECT(this), TQT_SLOT (slotMoreEffects ()), ac, "image_more_effects");
124 124
 
125 125
     enableImageMenuDocumentActions (false);

+ 4
- 4
kolourpaint/kpmainwindow_p.h View File

@@ -30,16 +30,16 @@
30 30
 #define KP_MAIN_WINDOW_P_H
31 31
 
32 32
 
33
-class KAction;
34
-class KToggleAction;
33
+class TDEAction;
34
+class TDEToggleAction;
35 35
 
36 36
 
37 37
 struct kpMainWindowPrivate
38 38
 {
39 39
     bool m_configThumbnailShowRectangle;
40
-    KToggleAction *m_actionShowThumbnailRectangle;
40
+    TDEToggleAction *m_actionShowThumbnailRectangle;
41 41
 
42
-    KAction *m_actionHelpTakingScreenshots;
42
+    TDEAction *m_actionHelpTakingScreenshots;
43 43
 
44 44
     int m_moreEffectsDialogLastEffect;
45 45
     bool m_resizeScaleDialogLastKeepAspect;

+ 3
- 3
kolourpaint/kpmainwindow_settings.cpp View File

@@ -47,7 +47,7 @@
47 47
 // private
48 48
 void kpMainWindow::setupSettingsMenuActions ()
49 49
 {
50
-    KActionCollection *ac = actionCollection ();
50
+    TDEActionCollection *ac = actionCollection ();
51 51
 
52 52
 
53 53
     // Settings/Toolbars |> %s
@@ -61,7 +61,7 @@ void kpMainWindow::setupSettingsMenuActions ()
61 61
                                                  this/*window*/);
62 62
 
63 63
 
64
-    m_actionShowPath = new KToggleAction (i18n ("Show &Path"), 0,
64
+    m_actionShowPath = new TDEToggleAction (i18n ("Show &Path"), 0,
65 65
         TQT_TQOBJECT(this), TQT_SLOT (slotShowPathToggled ()), ac, "settings_show_path");
66 66
     m_actionShowPath->setCheckedState (i18n ("Hide &Path"));
67 67
     slotEnableSettingsShowPath ();
@@ -187,7 +187,7 @@ void kpMainWindow::slotNewToolBarConfig ()
187 187
     kdDebug () << "kpMainWindow::slotNewToolBarConfig()" << endl;
188 188
 #endif
189 189
 
190
-    // Wouldn't it be nice if createGUI () didn't nuke all the KToolBar's?
190
+    // Wouldn't it be nice if createGUI () didn't nuke all the TDEToolBar's?
191 191
     // (including my non-XMLGUI ones whose states take a _lot_ of effort to
192 192
     //  restore).
193 193
     // TODO: this message is probably unacceptable - so restore the state of

+ 10
- 10
kolourpaint/kpmainwindow_text.cpp View File

@@ -47,23 +47,23 @@
47 47
 // private
48 48
 void kpMainWindow::setupTextToolBarActions ()
49 49
 {
50
-    KActionCollection *ac = actionCollection ();
50
+    TDEActionCollection *ac = actionCollection ();
51 51
 
52
-    m_actionTextFontFamily = new KFontAction (i18n ("Font Family"), 0/*shortcut*/,
52
+    m_actionTextFontFamily = new TDEFontAction (i18n ("Font Family"), 0/*shortcut*/,
53 53
         TQT_TQOBJECT(this), TQT_SLOT (slotTextFontFamilyChanged ()), ac, "text_font_family");
54
-    m_actionTextFontSize = new KFontSizeAction (i18n ("Font Size"), 0/*shortcut*/,
54
+    m_actionTextFontSize = new TDEFontSizeAction (i18n ("Font Size"), 0/*shortcut*/,
55 55
         TQT_TQOBJECT(this), TQT_SLOT (slotTextFontSizeChanged ()), ac, "text_font_size");
56 56
 
57
-    m_actionTextBold = new KToggleAction (i18n ("Bold"),
57
+    m_actionTextBold = new TDEToggleAction (i18n ("Bold"),
58 58
         "text_bold"/*icon*/, 0/*shortcut*/,
59 59
         TQT_TQOBJECT(this), TQT_SLOT (slotTextBoldChanged ()), ac, "text_bold");
60
-    m_actionTextItalic = new KToggleAction (i18n ("Italic"),
60
+    m_actionTextItalic = new TDEToggleAction (i18n ("Italic"),
61 61
         "text_italic"/*icon*/, 0/*shortcut*/,
62 62
         TQT_TQOBJECT(this), TQT_SLOT (slotTextItalicChanged ()), ac, "text_italic");
63
-    m_actionTextUnderline = new KToggleAction (i18n ("Underline"),
63
+    m_actionTextUnderline = new TDEToggleAction (i18n ("Underline"),
64 64
         "text_under"/*icon*/, 0/*shortcut*/,
65 65
         TQT_TQOBJECT(this), TQT_SLOT (slotTextUnderlineChanged ()), ac, "text_underline");
66
-    m_actionTextStrikeThru = new KToggleAction (i18n ("Strike Through"),
66
+    m_actionTextStrikeThru = new TDEToggleAction (i18n ("Strike Through"),
67 67
         "text_strike"/*icon*/, 0/*shortcut*/,
68 68
         TQT_TQOBJECT(this), TQT_SLOT (slotTextStrikeThruChanged ()), ac, "text_strike_thru");
69 69
 
@@ -136,7 +136,7 @@ void kpMainWindow::slotTextFontFamilyChanged ()
136 136
                                            m_textOldFontFamily);
137 137
     }
138 138
 
139
-    // Since editable KSelectAction's steal focus from view, switch back to mainView
139
+    // Since editable TDESelectAction's steal focus from view, switch back to mainView
140 140
     // TODO: back to the last view
141 141
     if (m_mainView)
142 142
         m_mainView->setFocus ();
@@ -169,7 +169,7 @@ void kpMainWindow::slotTextFontSizeChanged ()
169 169
                                          m_textOldFontSize);
170 170
     }
171 171
 
172
-    // Since editable KSelectAction's steal focus from view, switch back to mainView
172
+    // Since editable TDESelectAction's steal focus from view, switch back to mainView
173 173
     // TODO: back to the last view
174 174
     if (m_mainView)
175 175
         m_mainView->setFocus ();
@@ -276,7 +276,7 @@ void kpMainWindow::slotTextStrikeThruChanged ()
276 276
 
277 277
 
278 278
 // public
279
-KToolBar *kpMainWindow::textToolBar ()
279
+TDEToolBar *kpMainWindow::textToolBar ()
280 280
 {
281 281
     return toolBar ("textToolBar");
282 282
 }

+ 1
- 1
kolourpaint/kpmainwindow_tools.cpp View File

@@ -98,7 +98,7 @@ void kpMainWindow::setupToolActions ()
98 98
     m_tools.append (m_toolCurve = new kpToolCurve (this));
99 99
 
100 100
 
101
-    KActionCollection *ac = actionCollection ();
101
+    TDEActionCollection *ac = actionCollection ();
102 102
 
103 103
     m_actionPrevToolOptionGroup1 = new kpSingleKeyTriggersAction (
104 104
         i18n ("Previous Tool Option (Group #1)"),

+ 9
- 9
kolourpaint/kpmainwindow_view.cpp View File

@@ -61,7 +61,7 @@ void kpMainWindow::setupViewMenuActions ()
61 61
     m_thumbnailSaveConfigTimer = 0;
62 62
 
63 63
 
64
-    KActionCollection *ac = actionCollection ();
64
+    TDEActionCollection *ac = actionCollection ();
65 65
 
66 66
     /*m_actionFullScreen = KStdAction::fullScreen (0, 0, ac);
67 67
     m_actionFullScreen->setEnabled (false);*/
@@ -77,7 +77,7 @@ void kpMainWindow::setupViewMenuActions ()
77 77
     m_actionZoomOut = KStdAction::zoomOut (TQT_TQOBJECT(this), TQT_SLOT (slotZoomOut ()), ac);
78 78
 
79 79
 
80
-    m_actionZoom = new KSelectAction (i18n ("&Zoom"), 0,
80
+    m_actionZoom = new TDESelectAction (i18n ("&Zoom"), 0,
81 81
         TQT_TQOBJECT(this), TQT_SLOT (slotZoom ()), actionCollection (), "view_zoom_to");
82 82
     m_actionZoom->setEditable (true);
83 83
 
@@ -90,7 +90,7 @@ void kpMainWindow::setupViewMenuActions ()
90 90
     m_zoomList.append (1000); m_zoomList.append (1200); m_zoomList.append (1600);
91 91
 
92 92
 
93
-    m_actionShowGrid = new KToggleAction (i18n ("Show &Grid"), CTRL + Key_G,
93
+    m_actionShowGrid = new TDEToggleAction (i18n ("Show &Grid"), CTRL + Key_G,
94 94
         TQT_TQOBJECT(this), TQT_SLOT (slotShowGridToggled ()), actionCollection (), "view_show_grid");
95 95
     m_actionShowGrid->setCheckedState (i18n ("Hide &Grid"));
96 96
 
@@ -98,12 +98,12 @@ void kpMainWindow::setupViewMenuActions ()
98 98
     // TODO: This doesn't work when the thumbnail has focus.
99 99
     //       Testcase: Press CTRL+H twice on a fresh KolourPaint.
100 100
     //                 The second CTRL+H doesn't close the thumbnail.
101
-    m_actionShowThumbnail = new KToggleAction (i18n ("Show T&humbnail"), CTRL + Key_H,
101
+    m_actionShowThumbnail = new TDEToggleAction (i18n ("Show T&humbnail"), CTRL + Key_H,
102 102
         TQT_TQOBJECT(this), TQT_SLOT (slotShowThumbnailToggled ()), actionCollection (), "view_show_thumbnail");
103 103
     m_actionShowThumbnail->setCheckedState (i18n ("Hide T&humbnail"));
104 104
 
105 105
     // Please do not use setCheckedState() here - it wouldn't make sense
106
-    m_actionZoomedThumbnail = new KToggleAction (i18n ("Zoo&med Thumbnail Mode"), 0,
106
+    m_actionZoomedThumbnail = new TDEToggleAction (i18n ("Zoo&med Thumbnail Mode"), 0,
107 107
         TQT_TQOBJECT(this), TQT_SLOT (slotZoomedThumbnailToggled ()), actionCollection (), "view_zoomed_thumbnail");
108 108
 
109 109
     // For consistency with the above action, don't use setCheckedState()
@@ -111,7 +111,7 @@ void kpMainWindow::setupViewMenuActions ()
111 111
     // Also, don't use "Show Thumbnail Rectangle" because if entire doc
112 112
     // can be seen in scrollView, checking option won't "Show" anything
113 113
     // since rect _surrounds_ entire doc (hence, won't be rendered).
114
-    d->m_actionShowThumbnailRectangle = new KToggleAction (
114
+    d->m_actionShowThumbnailRectangle = new TDEToggleAction (
115 115
         i18n ("Enable Thumbnail &Rectangle"),
116 116
         0,
117 117
         TQT_TQOBJECT(this), TQT_SLOT (slotThumbnailShowRectangleToggled ()),
@@ -186,9 +186,9 @@ void kpMainWindow::sendZoomListToActionZoom ()
186 186
         items << zoomLevelToString (*it);
187 187
     }
188 188
 
189
-    // Work around a KDE bug - KSelectAction::setItems() enables the action.
189
+    // Work around a KDE bug - TDESelectAction::setItems() enables the action.
190 190
     // David Faure said it won't be fixed because it's a feature used by
191
-    // KRecentFilesAction.
191
+    // TDERecentFilesAction.
192 192
     bool e = m_actionZoom->isEnabled ();
193 193
     m_actionZoom->setItems (items);
194 194
     if (e != m_actionZoom->isEnabled ())
@@ -477,7 +477,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor)
477 477
     #endif
478 478
 
479 479
 
480
-        // Since Zoom Level KSelectAction on ToolBar grabs focus after changing
480
+        // Since Zoom Level TDESelectAction on ToolBar grabs focus after changing
481 481
         // Zoom, switch back to the Main View.
482 482
         // TODO: back to the last view
483 483
         m_mainView->setFocus ();

+ 6
- 6
kolourpaint/kpsinglekeytriggersaction.cpp View File

@@ -87,7 +87,7 @@ void kpSingleKeyTriggersActionInterface::enableSingleKeyTriggers (bool enable)
87 87
     {
88 88
         m_fullShortcut = /*pure virtual*/actionShortcut ();
89 89
 
90
-        KShortcut newShortcut;
90
+        TDEShortcut newShortcut;
91 91
         if (kpTool::containsSingleKeyTrigger (m_fullShortcut, &newShortcut))
92 92
         {
93 93
         #if DEBUG_KP_SINGLE_KEY_TRIGGERS_ACTION
@@ -117,10 +117,10 @@ void kpSingleKeyTriggersActionInterface::enableSingleKeyTriggers (bool enable)
117 117
 
118 118
 
119 119
 kpSingleKeyTriggersAction::kpSingleKeyTriggersAction (const TQString &text,
120
-                            const KShortcut &shortcut,
120
+                            const TDEShortcut &shortcut,
121 121
                             const TQObject *receiver, const char *slot,
122
-                            KActionCollection *parent, const char *name)
123
-    : KAction (text, shortcut, receiver, slot, parent, name)
122
+                            TDEActionCollection *parent, const char *name)
123
+    : TDEAction (text, shortcut, receiver, slot, parent, name)
124 124
 {
125 125
 }
126 126
 
@@ -140,13 +140,13 @@ const char *kpSingleKeyTriggersAction::actionName () const
140 140
 }
141 141
 
142 142
 // public virtual [base kpSingleKeyTriggersActionInterface]
143
-KShortcut kpSingleKeyTriggersAction::actionShortcut () const
143
+TDEShortcut kpSingleKeyTriggersAction::actionShortcut () const
144 144
 {
145 145
     return shortcut ();
146 146
 }
147 147
 
148 148
 // public virtual [base kpSingleKeyTriggersActionInterface]
149
-void kpSingleKeyTriggersAction::actionSetShortcut (const KShortcut &shortcut)
149
+void kpSingleKeyTriggersAction::actionSetShortcut (const TDEShortcut &shortcut)
150 150
 {
151 151
     setShortcut (shortcut);
152 152
 }

+ 10
- 10
kolourpaint/kpsinglekeytriggersaction.h View File

@@ -41,22 +41,22 @@ public:
41 41
     bool singleKeyTriggersEnabled () const;
42 42
     void enableSingleKeyTriggers (bool enable = true);
43 43
 
44
-    // Avoid inheritance diamond by not deriving from KAction
45
-    // so you'll have to implement these by talking to your base KAction.
44
+    // Avoid inheritance diamond by not deriving from TDEAction
45
+    // so you'll have to implement these by talking to your base TDEAction.
46 46
     virtual const char *actionName () const { return 0; }
47
-    virtual KShortcut actionShortcut () const = 0;
48
-    virtual void actionSetShortcut (const KShortcut &shortcut) = 0;
47
+    virtual TDEShortcut actionShortcut () const = 0;
48
+    virtual void actionSetShortcut (const TDEShortcut &shortcut) = 0;
49 49
 
50 50
 protected:
51 51
     bool m_singleKeyTriggersEnabled;
52
-    KShortcut m_fullShortcut;
52
+    TDEShortcut m_fullShortcut;
53 53
 };
54 54
 
55 55
 
56 56
 #include <kaction.h>
57 57
 
58 58
 
59
-class kpSingleKeyTriggersAction : public KAction,
59
+class kpSingleKeyTriggersAction : public TDEAction,
60 60
                                   public kpSingleKeyTriggersActionInterface
61 61
 {
62 62
 Q_OBJECT
@@ -64,9 +64,9 @@ Q_OBJECT
64 64
 
65 65
 public:
66 66
     kpSingleKeyTriggersAction (const TQString &text,
67
-                               const KShortcut &shortcut,
67
+                               const TDEShortcut &shortcut,
68 68
                                const TQObject *receiver, const char *slot,
69
-                               KActionCollection *parent, const char *name);
69
+                               TDEActionCollection *parent, const char *name);
70 70
     virtual ~kpSingleKeyTriggersAction ();
71 71
 
72 72
 
@@ -75,8 +75,8 @@ public:
75 75
     //
76 76
 
77 77
     virtual const char *actionName () const;
78
-    virtual KShortcut actionShortcut () const;
79
-    virtual void actionSetShortcut (const KShortcut &shortcut);
78
+    virtual TDEShortcut actionShortcut () const;
79
+    virtual void actionSetShortcut (const TDEShortcut &shortcut);
80 80
 };
81 81
 
82 82
 

+ 9
- 9
kolourpaint/kptool.cpp View File

@@ -130,7 +130,7 @@ void kpTool::createAction ()
130 130
         return;
131 131
     }
132 132
 
133
-    KActionCollection *ac = m_mainWindow->actionCollection ();
133
+    TDEActionCollection *ac = m_mainWindow->actionCollection ();
134 134
     if (!ac)
135 135
     {
136 136
         kdError () << "kpTool::createAction() without ac" << endl;
@@ -188,7 +188,7 @@ void kpTool::setText (const TQString &text)
188 188
 
189 189
 // public static
190 190
 TQString kpTool::toolTipForTextAndShortcut (const TQString &text,
191
-                                           const KShortcut &shortcut)
191
+                                           const TDEShortcut &shortcut)
192 192
 {
193 193
     for (int i = 0; i < (int) shortcut.count (); i++)
194 194
     {
@@ -230,9 +230,9 @@ void kpTool::setKey (int key)
230 230
 }
231 231
 
232 232
 // public static
233
-KShortcut kpTool::shortcutForKey (int key)
233
+TDEShortcut kpTool::shortcutForKey (int key)
234 234
 {
235
-    KShortcut shortcut;
235
+    TDEShortcut shortcut;
236 236
 
237 237
     if (key)
238 238
     {
@@ -246,9 +246,9 @@ KShortcut kpTool::shortcutForKey (int key)
246 246
 }
247 247
 
248 248
 // public
249
-KShortcut kpTool::shortcut () const
249
+TDEShortcut kpTool::shortcut () const
250 250
 {
251
-    return m_action ? m_action->shortcut () : KShortcut ();
251
+    return m_action ? m_action->shortcut () : TDEShortcut ();
252 252
 }
253 253
 
254 254
 
@@ -273,14 +273,14 @@ bool kpTool::containsSingleKeyTrigger (const KKeySequence &seq)
273 273
 }
274 274
 
275 275
 // public static
276
-bool kpTool::containsSingleKeyTrigger (const KShortcut &shortcut,
277
-    KShortcut *shortcutWithoutSingleKeyTriggers)
276
+bool kpTool::containsSingleKeyTrigger (const TDEShortcut &shortcut,
277
+    TDEShortcut *shortcutWithoutSingleKeyTriggers)
278 278
 {
279 279
     if (shortcutWithoutSingleKeyTriggers)
280 280
         *shortcutWithoutSingleKeyTriggers = shortcut;
281 281
 
282 282
 
283
-    KShortcut newShortcut;
283
+    TDEShortcut newShortcut;
284 284
     bool needNewShortcut = false;
285 285
 
286 286
     for (int i = 0; i < (int) shortcut.count (); i++)

+ 6
- 6
kolourpaint/kptool.h View File

@@ -41,7 +41,7 @@ class TQIconSet;
41 41
 class TQPixmap;
42 42
 
43 43
 class KKeySequence;
44
-class KShortcut;
44
+class TDEShortcut;
45 45
 
46 46
 class kpColor;
47 47
 class kpColorToolBar;
@@ -89,7 +89,7 @@ public:
89 89
     void setText (const TQString &text);
90 90
 
91 91
     static TQString toolTipForTextAndShortcut (const TQString &text,
92
-        const KShortcut &shortcut);
92
+        const TDEShortcut &shortcut);
93 93
     TQString toolTip () const;
94 94
 
95 95
     TQString description () const;
@@ -101,13 +101,13 @@ public:
101 101
     // Given a single <key>, returns a shortcut with <key>
102 102
     // (disabled when the user is editing text) and as an alternate,
103 103
     // <some modifiers>+<key>.
104
-    static KShortcut shortcutForKey (int key);
105
-    KShortcut shortcut () const;
104
+    static TDEShortcut shortcutForKey (int key);
105
+    TDEShortcut shortcut () const;
106 106
 
107 107
     static bool keyIsText (int key);
108 108
     static bool containsSingleKeyTrigger (const KKeySequence &seq);
109
-    static bool containsSingleKeyTrigger (const KShortcut &shortcut,
110
-        KShortcut *shortcutWithoutSingleKeyTriggers);
109
+    static bool containsSingleKeyTrigger (const TDEShortcut &shortcut,
110
+        TDEShortcut *shortcutWithoutSingleKeyTriggers);
111 111
 
112 112
     bool singleKeyTriggersEnabled () const;
113 113
     void enableSingleKeyTriggers (bool enable = true);

+ 11
- 11
kolourpaint/tools/kptoolaction.cpp View File

@@ -32,10 +32,10 @@
32 32
 
33 33
 
34 34
 kpToolAction::kpToolAction (const TQString &text,
35
-                            const TQString &pic, const KShortcut &shortcut,
35
+                            const TQString &pic, const TDEShortcut &shortcut,
36 36
                             const TQObject *receiver, const char *slot,
37 37
                             TQObject *parent, const char *name)
38
-    : KToggleAction (text,
38
+    : TDEToggleAction (text,
39 39
                      pic, shortcut,
40 40
                      receiver, slot,
41 41
                      parent, name)
@@ -62,27 +62,27 @@ void kpToolAction::updateToolTip ()
62 62
 
63 63
 
64 64
 //
65
-// KToggleAction interface
65
+// TDEToggleAction interface
66 66
 //
67 67
 
68
-// public slot virtual [base KAction]
68
+// public slot virtual [base TDEAction]
69 69
 void kpToolAction::setText (const TQString &text)
70 70
 {
71
-    KToggleAction::setText (text);
71
+    TDEToggleAction::setText (text);
72 72
     updateToolTip ();
73 73
 }
74 74
 
75
-// public slot virtual [base KAction]
76
-bool kpToolAction::setShortcut (const KShortcut &shortcut)
75
+// public slot virtual [base TDEAction]
76
+bool kpToolAction::setShortcut (const TDEShortcut &shortcut)
77 77
 {
78
-    bool ret = KToggleAction::setShortcut (shortcut);
78
+    bool ret = TDEToggleAction::setShortcut (shortcut);
79 79
     updateToolTip ();
80 80
     return ret;
81 81
 }
82 82
 
83 83
 
84 84
 //
85
-// KToggleAction implements kpSingleKeyTriggersActionInterface
85
+// TDEToggleAction implements kpSingleKeyTriggersActionInterface
86 86
 //
87 87
 
88 88
 // public virtual [base kpSingleKeyTriggersActionInterface]
@@ -92,13 +92,13 @@ const char *kpToolAction::actionName () const
92 92
 }
93 93
 
94 94
 // public virtual [base kpSingleKeyTriggersActionInterface]
95
-KShortcut kpToolAction::actionShortcut () const
95
+TDEShortcut kpToolAction::actionShortcut () const
96 96
 {
97 97
     return shortcut ();
98 98
 }
99 99
 
100 100
 // public virtual [base kpSingleKeyTriggersActionInterface]
101
-void kpToolAction::actionSetShortcut (const KShortcut &shortcut)
101
+void kpToolAction::actionSetShortcut (const TDEShortcut &shortcut)
102 102
 {
103 103
     setShortcut (shortcut);
104 104
 }

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

@@ -33,8 +33,8 @@
33 33
 #include <kpsinglekeytriggersaction.h>
34 34
 
35 35
 
36
-// Same as KToggleAction but shows the first single key trigger in the tooltip.
37
-class kpToolAction : public KToggleAction,
36
+// Same as TDEToggleAction but shows the first single key trigger in the tooltip.
37
+class kpToolAction : public TDEToggleAction,
38 38
                      public kpSingleKeyTriggersActionInterface
39 39
 {
40 40
 Q_OBJECT
@@ -42,7 +42,7 @@ Q_OBJECT
42 42
 
43 43
 public:
44 44
     kpToolAction (const TQString &text,
45
-        const TQString &pic, const KShortcut &shortcut,
45
+        const TQString &pic, const TDEShortcut &shortcut,
46 46
         const TQObject *receiver, const char *slot,
47 47
         TQObject *parent, const char *name);
48 48
     virtual ~kpToolAction ();
@@ -57,12 +57,12 @@ protected:
57 57
 
58 58
 
59 59
     //
60
-    // KToggleAction interface
60
+    // TDEToggleAction interface
61 61
     //
62 62
 
63 63
 public slots:
64 64
     virtual void setText (const TQString &text);
65
-    virtual bool setShortcut (const KShortcut &shortcut);
65
+    virtual bool setShortcut (const TDEShortcut &shortcut);
66 66
 
67 67
 
68 68
     //
@@ -71,8 +71,8 @@ public slots:
71 71
 
72 72
 public:
73 73
     virtual const char *actionName () const;
74
-    virtual KShortcut actionShortcut () const;
75
-    virtual void actionSetShortcut (const KShortcut &shortcut);
74
+    virtual TDEShortcut actionShortcut () const;
75
+    virtual void actionSetShortcut (const TDEShortcut &shortcut);
76 76
 };
77 77
 
78 78
 

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

@@ -94,7 +94,7 @@ public:
94 94
     virtual void execute ();
95 95
     virtual void unexecute ();
96 96
 
97
-    // interface for KToolAirSpray
97
+    // interface for TDEToolAirSpray
98 98
     void addPoints (const TQPointArray &points);
99 99
     void finalize ();
100 100
     void cancel ();

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

@@ -145,7 +145,7 @@ public:
145 145
     virtual void execute ();
146 146
     virtual void unexecute ();
147 147
 
148
-    // interface for KToolPen
148
+    // interface for TDEToolPen
149 149
     void updateBoundingRect (const TQPoint &point);
150 150
     void updateBoundingRect (const TQRect &rect);
151 151
     void finalize ();

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

@@ -953,7 +953,7 @@ void kpColorSimilarityToolBarItem::mouseDoubleClickEvent (TQMouseEvent * /*e*/)
953 953
  */
954 954
 
955 955
 kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow, const char *name)
956
-    : KToolBar (mainWindow, name),
956
+    : TDEToolBar (mainWindow, name),
957 957
       m_mainWindow (mainWindow)
958 958
 {
959 959
     setText (label);
@@ -993,7 +993,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
993 993
     m_lastDockedOrientationSet = false;
994 994
     setOrientation (orientation ());
995 995
 
996
-    KToolBar::insertWidget (0, base->width (), base);
996
+    TDEToolBar::insertWidget (0, base->width (), base);
997 997
 }
998 998
 
999 999
 // virtual
@@ -1025,7 +1025,7 @@ void kpColorToolBar::setOrientation (Qt::Orientation o)
1025 1025
 
1026 1026
     m_colorPalette->setOrientation (o);
1027 1027
 
1028
-    KToolBar::setOrientation (o);
1028
+    TDEToolBar::setOrientation (o);
1029 1029
 }
1030 1030
 
1031 1031
 kpColorToolBar::~kpColorToolBar ()

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

@@ -245,7 +245,7 @@ private:
245 245
 };
246 246
 
247 247
 
248
-class kpColorToolBar : public KToolBar
248
+class kpColorToolBar : public TDEToolBar
249 249
 {
250 250
 Q_OBJECT
251 251
   

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

@@ -81,7 +81,7 @@ protected:
81 81
 
82 82
 
83 83
 kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, int colsOrRows, const char *name)
84
-    : KToolBar ((TQWidget *) mainWindow, name, false/*don't use global toolBar settings*/, true/*readConfig*/),
84
+    : TDEToolBar ((TQWidget *) mainWindow, name, false/*don't use global toolBar settings*/, true/*readConfig*/),
85 85
       m_vertCols (colsOrRows),
86 86
       m_buttonGroup (0),
87 87
       m_baseWidget (0),
@@ -507,7 +507,7 @@ void kpToolToolBar::slotToolActionActivated ()
507 507
 
508 508
     if (m_currentTool)
509 509
     {
510
-        // If the user clicks on the same KToggleAction, it unchecks it
510
+        // If the user clicks on the same TDEToggleAction, it unchecks it
511 511
         // - this is inconsistent with the Tool Box so always make sure it's
512 512
         // checked.
513 513
         kpToolAction *action = m_currentTool->action ();
@@ -620,7 +620,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
620 620
         }
621 621
     }
622 622
 
623
-    KToolBar::setOrientation (o);
623
+    TDEToolBar::setOrientation (o);
624 624
 }
625 625
 
626 626
 // private

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

@@ -51,7 +51,7 @@ class kpToolWidgetLineWidth;
51 51
 class kpToolWidgetOpaqueOrTransparent;
52 52
 class kpToolWidgetSpraycanSize;
53 53
 
54
-class kpToolToolBar : public KToolBar
54
+class kpToolToolBar : public TDEToolBar
55 55
 {
56 56
 Q_OBJECT
57 57
   

+ 2
- 2
kooka/dwmenuaction.cpp View File

@@ -31,10 +31,10 @@
31 31
 #include "dwmenuaction.moc"
32 32
 //-------------------------------------
33 33
 
34
-dwMenuAction::dwMenuAction( const TQString& text, const KShortcut& cut,
34
+dwMenuAction::dwMenuAction( const TQString& text, const TDEShortcut& cut,
35 35
 			    KDockWidget *dw,TQObject* parent,
36 36
 			    KDockMainWindow *mw, const char* name )
37
-    :KToggleAction(text,cut,parent,name),m_dw(dw),m_mw(mw)
37
+    :TDEToggleAction(text,cut,parent,name),m_dw(dw),m_mw(mw)
38 38
 {
39 39
     connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
40 40
     connect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged()));

+ 3
- 3
kooka/dwmenuaction.h View File

@@ -35,18 +35,18 @@
35 35
 
36 36
 /**
37 37
  * This class is just a helper class since the KDockWidget classes do not yet
38
- * export KActions but only a TQPopup-Pointer, which is quite useless in case
38
+ * export TDEActions but only a TQPopup-Pointer, which is quite useless in case
39 39
  * you have a xml-file driven gui.
40 40
  * This class provides Actions for show and hide parts of the GUI (dockwidgets)
41 41
  * Maybe that classes can be removed as soon the DockWidget know Actions
42 42
  */
43
-class dwMenuAction:public KToggleAction
43
+class dwMenuAction:public TDEToggleAction
44 44
 {
45 45
    Q_OBJECT
46 46
   
47 47
 public:
48 48
    dwMenuAction( const TQString& text,
49
-		 const KShortcut& cut = KShortcut(),
49
+		 const TDEShortcut& cut = TDEShortcut(),
50 50
 		 KDockWidget *dw=0, TQObject* parent = 0,
51 51
 		 KDockMainWindow * mw=0, const char* name = 0 );
52 52
    virtual ~dwMenuAction();

+ 27
- 27
kooka/kooka.cpp View File

@@ -137,26 +137,26 @@ actionCollection());
137 137
     m_view->createDockMenu(actionCollection(), this, "settings_show_docks" );
138 138
 
139 139
     /* Image Viewer action Toolbar - OCR, Scaling etc. */
140
-    (void) new KAction(i18n("&OCR Image..."), "ocr", CTRL+Key_O,
140
+    (void) new TDEAction(i18n("&OCR Image..."), "ocr", CTRL+Key_O,
141 141
 		       m_view, TQT_SLOT(doOCR()),
142 142
 		       actionCollection(), "ocrImage" );
143 143
 
144
-    (void) new KAction(i18n("O&CR on Selection..."), "ocr-select", CTRL+Key_C,
144
+    (void) new TDEAction(i18n("O&CR on Selection..."), "ocr-select", CTRL+Key_C,
145 145
 		       m_view, TQT_SLOT(doOCRonSelection()),
146 146
 		       actionCollection(), "ocrImageSelect" );
147 147
 
148
-    KAction *act;
149
-    act =  new KAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I,
148
+    TDEAction *act;
149
+    act =  new TDEAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I,
150 150
 		       m_view, TQT_SLOT( slIVScaleToWidth()),
151 151
 		       actionCollection(), "scaleToWidth" );
152 152
     m_view->connectViewerAction( act );
153 153
 
154
-    act = new KAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H,
154
+    act = new TDEAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H,
155 155
 		       m_view, TQT_SLOT( slIVScaleToHeight()),
156 156
 		       actionCollection(), "scaleToHeight" );
157 157
     m_view->connectViewerAction( act );
158 158
 
159
-    act = new KAction(i18n("Original &Size"), "scaleorig", CTRL+Key_S,
159
+    act = new TDEAction(i18n("Original &Size"), "scaleorig", CTRL+Key_S,
160 160
                       m_view, TQT_SLOT( slIVScaleOriginal()),
161 161
                       actionCollection(), "scaleOriginal" );
162 162
     m_view->connectViewerAction( act );
@@ -166,10 +166,10 @@ actionCollection());
166 166
     TQIconSet lockSet;
167 167
     lockSet.setPixmap(BarIcon("lock")  , TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::On );
168 168
     lockSet.setPixmap(BarIcon("unlock"), TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::Off);
169
-    act = new KToggleAction ( i18n("Keep &Zoom Setting"), lockSet, CTRL+Key_Z,
169
+    act = new TDEToggleAction ( i18n("Keep &Zoom Setting"), lockSet, CTRL+Key_Z,
170 170
                               actionCollection(), "keepZoom" );
171 171
 #else
172
-    act = new KToggleAction( i18n("Keep &Zoom Setting"), BarIcon("lockzoom"), CTRL+Key_Z,
172
+    act = new TDEToggleAction( i18n("Keep &Zoom Setting"), BarIcon("lockzoom"), CTRL+Key_Z,
173 173
                              actionCollection(), "keepZoom" );
174 174
 #endif
175 175
 
@@ -179,93 +179,93 @@ actionCollection());
179 179
     m_view->connectViewerAction( act );
180 180
 
181 181
     /* thumbview and gallery actions */
182
-    act = new KAction(i18n("Set Zoom..."), "viewmag", 0,
182
+    act = new TDEAction(i18n("Set Zoom..."), "viewmag", 0,
183 183
 		       TQT_TQOBJECT(m_view), TQT_SLOT( slIVShowZoomDialog()),
184 184
 		       actionCollection(), "showZoomDialog" );
185 185
     m_view->connectViewerAction( act );
186 186
 
187
-    (void) new KAction(i18n("Create From Selectio&n"), "crop", CTRL+Key_N,
187
+    (void) new TDEAction(i18n("Create From Selectio&n"), "crop", CTRL+Key_N,
188 188
 		       TQT_TQOBJECT(m_view), TQT_SLOT( slCreateNewImgFromSelection() ),
189 189
 		       actionCollection(), "createFromSelection" );
190 190
 
191
-    (void) new KAction(i18n("Mirror Image &Vertically"), "mirror-vert", CTRL+Key_V,
191
+    (void) new TDEAction(i18n("Mirror Image &Vertically"), "mirror-vert", CTRL+Key_V,
192 192
 		       TQT_TQOBJECT(this), TQT_SLOT( slMirrorVertical() ),
193 193
 		       actionCollection(), "mirrorVertical" );
194 194
 
195
-    (void) new KAction(i18n("&Mirror ImageQt::Horizontally"), "mirror-horiz", CTRL+Key_M,
195
+    (void) new TDEAction(i18n("&Mirror ImageQt::Horizontally"), "mirror-horiz", CTRL+Key_M,
196 196
 		       TQT_TQOBJECT(this), TQT_SLOT( slMirrorHorizontal() ),
197 197
 		       actionCollection(), "mirrorHorizontal" );
198 198
 
199
-    (void) new KAction(i18n("Mirror Image &Both Directions"), "mirror-both", CTRL+Key_B,
199
+    (void) new TDEAction(i18n("Mirror Image &Both Directions"), "mirror-both", CTRL+Key_B,
200 200
 		       TQT_TQOBJECT(this), TQT_SLOT( slMirrorBoth() ),
201 201
 		       actionCollection(), "mirrorBoth" );
202 202
 
203
-    (void) new KAction(i18n("Open Image in &Graphic Application..."), "fileopen", CTRL+Key_G,
203
+    (void) new TDEAction(i18n("Open Image in &Graphic Application..."), "fileopen", CTRL+Key_G,
204 204
 		       TQT_TQOBJECT(m_view), TQT_SLOT( slOpenCurrInGraphApp() ),
205 205
 		       actionCollection(), "openInGraphApp" );
206 206
 
207
-    act = new KAction(i18n("&Rotate Image Clockwise"), "rotate_cw", CTRL+Key_R,
207
+    act = new TDEAction(i18n("&Rotate Image Clockwise"), "rotate_cw", CTRL+Key_R,
208 208
 		      TQT_TQOBJECT(this), TQT_SLOT( slRotateClockWise() ),
209 209
 		       actionCollection(), "rotateClockwise" );
210 210
     m_view->connectViewerAction( act );
211 211
 
212
-    act = new KAction(i18n("Rotate Image Counter-Clock&wise"), "rotate_ccw", CTRL+Key_W,
212
+    act = new TDEAction(i18n("Rotate Image Counter-Clock&wise"), "rotate_ccw", CTRL+Key_W,
213 213
 		       TQT_TQOBJECT(this), TQT_SLOT( slRotateCounterClockWise() ),
214 214
 		       actionCollection(), "rotateCounterClockwise" );
215 215
     m_view->connectViewerAction( act );
216 216
 
217
-    act = new KAction(i18n("Rotate Image 180 &Degrees"), "rotate", CTRL+Key_D,
217
+    act = new TDEAction(i18n("Rotate Image 180 &Degrees"), "rotate", CTRL+Key_D,
218 218
 		       TQT_TQOBJECT(this), TQT_SLOT( slRotate180() ),
219 219
 		       actionCollection(), "upsitedown" );
220 220
     m_view->connectViewerAction( act );
221 221
 
222 222
     /* Gallery actions */
223
-    act = new KAction(i18n("&Create Folder..."), "folder_new", 0,
223
+    act = new TDEAction(i18n("&Create Folder..."), "folder_new", 0,
224 224
 		      TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotCreateFolder() ),
225 225
 		       actionCollection(), "foldernew" );
226 226
     m_view->connectGalleryAction( act );
227 227
 
228
-    act = new KAction(i18n("&Save Image..."), "filesave", 0,
228
+    act = new TDEAction(i18n("&Save Image..."), "filesave", 0,
229 229
 		      TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotExportFile() ),
230 230
 		       actionCollection(), "saveImage" );
231 231
     m_view->connectGalleryAction( act );
232 232
 
233
-    act = new KAction(i18n("&Import Image..."), "inline_image", 0,
233
+    act = new TDEAction(i18n("&Import Image..."), "inline_image", 0,
234 234
 		      TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotImportFile() ),
235 235
 		       actionCollection(), "importImage" );
236 236
     m_view->connectGalleryAction( act );
237 237
 
238
-    act = new KAction(i18n("&Delete Image"), "edittrash", 0,
238
+    act = new TDEAction(i18n("&Delete Image"), "edittrash", 0,
239 239
 		      TQT_TQOBJECT(m_view->gallery()),TQT_SLOT( slotDeleteItems() ),
240 240
 		       actionCollection(), "deleteImage" );
241 241
     m_view->connectGalleryAction( act );
242 242
 
243
-    act = new KAction(i18n("&Unload Image"), "fileclose", 0,