summaryrefslogtreecommitdiffstats
path: root/kdevdesigner
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:15:35 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:15:35 -0600
commitf78eb03afb8c9a380985d26286afc40b4c89b292 (patch)
tree3c087e2f119e645c902958c3bc3c802abf078ad0 /kdevdesigner
parentda1941ccadffe5ae70ee111c53f0ec2b3d990869 (diff)
downloadtdevelop-f78eb03afb8c9a380985d26286afc40b4c89b292.tar.gz
tdevelop-f78eb03afb8c9a380985d26286afc40b4c89b292.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kdevdesigner')
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.cpp70
-rw-r--r--kdevdesigner/designer/kdevdesigner_part.h14
-rw-r--r--kdevdesigner/src/kdevdesigner.h6
3 files changed, 45 insertions, 45 deletions
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index 2e84b2ad..8e639dc8 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -86,7 +86,7 @@ static TQIconSet createPartIconSet( const TQString &name )
void KDevDesignerPart::setupActions( )
{
- KAction *action;
+ TDEAction *action;
action = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
action = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection());
@@ -95,9 +95,9 @@ void KDevDesignerPart::setupActions( )
stateSync(action, m_widget->actionFileSave);
action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
stateSync(action, m_widget->actionFileSaveAs);
- action = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(fileSaveAs()), actionCollection(), "file_saveall");
+ action = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(fileSaveAs()), actionCollection(), "file_saveall");
stateSync(action, m_widget->actionFileSaveAll);
- new KAction(i18n("Create &Template..."), 0, this, TQT_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate");
+ new TDEAction(i18n("Create &Template..."), 0, this, TQT_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate");
action = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection());
stateSync(action, m_widget->actionEditUndo);
@@ -109,63 +109,63 @@ void KDevDesignerPart::setupActions( )
stateSync(action, m_widget->actionEditCopy);
action = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection());
stateSync(action, m_widget->actionEditPaste);
- action = new KAction(i18n("&Delete"), Key_Delete, this, TQT_SLOT(editDelete()), actionCollection(), "edit_delete");
+ action = new TDEAction(i18n("&Delete"), Key_Delete, this, TQT_SLOT(editDelete()), actionCollection(), "edit_delete");
stateSync(action, m_widget->actionEditDelete);
action = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection());
stateSync(action, m_widget->actionEditSelectAll);
- action = new KAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), actionCollection(), "edit_accels");
+ action = new TDEAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), actionCollection(), "edit_accels");
stateSync(action, m_widget->actionEditAccels);
- action = new KAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQT_SLOT(editFunctions()), actionCollection(), "edit_functions");
+ action = new TDEAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQT_SLOT(editFunctions()), actionCollection(), "edit_functions");
stateSync(action, m_widget->actionEditFunctions);
- action = new KAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQT_SLOT(editConnections()), actionCollection(), "edit_connections");
+ action = new TDEAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQT_SLOT(editConnections()), actionCollection(), "edit_connections");
stateSync(action, m_widget->actionEditConnections);
- action = new KAction(i18n("&Form Settings..."), 0, this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_formsettings");
+ action = new TDEAction(i18n("&Form Settings..."), 0, this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_formsettings");
stateSync(action, m_widget->actionEditFormSettings);
- action = new KAction(i18n("&Add File..."), 0, this, TQT_SLOT(projectAddFile()), actionCollection(), "project_addfile");
+ action = new TDEAction(i18n("&Add File..."), 0, this, TQT_SLOT(projectAddFile()), actionCollection(), "project_addfile");
stateSync(action, m_widget->actionProjectAddFile);
- action = new KAction(i18n("&Image Collection..."), 0, this, TQT_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection");
+ action = new TDEAction(i18n("&Image Collection..."), 0, this, TQT_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection");
stateSync(action, m_widget->actionEditPixmapCollection);
- action = new KAction(i18n("&Database Connections..."), 0, this, TQT_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections");
+ action = new TDEAction(i18n("&Database Connections..."), 0, this, TQT_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections");
stateSync(action, m_widget->actionEditDatabaseConnections);
- action = new KAction(i18n("&Designer Project Settings..."), 0, this, TQT_SLOT(projectSettings()), actionCollection(), "project_settings");
+ action = new TDEAction(i18n("&Designer Project Settings..."), 0, this, TQT_SLOT(projectSettings()), actionCollection(), "project_settings");
stateSync(action, m_widget->actionEditProjectSettings);
- KRadioAction *toggle;
- toggle = new KRadioAction(i18n("&Pointer"), createPartIconSet("designer_pointer.png"), Key_F2, actionCollection(), "tools_pointer");
+ TDERadioAction *toggle;
+ toggle = new TDERadioAction(i18n("&Pointer"), createPartIconSet("designer_pointer.png"), Key_F2, actionCollection(), "tools_pointer");
setupToolsAction(toggle, m_widget->actionPointerTool);
pointerAction = toggle;
- toggle = new KRadioAction(i18n("&Connect Signal/Slots"), createPartIconSet("designer_connecttool.png"), Key_F3, actionCollection(), "tools_connect");
+ toggle = new TDERadioAction(i18n("&Connect Signal/Slots"), createPartIconSet("designer_connecttool.png"), Key_F3, actionCollection(), "tools_connect");
setupToolsAction(toggle, m_widget->actionConnectTool);
- toggle = new KRadioAction(i18n("Tab &Order"), createPartIconSet("designer_ordertool.png"), Key_F4, actionCollection(), "tools_taborder");
+ toggle = new TDERadioAction(i18n("Tab &Order"), createPartIconSet("designer_ordertool.png"), Key_F4, actionCollection(), "tools_taborder");
setupToolsAction(toggle, m_widget->actionOrderTool);
- toggle = new KRadioAction(i18n("Set &Buddy"), createPartIconSet("designer_setbuddy.png"), Key_F12, actionCollection(), "tools_setbuddy");
+ toggle = new TDERadioAction(i18n("Set &Buddy"), createPartIconSet("designer_setbuddy.png"), Key_F12, actionCollection(), "tools_setbuddy");
setupToolsAction(toggle, m_widget->actionBuddyTool);
- new KAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox");
- new KAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets");
+ new TDEAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox");
+ new TDEAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets");
- action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize");
+ action = new TDEAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize");
stateSync(action, m_widget->actionEditAdjustSize);
- action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
+ action = new TDEAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
stateSync(action, m_widget->actionEditHLayout);
- action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
+ action = new TDEAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
stateSync(action, m_widget->actionEditVLayout);
- action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
+ action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
stateSync(action, m_widget->actionEditGridLayout);
- action = new KAction(i18n("Lay OutQt::Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith");
+ action = new TDEAction(i18n("Lay OutQt::Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith");
stateSync(action, m_widget->actionEditSplitHorizontal);
- action = new KAction(i18n("Lay OutQt::Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv");
+ action = new TDEAction(i18n("Lay OutQt::Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv");
stateSync(action, m_widget->actionEditSplitVertical);
- action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break");
+ action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break");
stateSync(action, m_widget->actionEditBreakLayout);
- toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer");
+ toggle = new TDERadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer");
setupToolsAction(toggle, m_widget->actionInsertSpacer);
- action = new KAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview");
+ action = new TDEAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview");
stateSync(action, m_widget->actionPreview);
- action = new KAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQT_SLOT(windowNext()), actionCollection(), "window_next");
+ action = new TDEAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQT_SLOT(windowNext()), actionCollection(), "window_next");
stateSync(action, m_widget->actionWindowNext);
- action = new KAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQT_SLOT(windowPrev()), actionCollection(), "window_prev");
+ action = new TDEAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQT_SLOT(windowPrev()), actionCollection(), "window_prev");
stateSync(action, m_widget->actionWindowPrevious);
action = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection());
@@ -184,7 +184,7 @@ void KDevDesignerPart::setReadWrite(bool rw)
void KDevDesignerPart::setModified(bool modified)
{
-/* KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
+/* TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
if (!save)
return;
if (modified)
@@ -209,7 +209,7 @@ bool KDevDesignerPart::saveFile()
return true;
}
-void KDevDesignerPart::stateSync( KAction * kaction, TQAction * qaction )
+void KDevDesignerPart::stateSync( TDEAction * kaction, TQAction * qaction )
{
if (!qaction)
return;
@@ -220,7 +220,7 @@ void KDevDesignerPart::stateSync( KAction * kaction, TQAction * qaction )
connect(ac, TQT_SIGNAL(actionEnabled(bool )), kaction, TQT_SLOT(setEnabled(bool )));
}
-void KDevDesignerPart::setupToolsAction( KRadioAction * toggle, TQAction * action )
+void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action )
{
if (!action)
return;
@@ -475,7 +475,7 @@ void KDevDesignerPart::setToggleActionChecked( bool b)
pointerAction->setChecked(true);
return;
}
- KRadioAction *kaction = m_actionMap[action];
+ TDERadioAction *kaction = m_actionMap[action];
if (!kaction)
return;
// kdDebug() << "untoggle action: " << kaction->text() << endl;
@@ -488,7 +488,7 @@ void KDevDesignerPart::setToggleActionOn( bool b )
{
if (!sender())
return;
- const KRadioAction *action = dynamic_cast<const KRadioAction *>(sender());
+ const TDERadioAction *action = dynamic_cast<const TDERadioAction *>(sender());
if (!action)
return;
// kdDebug() << (b?TQString("toggle"):TQString("untoggle")) << " action: " << action->text() << endl;
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h
index 48c0205e..d7c9bf3c 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -32,9 +32,9 @@ class TQWidget;
class TQPainter;
class KURL;
class MainWindow;
-class KAction;
+class TDEAction;
class TQAction;
-class KRadioAction;
+class TDERadioAction;
class KDevDesignerPart : public KInterfaceDesigner::Designer
{
@@ -70,8 +70,8 @@ protected:
void setupDesignerWindow();
void setupActions();
- void stateSync(KAction *kaction, TQAction *qaction);
- void setupToolsAction(KRadioAction *toggle, TQAction *action);
+ void stateSync(TDEAction *kaction, TQAction *qaction);
+ void setupToolsAction(TDERadioAction *toggle, TQAction *action);
protected slots:
void setToggleActionChecked(bool b);
@@ -120,9 +120,9 @@ protected slots:
private:
MainWindow *m_widget;
- TQMap<const TQAction*, KRadioAction*> m_actionMap;
- TQMap<const KRadioAction*, TQAction*> m_actionMap2;
- KRadioAction* pointerAction;
+ TQMap<const TQAction*, TDERadioAction*> m_actionMap;
+ TQMap<const TDERadioAction*, TQAction*> m_actionMap2;
+ TDERadioAction* pointerAction;
};
class TDEInstance;
diff --git a/kdevdesigner/src/kdevdesigner.h b/kdevdesigner/src/kdevdesigner.h
index 2fda0a78..76397bec 100644
--- a/kdevdesigner/src/kdevdesigner.h
+++ b/kdevdesigner/src/kdevdesigner.h
@@ -29,7 +29,7 @@
#include <kapplication.h>
#include <tdeparts/mainwindow.h>
-class KToggleAction;
+class TDEToggleAction;
/**
* This is the application "Shell". It has a menubar, toolbar, and
@@ -90,8 +90,8 @@ private:
private:
KParts::ReadWritePart *m_part;
- KToggleAction *m_toolbarAction;
- KToggleAction *m_statusbarAction;
+ TDEToggleAction *m_toolbarAction;
+ TDEToggleAction *m_statusbarAction;
};
#endif // _KDEVDESIGNER_H_