diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:02:43 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:02:43 -0600 |
commit | aea627236e4de24599c3e30617cf264c3c1b7d40 (patch) | |
tree | 467e13ca5a7eb0ab292259289ecc3572f53c5eae /lib/kross/test | |
parent | 786304c6211f35ddc4cdd54b7aa7985fef4a2e70 (diff) | |
download | koffice-aea627236e4de24599c3e30617cf264c3c1b7d40.tar.gz koffice-aea627236e4de24599c3e30617cf264c3c1b7d40.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'lib/kross/test')
-rw-r--r-- | lib/kross/test/testaction.cpp | 10 | ||||
-rw-r--r-- | lib/kross/test/testaction.h | 8 | ||||
-rw-r--r-- | lib/kross/test/testwindow.cpp | 12 | ||||
-rw-r--r-- | lib/kross/test/testwindow.h | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/lib/kross/test/testaction.cpp b/lib/kross/test/testaction.cpp index 481de0cf..42963904 100644 --- a/lib/kross/test/testaction.cpp +++ b/lib/kross/test/testaction.cpp @@ -22,15 +22,15 @@ TestAction::TestAction(Kross::Api::ScriptContainer::Ptr scriptcontainer) : TQWidget() { - m_actioncollection = new KActionCollection(this, this); + m_actioncollection = new TDEActionCollection(this, this); - m_action1 = new KAction("Action1_Text", 0, this, TQT_SLOT(activatedAction1()), m_actioncollection, "Action1"); + m_action1 = new TDEAction("Action1_Text", 0, this, TQT_SLOT(activatedAction1()), m_actioncollection, "Action1"); m_actionlist.append(m_action1); - scriptcontainer->addKAction(m_action1); + scriptcontainer->addTDEAction(m_action1); - m_action2 = new KAction("Action2_Text", 0, this, TQT_SLOT(activatedAction2()), m_actioncollection, "Action2"); + m_action2 = new TDEAction("Action2_Text", 0, this, TQT_SLOT(activatedAction2()), m_actioncollection, "Action2"); m_actionlist.append(m_action2); - scriptcontainer->addKAction(m_action2); + scriptcontainer->addTDEAction(m_action2); } TestAction::~TestAction() diff --git a/lib/kross/test/testaction.h b/lib/kross/test/testaction.h index 7f4dd79c..32e6cdcd 100644 --- a/lib/kross/test/testaction.h +++ b/lib/kross/test/testaction.h @@ -42,10 +42,10 @@ class TestAction : public TQWidget void activatedAction2(); private: - KAction* m_action1; - KAction* m_action2; - KActionCollection* m_actioncollection; - KActionPtrList m_actionlist; + TDEAction* m_action1; + TDEAction* m_action2; + TDEActionCollection* m_actioncollection; + TDEActionPtrList m_actionlist; }; #endif diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index ec0090b6..f83d7ace 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -35,7 +35,7 @@ #include <kstandarddirs.h> TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptcode) - : KMainWindow() + : TDEMainWindow() , m_interpretername(interpretername) , m_scriptcode(scriptcode) { @@ -43,7 +43,7 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco manager->addModule( new TestPluginModule("krosstestpluginmodule") ); m_scriptcontainer = manager->getScriptContainer("test"); - KPopupMenu *menuFile = new KPopupMenu( this ); + TDEPopupMenu *menuFile = new TDEPopupMenu( this ); menuBar()->insertItem( "&File", menuFile ); m_scriptextension = new Kross::Api::ScriptGUIClient(this, this); @@ -58,15 +58,15 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco //menuFile->insertSeparator(); - KAction* execaction = m_scriptextension->action("executescriptfile"); + TDEAction* execaction = m_scriptextension->action("executescriptfile"); if(execaction) execaction->plug(menuFile); - KAction* configaction = m_scriptextension->action("configurescripts"); + TDEAction* configaction = m_scriptextension->action("configurescripts"); if(configaction) configaction->plug(menuFile); - KAction* scriptsaction = m_scriptextension->action("installedscripts"); + TDEAction* scriptsaction = m_scriptextension->action("installedscripts"); if(scriptsaction) scriptsaction->plug(menuFile); - //menuFile->insertItem( ( (KActionMenu*)m_scriptextension->action("scripts") )->popupMenu() ); + //menuFile->insertItem( ( (TDEActionMenu*)m_scriptextension->action("scripts") )->popupMenu() ); TQVBox* mainbox = new TQVBox(this); diff --git a/lib/kross/test/testwindow.h b/lib/kross/test/testwindow.h index 9a10104c..c3da5cc5 100644 --- a/lib/kross/test/testwindow.h +++ b/lib/kross/test/testwindow.h @@ -33,7 +33,7 @@ class TQComboBox; class KTextEdit; -class TestWindow : public KMainWindow +class TestWindow : public TDEMainWindow { Q_OBJECT |