Browse Source

Rename a number of classes to enhance compatibility with KDE4

bug/2765/povray3.7
Timothy Pearson 8 years ago
parent
commit
65eca7929c
140 changed files with 1066 additions and 1066 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. +7
    -7
      ksnapshot/ksnapshot.cpp
  101. +20
    -20
      ksvg/plugin/ksvg_plugin.cpp
  102. +1
    -1
      ksvg/scripts/OPENREF
  103. +2
    -2
      kuickshow/ChangeLog
  104. +3
    -3
      kuickshow/src/filewidget.cpp
  105. +34
    -34
      kuickshow/src/imagewindow.cpp
  106. +3
    -3
      kuickshow/src/imagewindow.h
  107. +1
    -1
      kuickshow/src/kuickconfigdlg.cpp
  108. +2
    -2
      kuickshow/src/kuickconfigdlg.h
  109. +37
    -37
      kuickshow/src/kuickshow.cpp
  110. +8
    -8
      kuickshow/src/kuickshow.h
  111. +15
    -15
      kview/kview.cpp
  112. +10
    -10
      kview/kview.h
  113. +1
    -1
      kview/kviewcanvas/config/generalconfigwidget.ui
  114. +12
    -12
      kview/kviewviewer/kviewviewer.cpp
  115. +16
    -16
      kview/kviewviewer/kviewviewer.h
  116. +3
    -3
      kview/modules/browser/kviewbrowser.h
  117. +3
    -3
      kview/modules/effects/kvieweffects.cpp
  118. +2
    -2
      kview/modules/presenter/DESIGN
  119. +1
    -1
      kview/modules/presenter/imagelistdialog.ui
  120. +2
    -2
      kview/modules/presenter/imagelistitem.cpp
  121. +2
    -2
      kview/modules/presenter/imagelistitem.h
  122. +6
    -6
      kview/modules/presenter/kviewpresenter.cpp
  123. +5
    -5
      kview/modules/presenter/kviewpresenter.h
  124. +1
    -1
      kview/modules/scale/kview_scale.cpp
  125. +1
    -1
      kview/modules/scanner/kviewscanner.cpp
  126. +1
    -1
      kview/modules/template/kviewtemplate.cpp
  127. +3
    -3
      kview/photobook/photobook.h
  128. +20
    -20
      kviewshell/kviewpart.cpp
  129. +25
    -25
      kviewshell/kviewpart.h
  130. +1
    -1
      kviewshell/kviewshell.cpp
  131. +4
    -4
      kviewshell/kviewshell.h
  132. +1
    -1
      kviewshell/marklist.cpp
  133. +2
    -2
      kviewshell/marklist.h
  134. +2
    -2
      kviewshell/plugins/djvu/djvumultipage.cpp
  135. +3
    -3
      kviewshell/plugins/djvu/djvumultipage.h
  136. +3
    -3
      kviewshell/tableOfContents.cpp
  137. +2
    -2
      kviewshell/tableOfContents.h
  138. +1
    -1
      kviewshell/tdemultipage.h
  139. +1
    -1
      libkscan/img_canvas.cpp
  140. +3
    -3
      libkscan/previewer.cpp

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

@ -51,8 +51,8 @@ KKameraConfig *KKameraConfig::m_instance = NULL;
KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &)
: TDECModule(KKameraConfigFactory::instance(), parent, name)
{
m_devicePopup = new KPopupMenu(this);
m_actions = new KActionCollection(this);
m_devicePopup = new TDEPopupMenu(this);
m_actions = new TDEActionCollection(this);
m_config = new KSimpleConfig(KProtocolInfo::config("camera"));
m_context = gp_context_new();
@ -100,7 +100,7 @@ void KKameraConfig::displayGPSuccessDialogue(void)
TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, 0);
topLayout->setAutoAdd(true);
m_toolbar = new KToolBar(this, "ToolBar");
m_toolbar = new TDEToolBar(this, "ToolBar");
m_toolbar->setMovingEnabled(false);
// create list of devices
@ -116,26 +116,26 @@ void KKameraConfig::displayGPSuccessDialogue(void)
m_deviceSel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
// create actions
KAction *act;
TDEAction *act;
act = new KAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
act = new TDEAction(i18n("Add"), "camera", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_addCamera()), m_actions, "camera_add");
act->setWhatsThis(i18n("Click this button to add a new camera."));
act->plug(m_toolbar);
m_toolbar->insertLineSeparator();
act = new KAction(i18n("Test"), "camera_test", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
act = new TDEAction(i18n("Test"), "camera_test", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_testCamera()), m_actions, "camera_test");
act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
act->plug(m_toolbar);
act = new KAction(i18n("Remove"), "edittrash", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
act = new TDEAction(i18n("Remove"), "edittrash", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_removeCamera()), m_actions, "camera_remove");
act->setWhatsThis(i18n("Click this button to remove the selected camera from the list."));
act->plug(m_toolbar);
act = new KAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
act = new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_configureCamera()), m_actions, "camera_configure");
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."));
act->plug(m_toolbar);
act = new KAction(i18n("Information"), "hwinfo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
act = new TDEAction(i18n("Information"), "hwinfo", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cameraSummary()), m_actions, "camera_summary");
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."));
act->plug(m_toolbar);
m_toolbar->insertLineSeparator();
act = new KAction(i18n("Cancel"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
act = new TDEAction(i18n("Cancel"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slot_cancelOperation()), m_actions, "camera_cancel");
act->setWhatsThis(i18n("Click this button to cancel the current camera operation."));
act->setEnabled(false);
act->plug(m_toolbar);


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

@ -40,9 +40,9 @@ class KCamera;
class KameraDeviceSelectDialog;
class KSimpleConfig;
class KIconView;
class KActionCollection;
class KToolBar;
class KPopupMenu;
class TDEActionCollection;
class TDEToolBar;
class TDEPopupMenu;
class KKameraConfig : public TDECModule
{
@ -101,10 +101,10 @@ private:
// widgets for the cameras listview
KIconView *m_deviceSel;
KActionCollection *m_actions;
TDEActionCollection *m_actions;
TQPushButton *m_addCamera, *m_removeCamera, *m_testCamera, *m_configureCamera;
KToolBar *m_toolbar;
KPopupMenu *m_devicePopup;
TDEToolBar *m_toolbar;
TDEPopupMenu *m_devicePopup;
// true if libgphoto2 was initialised successfully in
// the constructor


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

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


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

@ -29,7 +29,7 @@
class TDEConfig;
class TQString;
class KListView;
class TDEListView;
class TQWidgetStack;
class TQVButtonGroup;
class TQVGroupBox;
@ -105,7 +105,7 @@ protected:
void setPortType(int type);
// port settings widgets
KListView *m_modelSel;
TDEListView *m_modelSel;
TQLineEdit *m_nameEdit;
TQWidgetStack *m_settingsStack;
TQVButtonGroup *m_portSelectGroup;


+ 8
- 8
kcoloredit/kcoloredit.cpp View File

@ -40,7 +40,7 @@
#include <kstatusbar.h>
KColorEditApp::KColorEditApp() : KMainWindow(0) {
KColorEditApp::KColorEditApp() : TDEMainWindow(0) {
config=kapp->config();
///////////////////////////////////////////////////////////////////
@ -74,7 +74,7 @@ void KColorEditApp::initActions()
m_actRecent = KStdAction::openRecent( TQT_TQOBJECT(this),
TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
( void ) new KAction( i18n("New &Window"), kapp->miniIcon(), KShortcut(),
( void ) new TDEAction( i18n("New &Window"), kapp->miniIcon(), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( slotFileNewWindow() ), actionCollection(),
"file_new_window" );
@ -89,14 +89,14 @@ void KColorEditApp::initActions()
m_actPaste->setEnabled( false );
// Color Menu
m_actNames = new KToggleAction( i18n("Show &Color Names"), KShortcut(), TQT_TQOBJECT(this),
m_actNames = new TDEToggleAction( i18n("Show &Color Names"), TDEShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( slotViewColorNames() ), actionCollection(),
"color_view_names" );
m_actNames->setCheckedState(i18n("Hide &Color Names"));
m_actPalette = new KAction( i18n("From &Palette"), KShortcut(), TQT_TQOBJECT(this),
m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( slotColorFromPalette() ), actionCollection(),
"color_from_palette" );
( void ) new KAction( i18n("From &Screen"), KShortcut(), TQT_TQOBJECT(this),
( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( slotColorFromScreen() ), actionCollection(),
"color_from_screen" );
}
@ -125,7 +125,7 @@ void KColorEditApp::initDocument()
void KColorEditApp::initView()
{
////////////////////////////////////////////////////////////////////
// create the main widget here that is managed by KMainWindow's view-region
// create the main widget here that is managed by TDEMainWindow's view-region
// and connect the widget to your document to display document contents.
view = new KColorEditView(this);
@ -303,7 +303,7 @@ void KColorEditApp::slotQuit()
saveOptions();
// close the first window, the list makes the next one the first again.
// This ensures that queryClose() is called on each window to ask for closing
KMainWindow* w;
TDEMainWindow* w;
if(memberList)
{
for(w=memberList->first(); w!=0; w=memberList->next())
@ -357,7 +357,7 @@ void KColorEditApp::mouseReleaseEvent(TQMouseEvent* event) {
color.setComponents(rgbColor.red(), rgbColor.green(), rgbColor.blue());
view->chooseColor(&color);
} else
KMainWindow::mouseReleaseEvent(event);
TDEMainWindow::mouseReleaseEvent(event);
}
#include "kcoloredit.moc"

+ 16
- 16
kcoloredit/kcoloredit.h View File

@ -41,17 +41,17 @@ class KColorEditView;
* window and reads the config file as well as providing a menubar, toolbar
* and statusbar. An instance of KColorEditView creates your center view, which is connected
* to the window's Doc object.
* KColorEditApp reimplements the methods that KMainWindow provides for main window handling and supports
* full session management as well as keyboard accelerator configuration by using KAccel.
* @see KMainWindow
* KColorEditApp reimplements the methods that TDEMainWindow provides for main window handling and supports
* full session management as well as keyboard accelerator configuration by using TDEAccel.
* @see TDEMainWindow
* @see TDEApplication
* @see TDEConfig
* @see KAccel
* @see TDEAccel
*
* @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
* @version KDevelop version 0.4 code generation
*/
class KColorEditApp : public KMainWindow
class KColorEditApp : public TDEMainWindow
{
Q_OBJECT
@ -68,7 +68,7 @@ class KColorEditApp : public KMainWindow
/** opens a file specified by commandline option
*/
void openDocumentFile(const char *_cmdl=0);
/** returns a pointer to the current document connected to the KMainWindow instance and is used by
/** returns a pointer to the current document connected to the TDEMainWindow instance and is used by
* the View class to access the document object's methods
*/
KColorEditDoc *document() const;
@ -92,21 +92,21 @@ class KColorEditApp : public KMainWindow
* @see initView();
*/
void initDocument();
/** creates the centerwidget of the KMainWindow instance and sets it as the view
/** creates the centerwidget of the TDEMainWindow instance and sets it as the view
*/
void initView();
/** queryClose is called by KMainWindow on each closeEvent of a window. Against the
/** queryClose is called by TDEMainWindow on each closeEvent of a window. Against the
* default implementation (only returns true), this calles saveModified() on the document object to ask if the document shall
* be saved if Modified; on cancel the closeEvent is rejected.
* @see KMainWindow#queryClose
* @see KMainWindow#closeEvent
* @see TDEMainWindow#queryClose
* @see TDEMainWindow#closeEvent
*/
virtual bool queryClose();
/** queryExit is called by KMainWindow when the last window of the application is going to be closed during the closeEvent().
/** queryExit is called by TDEMainWindow when the last window of the application is going to be closed during the closeEvent().
* Against the default implementation that just returns true, this calls saveOptions() to save the settings of the last window's
* properties.
* @see KMainWindow#queryExit
* @see KMainWindow#closeEvent
* @see TDEMainWindow#queryExit
* @see TDEMainWindow#closeEvent
*/
virtual bool queryExit();
@ -168,9 +168,9 @@ class KColorEditApp : public KMainWindow
/** the configuration object of the application */
TDEConfig *config;
KAction *m_actSave, *m_actCut, *m_actCopy, *m_actPaste, *m_actPalette;
KToggleAction *m_actNames;
KRecentFilesAction *m_actRecent;
TDEAction *m_actSave, *m_actCut, *m_actCopy, *m_actPaste, *m_actPalette;
TDEToggleAction *m_actNames;
TDERecentFilesAction *m_actRecent;
/** view is the main widget which represents your working area. The View
* 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;
/** KColorEditDoc provides a document object for a document-view model.
*
* The KColorEditDoc class provides a document object that can be used in conjunction with the classes KColorEditApp and KColorEditView
* to create a document-view model for standard TDE applications based on TDEApplication and KMainWindow. Thereby, the document object
* to create a document-view model for standard TDE applications based on TDEApplication and TDEMainWindow. Thereby, the document object
* is created by the KColorEditApp instance and contains the document structure with the according methods for manipulation of the document
* data by KColorEditView objects. Also, KColorEditDoc contains the methods for serialization of the document data from and to files.
*


+ 1
- 1
kcoloredit/kcoloreditview.h View File

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


+ 1
- 1
kcoloredit/kzcolorselector.cpp View File

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


+ 1
- 1
kcoloredit/kzcolorselector.h View File

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


+ 1
- 1
kdvi/dviRenderer.h View File

@ -27,7 +27,7 @@ class dviRenderer;
class fontProgressDialog;
class ghostscript_interface;
class infoDialog;
class KAction;
class TDEAction;
class KDVIMultiPage;
class KPrinter;
class TDEProcess;


+ 5
- 5
kdvi/kdvi_multipage.cpp View File

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


+ 4
- 4
kdvi/kdvi_multipage.h View File

@ -87,10 +87,10 @@ private:
/** Pointers to several actions which are disabled if no file is
loaded. */
KAction *docInfoAction;
KAction *embedPSAction;
KAction *exportPDFAction;
KAction *exportPSAction;
TDEAction *docInfoAction;
TDEAction *embedPSAction;
TDEAction *exportPDFAction;
TDEAction *exportPSAction;
};


+ 1
- 1
kfax/ChangeLog View File

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


+ 6
- 6
kfax/kfax.cpp View File

@ -189,7 +189,7 @@ bool MyApp::x11EventFilter( XEvent * ev)
}
TopLevel::TopLevel (TQWidget *, const char *name)
: KMainWindow (0, name)
: TDEMainWindow (0, name)
{
setMinimumSize (100, 100);
@ -244,7 +244,7 @@ void TopLevel::setupMenuBar()
actionCollection() );
actPrint = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection() );
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
actAdd = new KAction( i18n( "A&dd..." ), "filenew", KShortcut(), TQT_TQOBJECT(this),
actAdd = new TDEAction( i18n( "A&dd..." ), "filenew", TDEShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( faxAdd() ), actionCollection(), "file_add_fax" );
actRecent->setMaxItems( 5 );
@ -256,11 +256,11 @@ void TopLevel::setupMenuBar()
actZoomOut = KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( zoomout() ),
actionCollection() );
actRotate = new KAction( i18n( "&Rotate Page" ), "rotate", KShortcut(), TQT_TQOBJECT(this),
actRotate = new TDEAction( i18n( "&Rotate Page" ), "rotate", TDEShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( rotatePage() ), actionCollection(), "view_rotate" );
actMirror = new KAction( i18n( "Mirror Page" ), KShortcut(), TQT_TQOBJECT(this),
actMirror = new TDEAction( i18n( "Mirror Page" ), TDEShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( mirrorPage() ), actionCollection(), "view_mirror" );
actFlip = new KAction( i18n( "&Flip Page" ), KShortcut(), TQT_TQOBJECT(this),
actFlip = new TDEAction( i18n( "&Flip Page" ), TDEShortcut(), TQT_TQOBJECT(this),
TQT_SLOT( flipPage() ), actionCollection(), "view_flip" );
// Go menu
@ -560,7 +560,7 @@ void TopLevel::openadd(TQString filename)
void TopLevel::resizeEvent(TQResizeEvent *e)
{
KMainWindow::resizeEvent(e);
TDEMainWindow::resizeEvent(e);
resizeView();
}


+ 8
- 8
kfax/kfax.h View File

@ -38,20 +38,20 @@
class TQPopupMenu;
class TDEConfig;
class KStatusBar;
class KAction;
class KRecentFilesAction;
class TDEAction;
class TDERecentFilesAction;
class KPrinter;
class TQPainter;
class TQScrollBar;
typedef KToolBar::BarPosition BarPosition;
typedef TDEToolBar::BarPosition BarPosition;
class MyApp:public TDEApplication {
public:
virtual bool x11EventFilter( XEvent * );
};
class TopLevel : public KMainWindow
class TopLevel : public TDEMainWindow
{
Q_OBJECT
@ -105,10 +105,10 @@ private:
KURL fileURL;
KStatusBar *statusbar;
KRecentFilesAction *actRecent;
KAction *actAdd, *actSave, *actSaveAs, *actPrint;
KAction *actSize, *actZoomIn, *actZoomOut, *actRotate, *actMirror;
KAction *actFlip, *actNext, *actPrev, *actFirst, *actLast;
TDERecentFilesAction *actRecent;
TDEAction *actAdd, *actSave, *actSaveAs, *actPrint;
TDEAction *actSize, *actZoomIn, *actZoomOut, *actRotate, *actMirror;
TDEAction *actFlip, *actNext, *actPrev, *actFirst, *actLast;
int open_mode;


+ 25
- 25
kghostview/kgv_view.cpp View File

@ -187,34 +187,34 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
//-- File Menu ----------------------------------------------------------
KStdAction::saveAs( document(), TQT_SLOT( saveAs() ),
actionCollection() );
new KAction( i18n( "Document &Info" ), 0,
new TDEAction( i18n( "Document &Info" ), 0,
miniWidget(), TQT_SLOT( info() ),
actionCollection(), "info" );
//-- Edit Menu -----------------------------------------------------
_popup = new KPopupMenu( _markList, "marklist_menu" );
_popup = new TDEPopupMenu( _markList, "marklist_menu" );
KAction *act = new KAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
TDEAction *act = new TDEAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ),
actionCollection(), "mark_current" );
act->plug( _popup );
act = new KAction( i18n( "Mark &All Pages" ), 0,
act = new TDEAction( i18n( "Mark &All Pages" ), 0,
TQT_TQOBJECT(_markList), TQT_SLOT( markAll() ),
actionCollection(), "mark_all" );
act->plug( _popup );
act = new KAction( i18n( "Mark &Even Pages" ), 0,
act = new TDEAction( i18n( "Mark &Even Pages" ), 0,
TQT_TQOBJECT(_markList), TQT_SLOT( markEven() ),
actionCollection(), "mark_even" );
act->plug( _popup );
act = new KAction( i18n( "Mark &Odd Pages" ), 0,
act = new TDEAction( i18n( "Mark &Odd Pages" ), 0,
TQT_TQOBJECT(_markList), TQT_SLOT( markOdd() ),
actionCollection(), "mark_odd" );
act->plug( _popup );
act = new KAction( i18n( "&Toggle Page Marks" ), 0,
act = new TDEAction( i18n( "&Toggle Page Marks" ), 0,
TQT_TQOBJECT(_markList), TQT_SLOT( toggleMarks() ),
actionCollection(), "toggle" );
act->plug( _popup );
act = new KAction( i18n("&Remove Page Marks"), 0,
act = new TDEAction( i18n("&Remove Page Marks"), 0,
TQT_TQOBJECT(_markList), TQT_SLOT( removeMarks() ),
actionCollection(), "remove" );
act->plug( _popup );
@ -222,12 +222,12 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
// TODO -- disable entry if there aren't any page names
//-- View Menu ----------------------------------------------------------
_selectOrientation = new KSelectAction( i18n( "&Orientation" ), 0, 0, 0,
_selectOrientation = new TDESelectAction( i18n( "&Orientation" ), 0, 0, 0,
actionCollection(), "orientation_menu" );
_selectMedia = new KSelectAction( i18n( "Paper &Size" ), 0, 0, 0,
_selectMedia = new TDESelectAction( i18n( "Paper &Size" ), 0, 0, 0,
actionCollection(), "media_menu" );
_flick = new KToggleAction( i18n( "No &Flicker" ), 0,
_flick = new TDEToggleAction( i18n( "No &Flicker" ), 0,
this, TQT_SLOT( slotFlicker() ),
actionCollection(), "no_flicker" );
@ -245,7 +245,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
this, TQT_SLOT( slotMedia( int ) ) );
{
KShortcut zoomInShort = KStdAccel::zoomIn();
TDEShortcut zoomInShort = TDEStdAccel::zoomIn();
zoomInShort.append( KKey( CTRL+Key_Equal ) );
_zoomIn = KStdAction::zoomIn( this, TQT_SLOT( slotZoomIn() ),
actionCollection(), "zoomIn" );
@ -253,7 +253,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
}
_zoomOut = KStdAction::zoomOut( this, TQT_SLOT( slotZoomOut() ),
actionCollection(), "zoomOut" );
_zoomTo = new KSelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "zoomTo" );
_zoomTo = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, actionCollection(), "zoomTo" );
connect( _zoomTo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( slotZoom( const TQString& ) ) );
_zoomTo->setEditable( true );
_zoomTo->clear();
@ -273,18 +273,18 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
_zoomTo->setItems( zooms );
_zoomTo->setCurrentItem( idx );
_fitWidth = new KAction( i18n( "&Fit to Page Width" ), 0, this,
_fitWidth = new TDEAction( i18n( "&Fit to Page Width" ), 0, this,
TQT_SLOT( slotFitToPage() ), actionCollection(),
"fit_to_page");
_fitScreen = new KAction( i18n( "&Fit to Screen" ), Key_S, this,
_fitScreen = new TDEAction( i18n( "&Fit to Screen" ), Key_S, this,
TQT_SLOT( slotFitToScreen() ), actionCollection(),
"fit_to_screen");
_prevPage = new KAction( i18n( "Previous Page" ), CTRL+Key_PageUp, this, TQT_SLOT( slotPrevPage() ),
_prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, this, TQT_SLOT( slotPrevPage() ),
actionCollection(), "prevPage" );
_prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
_nextPage = new KAction( i18n( "Next Page" ), CTRL + Key_PageDown, this, TQT_SLOT( slotNextPage() ),
_nextPage = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, this, TQT_SLOT( slotNextPage() ),
actionCollection(), "nextPage" );
_nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
@ -296,15 +296,15 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
actionCollection(), "goToEnd" );
_lastPage->setWhatsThis( i18n( "Moves to the last page of the document" ) );
KShortcut readUpShort = KStdAccel::shortcut( KStdAccel::Prior );
TDEShortcut readUpShort = TDEStdAccel::shortcut( TDEStdAccel::Prior );
readUpShort.append( KKey( SHIFT+Key_Space ) );
_readUp = new KAction( i18n( "Read Up" ), "up",
_readUp = new TDEAction( i18n( "Read Up" ), "up",
readUpShort, this, TQT_SLOT( slotReadUp() ),
actionCollection(), "readUp" );
KShortcut readDownShort = KStdAccel::shortcut( KStdAccel::Next );
TDEShortcut readDownShort = TDEStdAccel::shortcut( TDEStdAccel::Next );
readDownShort.append( KKey( Key_Space ) );
_readDown = new KAction( i18n( "Read Down" ), "down",
_readDown = new TDEAction( i18n( "Read Down" ), "down",
readDownShort, this, TQT_SLOT( slotReadDown() ),
actionCollection(), "readDown" );
@ -312,16 +312,16 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
actionCollection(), "goToPage" );
//-- Settings Menu ------------------------------------------------------
_showScrollBars = new KToggleAction( i18n( "Show &Scrollbars" ), 0,
_showScrollBars = new TDEToggleAction( i18n( "Show &Scrollbars" ), 0,
actionCollection(), "show_scrollbars" );
_showScrollBars->setCheckedState(i18n("Hide &Scrollbars"));
_watchFile = new KToggleAction( i18n( "&Watch File" ), 0,
_watchFile = new TDEToggleAction( i18n( "&Watch File" ), 0,
this, TQT_SLOT( slotWatchFile() ),
actionCollection(), "watch_file" );
_showPageList = new KToggleAction( i18n( "Show &Page List" ), 0,
_showPageList = new TDEToggleAction( i18n( "Show &Page List" ), 0,
actionCollection(), "show_page_list" );
_showPageList->setCheckedState(i18n("Hide &Page List"));
_showPageLabels = new KToggleAction( i18n("Show Page &Labels"), 0,
_showPageLabels = new TDEToggleAction( i18n("Show Page &Labels"), 0,
actionCollection(), "show_page_labels" );
_showPageLabels->setCheckedState(i18n("Hide Page &Labels"));
KStdAction::preferences( this, TQT_SLOT( slotConfigure() ), actionCollection() );


+ 25
- 25
kghostview/kgv_view.h View File

@ -32,13 +32,13 @@ class TQFrame;
class TQWidget;
class TDEAboutData;
class KAction;
class KActionCollection;
class TDEAction;
class TDEActionCollection;
class KDirWatch;
class TDEInstance;
class KPopupMenu;
class KSelectAction;
class KToggleAction;
class TDEPopupMenu;
class TDESelectAction;
class TDEToggleAction;
class KGVBrowserExtension;
class KGVConfigDialog;
@ -187,26 +187,26 @@ private:
TQTimer* _fitTimer;
KSelectAction* _selectOrientation;
KSelectAction* _selectMedia;
KAction* _zoomIn;
KAction* _zoomOut;
KSelectAction* _zoomTo;
KAction * _fitWidth;
KAction * _fitScreen;
KAction* _prevPage;
KAction* _nextPage;
KAction* _firstPage;
KAction* _lastPage;
KAction* _readUp;
KAction* _readDown;
KAction* _gotoPage;
KToggleAction* _showScrollBars;
KToggleAction* _watchFile;
KToggleAction* _flick;
KToggleAction* _showPageList;
KToggleAction* _showPageLabels;
KPopupMenu* _popup;
TDESelectAction* _selectOrientation;
TDESelectAction* _selectMedia;
TDEAction* _zoomIn;
TDEAction* _zoomOut;
TDESelectAction* _zoomTo;
TDEAction * _fitWidth;
TDEAction * _fitScreen;
TDEAction* _prevPage;
TDEAction* _nextPage;
TDEAction* _firstPage;
TDEAction* _lastPage;
TDEAction* _readUp;
TDEAction* _readDown;
TDEAction* _gotoPage;
TDEToggleAction* _showScrollBars;
TDEToggleAction* _watchFile;
TDEToggleAction* _flick;
TDEToggleAction* _showPageList;
TDEToggleAction* _showPageLabels;
TDEPopupMenu* _popup;
TQFile _tmpFile;
TDEIO::TransferJob* _job;


+ 7
- 7
kghostview/kgvshell.cpp View File

@ -75,11 +75,11 @@ KGVShell::KGVShell() :
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() );
/*---- View -----------------------------------------------------------*/
new KAction( i18n( "&Reload" ), "reload",
KStdAccel::shortcut( KStdAccel::Reload ),
new TDEAction( i18n( "&Reload" ), "reload",
TDEStdAccel::shortcut( TDEStdAccel::Reload ),
m_gvpart, TQT_SLOT( reloadFile() ),
actionCollection(), "reload" );
new KAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this),
new TDEAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this),
TQT_SLOT( slotMaximize() ), actionCollection(),
"maximize");
_showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection() );
@ -93,14 +93,14 @@ KGVShell::KGVShell() :
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
#else
m_fullScreenAction = new KToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
m_fullScreenAction = new TDEToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
#endif
KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
//_popup = new KPopupMenu( i18n( "Full Screen Options" ), this, "rmb popup" );
_popup = new KPopupMenu( this, "rmb popup" );
//_popup = new TDEPopupMenu( i18n( "Full Screen Options" ), this, "rmb popup" );
_popup = new TDEPopupMenu( this, "rmb popup" );
_popup->insertTitle( i18n( "Full Screen Options" ) );
m_fullScreenAction->plug( _popup );
_showMenuBarAction->plug( _popup );
@ -339,7 +339,7 @@ void KGVShell::slotUpdateFullScreen()
m_gvpart->updateFullScreen( false );
menuBar()->show();
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
KToggleAction *statusbarAction = dynamic_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar)));
TDEToggleAction *statusbarAction = dynamic_cast<TDEToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar)));
assert( statusbarAction );
if (statusbarAction->isChecked()) statusBar()->show();
#endif


+ 8
- 8
kghostview/kgvshell.h View File

@ -25,13 +25,13 @@
class TQTimer;
class KRecentFilesAction;
class TDERecentFilesAction;
class ScrollBox;
class KGVPart;
class KAction;
class TDEAction;
class TDEConfig;
class KTempFile;
class KPopupMenu;
class TDEPopupMenu;
class DisplayOptions;
class FullScreenFilter;
@ -79,12 +79,12 @@ private:
KGVPart* m_gvpart;
TQString cwd;
KAction* openact;
KToggleAction* _showMenuBarAction;
KToggleAction* m_fullScreenAction;
TDEAction* openact;
TDEToggleAction* _showMenuBarAction;
TDEToggleAction* m_fullScreenAction;
FullScreenFilter* m_fsFilter;
KPopupMenu* _popup;
KRecentFilesAction* recent;
TDEPopupMenu* _popup;
TDERecentFilesAction* recent;
KTempFile* _tmpFile; // Used for storing data received from stdin
};


+ 1
- 1
kiconedit/kiconconfig.h View File

@ -32,7 +32,7 @@
#include "config.h"
#endif
class KAccel;
class TDEAccel;
class KKeyChooser;
class KColorButton;
class KURLRequester;


+ 30
- 30
kiconedit/kiconedit.cpp View File

@ -34,7 +34,7 @@
WindowList KIconEdit::windowList;
KIconEdit::KIconEdit(const TQImage image, const char *name)
: KMainWindow(0, name)
: TDEMainWindow(0, name)
{
init();
img = image;
@ -44,7 +44,7 @@ KIconEdit::KIconEdit(const TQImage image, const char *name)
}
KIconEdit::KIconEdit(KURL url, const char *name)
: KMainWindow(0, name)
: TDEMainWindow(0, name)
{
init();
icon->open(&img, url);
@ -234,12 +234,12 @@ void KIconEdit::setupActions()
{
kdDebug(4640) << "setupActions" << endl;
KAction *action;
KRadioAction *toolAction;
KShortcut cut;
TDEAction *action;
TDERadioAction *toolAction;
TDEShortcut cut;
// File Menu
action = new KAction(i18n("New &Window"), "window_new", cut,
action = new TDEAction(i18n("New &Window"), "window_new", cut,
TQT_TQOBJECT(this), TQT_SLOT(slotNewWin()), actionCollection(), "file_new_window");
action->setWhatsThis(i18n("New window\n\nOpens a new icon editor window."));
@ -284,18 +284,18 @@ void KIconEdit::setupActions()
"(Tip: Select \"Paste transparent pixels\" in the configuration dialog"
" if you also want to paste transparency.)"));
m_actPasteNew = new KAction( i18n( "Paste as &New" ), cut, TQT_TQOBJECT(grid),
m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, TQT_TQOBJECT(grid),
TQT_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" );
KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actionCollection());
KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection());
action = new KAction(i18n("Resi&ze..."), "transform", cut,
action = new TDEAction(i18n("Resi&ze..."), "transform", cut,
TQT_TQOBJECT(grid), TQT_SLOT(editResize()), actionCollection(), "edit_resize");
action->setWhatsThis(i18n("Resize\n\nSmoothly resizes the icon while"
" trying to preserve the contents"));
action = new KAction(i18n("&GrayScale"), "grayscale", cut,
action = new TDEAction(i18n("&GrayScale"), "grayscale", cut,
TQT_TQOBJECT(grid), TQT_SLOT(grayScale()), actionCollection(), "edit_grayscale");
action->setWhatsThis(i18n("Gray scale\n\nGray scale the current icon.\n"
"(Warning: The result is likely to contain colors not in the icon"
@ -310,23 +310,23 @@ void KIconEdit::setupActions()
actionCollection());
m_actZoomOut->setWhatsThis(i18n("Zoom out\n\nZoom out by one."));
KActionMenu *actMenu = new KActionMenu( i18n( "&Zoom" ), "viewmag",
TDEActionMenu *actMenu = new TDEActionMenu( i18n( "&Zoom" ), "viewmag",
actionCollection(), "view_zoom" );
// xgettext:no-c-format
action = new KAction( i18n( "100%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom1() ),
action = new TDEAction( i18n( "100%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom1() ),
actionCollection(), "view_zoom_1" );
actMenu->insert( action );
// xgettext:no-c-format
action = new KAction( i18n( "200%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom2() ),
action = new TDEAction( i18n( "200%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom2() ),
actionCollection(), "view_zoom_2" );
actMenu->insert( action );
// xgettext:no-c-format
action = new KAction( i18n( "500%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom5() ),
action = new TDEAction( i18n( "500%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom5() ),
actionCollection(), "view_zoom_5" );
actMenu->insert( action );
// xgettext:no-c-format
action = new KAction( i18n( "1000%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom10() ),
action = new TDEAction( i18n( "1000%" ), cut, TQT_TQOBJECT(this), TQT_SLOT( slotZoom10() ),
actionCollection(), "view_zoom_10" );
actMenu->insert( action );
@ -338,9 +338,9 @@ void KIconEdit::setupActions()
createStandardStatusBarAction();
KToggleAction *toggle;
TDEToggleAction *toggle;
toggle = new KToggleAction( i18n( "Show &Grid" ), "grid",
toggle = new TDEToggleAction( i18n( "Show &Grid" ), "grid",
cut, TQT_TQOBJECT(this), TQT_SLOT( slotShowGrid() ), actionCollection(),
"options_show_grid" );
toggle->setCheckedState(i18n("Hide &Grid"));
@ -349,14 +349,14 @@ void KIconEdit::setupActions()
toggle->setChecked( KIconEditProperties::self()->showGrid() );
// Tools Menu
toolAction = new KRadioAction(i18n("Color Picker"), "colorpicker",
toolAction = new TDERadioAction(i18n("Color Picker"), "colorpicker",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolPointer()), actionCollection(),
"tool_find_pixel");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Color Picker\n\nThe color of the pixel clicked"
" on will be the current draw color"));
toolAction = new KRadioAction(i18n("Freehand"), "paintbrush",
toolAction = new TDERadioAction(i18n("Freehand"), "paintbrush",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFreehand()), actionCollection(),
"tool_freehand");
toolAction->setExclusiveGroup("toolActions");
@ -365,64 +365,64 @@ void KIconEdit::setupActions()
toolAction->setChecked( true );
grid->setTool(KIconEditGrid::Freehand);
toolAction = new KRadioAction(i18n("Rectangle"), "rectangle",
toolAction = new TDERadioAction(i18n("Rectangle"), "rectangle",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolRectangle()), actionCollection(),
"tool_rectangle");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Rectangle\n\nDraw a rectangle"));
toolAction = new KRadioAction(i18n("Filled Rectangle"), "filledrectangle",
toolAction = new TDERadioAction(i18n("Filled Rectangle"), "filledrectangle",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledRectangle()), actionCollection(),
"tool_filled_rectangle");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Filled rectangle\n\nDraw a filled rectangle"));
toolAction = new KRadioAction(i18n("Circle"), "circle",
toolAction = new TDERadioAction(i18n("Circle"), "circle",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolCircle()), actionCollection(),
"tool_circle");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Circle\n\nDraw a circle"));
toolAction = new KRadioAction(i18n("Filled Circle"), "filledcircle",
toolAction = new TDERadioAction(i18n("Filled Circle"), "filledcircle",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledCircle()), actionCollection(),
"tool_filled_circle");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Filled circle\n\nDraw a filled circle"));
toolAction = new KRadioAction(i18n("Ellipse"), "ellipse",
toolAction = new TDERadioAction(i18n("Ellipse"), "ellipse",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolEllipse()), actionCollection(),
"tool_ellipse");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Ellipse\n\nDraw an ellipse"));
toolAction = new KRadioAction(i18n("Filled Ellipse"), "filledellipse",
toolAction = new TDERadioAction(i18n("Filled Ellipse"), "filledellipse",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFilledEllipse()), actionCollection(),
"tool_filled_ellipse");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Filled ellipse\n\nDraw a filled ellipse"));
toolAction = new KRadioAction(i18n("Spray"), "airbrush",
toolAction = new TDERadioAction(i18n("Spray"), "airbrush",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolSpray()), actionCollection(),
"tool_spray");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Spray\n\nDraw scattered pixels in the"
" current color"));
toolAction = new KRadioAction(i18n("Flood Fill"), "fill",
toolAction = new TDERadioAction(i18n("Flood Fill"), "fill",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolFlood()), actionCollection(),
"tool_flood_fill");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Flood fill\n\nFill adjoining pixels with"
" the same color with the current color"));
toolAction = new KRadioAction(i18n("Line"), "line",
toolAction = new TDERadioAction(i18n("Line"), "line",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolLine()), actionCollection(),
"tool_line");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Line\n\nDraw a straight line vertically,"
" horizontally or at 45 deg. angles"));
toolAction = new KRadioAction(i18n("Eraser (Transparent)"), "eraser",
toolAction = new TDERadioAction(i18n("Eraser (Transparent)"), "eraser",
cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolEraser()), actionCollection(),
"tool_eraser");
toolAction->setExclusiveGroup("toolActions");
@ -431,14 +431,14 @@ void KIconEdit::setupActions()
" different tool, first click on \"Erase\" then on the tool you want"
" to use)"));
toolAction = new KRadioAction(i18n("Rectangular Selection"),
toolAction = new TDERadioAction(i18n("Rectangular Selection"),
"selectrect", cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolSelectRect()),
actionCollection(), "edit_select_rectangle");
toolAction->setExclusiveGroup( "toolActions" );
toolAction->setWhatsThis(i18n("Select\n\nSelect a rectangular section"
" of the icon using the mouse."));
toolAction = new KRadioAction(i18n("Circular Selection"),
toolAction = new TDERadioAction(i18n("Circular Selection"),
"selectcircle", cut, TQT_TQOBJECT(this), TQT_SLOT(slotToolSelectCircle()),
actionCollection(), "edit_select_circle");
toolAction->setExclusiveGroup( "toolActions" );


+ 4
- 4
kiconedit/kiconedit.h View File

@ -56,7 +56,7 @@ class PaletteToolBar;
* @author Thomas Tanghus <tanghus@kde.org>
* @version 0.4
*/
class KIconEdit : public KMainWindow
class KIconEdit : public TDEMainWindow
{
Q_OBJECT
@ -150,9 +150,9 @@ protected:
TQImage img;
TQString m_name;
KAction *m_actCopy, *m_actPaste, *m_actCut, *m_actPasteNew;
KAction *m_actZoomIn, *m_actZoomOut;
KRecentFilesAction *m_actRecent;
TDEAction *m_actCopy, *m_actPaste, *m_actCut, *m_actPasteNew;
TDEAction *m_actZoomIn, *m_actZoomOut;
TDERecentFilesAction *m_actRecent;
};
#endif //__KICONEDIT_H__

+ 1
- 1
kiconedit/kiconeditslots.cpp View File

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


+ 1
- 1
kiconedit/palettetoolbar.cpp View File

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


+ 1
- 1
kiconedit/palettetoolbar.h View File

@ -29,7 +29,7 @@ class TQLabel;
class KSysColors;
class KCustomColors;
class PaletteToolBar : public KToolBar
class PaletteToolBar : public TDEToolBar
{
Q_OBJECT


+ 7
- 7
kolourpaint/kpcommandhistory.cpp View File

@ -253,18 +253,18 @@ struct kpCommandHistoryBasePrivate
kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig,
KActionCollection *ac)
TDEActionCollection *ac)
: d (new kpCommandHistoryBasePrivate ())
{
m_actionUndo = new KToolBarPopupAction (undoActionText (),
m_actionUndo = new TDEToolBarPopupAction (undoActionText (),
TQString::fromLatin1 ("undo"),
KStdAccel::shortcut (KStdAccel::Undo),
TDEStdAccel::shortcut (TDEStdAccel::Undo),
this, TQT_SLOT (undo ()),
ac, KStdAction::name (KStdAction::Undo));
m_actionRedo = new KToolBarPopupAction (redoActionText (),
m_actionRedo = new TDEToolBarPopupAction (redoActionText (),
TQString::fromLatin1 ("redo"),
KStdAccel::shortcut (KStdAccel::Redo),
TDEStdAccel::shortcut (TDEStdAccel::Redo),
this, TQT_SLOT (redo ()),
ac, KStdAction::name (KStdAction::Redo));
@ -771,7 +771,7 @@ void kpCommandHistoryBase::trimCommandLists ()
}
static void populatePopupMenu (KPopupMenu *popupMenu,
static void populatePopupMenu (TDEPopupMenu *popupMenu,
const TQString &undoOrRedo,
const TQValueList <kpCommand *> &commandList)
{
@ -791,7 +791,7 @@ static void populatePopupMenu (KPopupMenu *popupMenu,
if (it != commandList.end ())
{
// TODO: maybe have a scrollview show all the items instead
KPopupTitle *title = new KPopupTitle (popupMenu);
TDEPopupTitle *title = new TDEPopupTitle (popupMenu);
title->setTitle (i18n ("%n more item", "%n more items",
commandList.size () - i));


+ 4
- 4
kolourpaint/kpcommandhistory.h View File

@ -34,8 +34,8 @@
#include <tqvaluelist.h>
class KActionCollection;
class KToolBarPopupAction;
class TDEActionCollection;
class TDEToolBarPopupAction;
class kpDocument;
class kpMainWindow;
@ -136,7 +136,7 @@ Q_OBJECT
public:
kpCommandHistoryBase (bool doReadConfig, KActionCollection *ac);
kpCommandHistoryBase (bool doReadConfig, TDEActionCollection *ac);
virtual ~kpCommandHistoryBase ();
public:
@ -198,7 +198,7 @@ signals:
void documentRestored ();
protected:
KToolBarPopupAction *m_actionUndo, *m_actionRedo;
TDEToolBarPopupAction *m_actionUndo, *m_actionRedo;
// (Front element is the next one)
TQValueList <kpCommand *> m_undoCommandList;


+ 9
- 9
kolourpaint/kpmainwindow.cpp View File

@ -64,7 +64,7 @@
kpMainWindow::kpMainWindow ()
: KMainWindow (0/*parent*/, "mainWindow"),
: TDEMainWindow (0/*parent*/, "mainWindow"),
m_isFullyConstructed (false)
{
init ();
@ -74,7 +74,7 @@ kpMainWindow::kpMainWindow ()
}
kpMainWindow::kpMainWindow (const KURL &url)
: KMainWindow (0/*parent*/, "mainWindow"),
: TDEMainWindow (0/*parent*/, "mainWindow"),
m_isFullyConstructed (false)
{
init ();
@ -84,7 +84,7 @@ kpMainWindow::kpMainWindow (const KURL &url)
}
kpMainWindow::kpMainWindow (kpDocument *newDoc)
: KMainWindow (0/*parent*/, "mainWindow"),
: TDEMainWindow (0/*parent*/, "mainWindow"),
m_isFullyConstructed (false)
{
init ();
@ -295,8 +295,8 @@ void kpMainWindow::init ()
kdDebug () << "\tfirstTime: positioning toolbars" << endl;
#endif
m_toolToolBar->setBarPos (KToolBar::Left);
m_colorToolBar->setBarPos (KToolBar::Bottom);
m_toolToolBar->setBarPos (TDEToolBar::Left);
m_colorToolBar->setBarPos (TDEToolBar::Bottom);
TDEConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupGeneral);
TDEConfigBase *cfg = cfgGroupSaver.config ();
@ -311,7 +311,7 @@ void kpMainWindow::init ()
}
// private virtual [base KMainWindow]
// private virtual [base TDEMainWindow]
void kpMainWindow::readProperties (TDEConfig *cfg)
{
#if DEBUG_KP_MAIN_WINDOW
@ -363,8 +363,8 @@ void kpMainWindow::readProperties (TDEConfig *cfg)
}
// private virtual [base KMainWindow]
// WARNING: KMainWindow API Doc says "No user interaction is allowed
// private virtual [base TDEMainWindow]
// WARNING: TDEMainWindow API Doc says "No user interaction is allowed
// in this function!"
void kpMainWindow::saveProperties (TDEConfig *cfg)
{
@ -839,7 +839,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
}
// private virtual [base KMainWindow]