Replace Q_SIGNALS and Q_SLOTS

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
author: Michele Calgaro <michele.calgaro@yahoo.it> 2024-02-05 11:20:32 +0900
committer: Michele Calgaro <michele.calgaro@yahoo.it> 2024-02-05 11:20:32 +0900
commit: d567067b8302ba24a6ac8979db29cfaadc1875e8 (patch)
tree: e662c3b2805b0649801760a775fa087db5b9c59c /kommander
parent: 931991843ab3b6b0b0157dd433c226f7fc2ebc1b (diff)
download: tdewebdev-d567067b8302ba24a6ac8979db29cfaadc1875e8.tar.gz
tdewebdev-d567067b8302ba24a6ac8979db29cfaadc1875e8.zip
11 files changed, 25 insertions, 25 deletions
diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno
index 4207a210..27ec95f3 100644
--- a/kommander/Kommander-TODO.kno
+++ b/kommander/Kommander-TODO.kno
@@ -72,8 +72,8 @@
 \NewEntry 1 Other
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif">
 <p><span style="font-weight:600">Other GUI-related issues</span></p>
-<ul type="disc"><li>cleanup Q_SLOTS/Q_SIGNALS/connections interface</li>
-<li>find out why Q_SLOTS are shown only for current tab<br /></li></ul>
+<ul type="disc"><li>cleanup slots/signals/connections interface</li>
+<li>find out why slots are shown only for current tab<br /></li></ul>
 <p><span style="font-weight:600">KDE4 ideas:<br /></span></p>
 <ul type="disc"><li>create a KDevelop plugin for the editor</li>
 <li>use KFormDesigner or the new Qt Designer</li></ul>
@@ -160,8 +160,8 @@
 
 \NewEntry 1 Signals
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Georgia">
-<p><span style="font-weight:600">New Q_SIGNALS for existing widgets</span></p>
-<ul type="disc"><li>add Q_SIGNALS for D&amp;D<br /><span style="font-style:italic">Requires  dragContent and dragType, perhaps dragSource to be set.</span></li>
+<p><span style="font-weight:600">New signals for existing widgets</span></p>
+<ul type="disc"><li>add signals for D&amp;D<br /><span style="font-style:italic">Requires  dragContent and dragType, perhaps dragSource to be set.</span></li>
 <li></li></ul>
 </body></html>
 
@@ -218,7 +218,7 @@
 
 \NewEntry 1 Done
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif">
-<p>New widgets include the DatePicker, Popup Menu and Toolbox. New functions inlcude widget creation, hooking and unhooking Q_SIGNALS and Q_SLOTS and full slot access as well as passing and returning parameters in scripts. WooHoo! Take that do list!<br /></p>
+<p>New widgets include the DatePicker, Popup Menu and Toolbox. New functions inlcude widget creation, hooking and unhooking signals and slots and full slot access as well as passing and returning parameters in scripts. WooHoo! Take that do list!<br /></p>
 <ul type="disc"><li>fixed dcop functions</li>
 <li>added indexed array functions</li>
 <li>made color slot work in TextEdit</li>
diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui
index b5f74086..a43e524b 100644
--- a/kommander/editor/assoctexteditor.ui
+++ b/kommander/editor/assoctexteditor.ui
@@ -215,9 +215,9 @@
         <slot>AssocTextEditorBase_destroyed(TQObject*)</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot>AssocTextEditorBase_destroyed(TQObject*)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 19374617..0ff745f8 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -378,7 +378,7 @@
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot>addSlotClicked()</slot>
@@ -390,7 +390,7 @@
     <slot access="protected">signalChanged()</slot>
     <slot access="protected">Q_SLOTSChanged()</slot>
     <slot access="protected">cancelClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
 	<include location="global" impldecl="in implementation">tdelistview.h</include>
diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui
index f0bad338..410d80b7 100644
--- a/kommander/editor/formsettings.ui
+++ b/kommander/editor/formsettings.ui
@@ -326,9 +326,9 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>okClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
 	<include location="global" impldecl="in implementation">klineedit.h</include>
diff --git a/kommander/editor/listeditor.ui b/kommander/editor/listeditor.ui
index fd37c1f8..636cfb86 100644
--- a/kommander/editor/listeditor.ui
+++ b/kommander/editor/listeditor.ui
@@ -133,7 +133,7 @@
 <forwards>
     <forward>class TQStringList;</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot>setList( const TQStringList &amp; l )</slot>
     <slot>addItem()</slot>
@@ -141,7 +141,7 @@
     <slot>removeItems()</slot>
     <slot returnType="TQStringList">items()</slot>
     <slot>renameItem()</slot>
-</Q_SLOTS>
+</slots>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/newform.ui b/kommander/editor/newform.ui
index 7b5a0938..4c2d3fa9 100644
--- a/kommander/editor/newform.ui
+++ b/kommander/editor/newform.ui
@@ -202,9 +202,9 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">itemChanged( TQIconViewItem * )</slot>
     <slot access="protected">projectChanged( const TQString &amp; )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui
index ceabd80d..a77c277b 100644
--- a/kommander/editor/paletteeditor.ui
+++ b/kommander/editor/paletteeditor.ui
@@ -501,14 +501,14 @@
     <tabstop>paletteCombo</tabstop>
     <tabstop>buttonHelp</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">onTune()</slot>
     <slot access="protected">onChoose2ndMainColor()</slot>
     <slot access="protected">onChooseMainColor()</slot>
     <slot access="protected">paletteSelected(int)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">previewframe.h</include>
diff --git a/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui
index 3e0cab3b..02d5e4d2 100644
--- a/kommander/editor/paletteeditoradvanced.ui
+++ b/kommander/editor/paletteeditoradvanced.ui
@@ -743,7 +743,7 @@
     <tabstop>buttonEffect</tabstop>
     <tabstop>buttonHelp</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">onToggleBuildDisabled(bool)</slot>
@@ -756,7 +756,7 @@
     <slot access="protected">onToggleBuildInactive(bool)</slot>
     <slot access="protected">paletteSelected(int)</slot>
     <slot>showHelp()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">styledbutton.h</include>
diff --git a/kommander/editor/wizardeditor.ui b/kommander/editor/wizardeditor.ui
index 2f5c16e4..ec183bf2 100644
--- a/kommander/editor/wizardeditor.ui
+++ b/kommander/editor/wizardeditor.ui
@@ -302,7 +302,7 @@
         <slot>cancelClicked()</slot>
     </connection>
 </connections>
-<Q_SLOTS>
+<slots>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">addClicked()</slot>
@@ -315,6 +315,6 @@
     <slot access="protected">okClicked()</slot>
     <slot access="protected">removeClicked()</slot>
     <slot access="protected">upClicked()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr
index ae8ce00a..676fde24 100644
--- a/kommander/examples/current/editor-poc.kmdr
+++ b/kommander/examples/current/editor-poc.kmdr
@@ -303,9 +303,9 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1))
         &lt;stringlist&gt;
             &lt;string&gt;&lt;/string&gt;
             &lt;string&gt;@Array.setValue(help, "Proof of concept", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Kommander MainWindow frames!&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As Kommander took on functionality an attempt was made to make a MainWindow Kommander widget. Sadly it was a huge time loss for two developers who both gave up after days of trying. The problem was with the editor. However you can use a Qt Designer generated UI file renamed to a *.kmdr file. Into this frame you can place your widgets and make a working application where nearly everything works.&amp;lt;/p&amp;gt;")
-@Array.setValue(help, "Known limitations", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Known limitations&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are Q_SIGNALS for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and TDEActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &amp;lt;/p&amp;gt;")
+@Array.setValue(help, "Known limitations", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Known limitations&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are signals for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and TDEActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &amp;lt;/p&amp;gt;")
 @Array.setValue(help, "Rolling your own", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Rolling your own&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;It is our intention to have a template in the 1.3 release of a MainWindow, but if you have Qt Designer for Qt 3x you can easily start a window design, save it, rename to *.kmdr and open in Kommander. Remember not to add widgets in Designer as Kommander will not recognize them.&amp;lt;/p&amp;gt;")
-@Array.setValue(help, "Using Actions", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Using Actions&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with Q_SIGNALS and Q_SLOTS. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&amp;lt;/p&amp;gt;
+@Array.setValue(help, "Using Actions", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Using Actions&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with signals and slots. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&amp;lt;/p&amp;gt;
 ")
 @Array.setValue(help, "Link examples", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Link examples&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;This demo shows examples of linking. Links will show in the TextEdit widget, but they don't do anything. In the TextBrowser they open web pages and email links, but of course you can't edit in the TextBrowser. If you don't mind writing some script you can set up your own link handling, which I've done here. Note that it will follow links anywhere in the editor. If the link is a widget name it assumes it to be a script and calls it. If not it looks to see if it is a web link and calls that&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;It would be easy to extend this script to accept link parameters and process emails. You could also make a reference to other text objects, tab widget tabs, pretty much anything you can think of.&amp;lt;/p&amp;gt;")
 @Array.setValue(help, "How this help works", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;How this help works&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;Do you wonder where this help came from? It is possible to use KDE help if you write DocBook, make it and install it. This quick help is fast and can contain &amp;lt;i&amp;gt;rich text&amp;lt;/i&amp;gt;. To look at the dialog copy the text in the hidden TextEdit (set to text mode so as not to muck things up with rich text interperting XML) and paste it to a text editor like KWrite. Save it as a Kommander file and open it in the Kommander Editor.&amp;lt;/p&amp;gt;")
diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr
index c1be33a2..46f166e3 100644
--- a/kommander/examples/old/widgetgenerator.kmdr
+++ b/kommander/examples/old/widgetgenerator.kmdr
@@ -125,10 +125,10 @@ public:
 	virtual TQString populationText() const;
 	virtual void setPopulationText(TQString);
 
-public Q_SLOTS:
+public slots:
 	virtual void setWidgetText(const TQString &amp;);
 	virtual void populate();
-Q_SIGNALS:
+signals:
 	void widgetOpened();
 	void widgetTextChanged(const TQString &amp;);
 protected:
author	Michele Calgaro <michele.calgaro@yahoo.it>	2024-02-05 11:20:32 +0900
committer	Michele Calgaro <michele.calgaro@yahoo.it>	2024-02-05 11:20:32 +0900
commit	d567067b8302ba24a6ac8979db29cfaadc1875e8 (patch)
tree	e662c3b2805b0649801760a775fa087db5b9c59c /kommander
parent	931991843ab3b6b0b0157dd433c226f7fc2ebc1b (diff)
download	tdewebdev-d567067b8302ba24a6ac8979db29cfaadc1875e8.tar.gz tdewebdev-d567067b8302ba24a6ac8979db29cfaadc1875e8.zip