diff --git a/chalk/HACKING b/chalk/HACKING
index a48526b0c..7673eb708 100644
--- a/chalk/HACKING
+++ b/chalk/HACKING
@@ -86,8 +86,8 @@ Spaces
Keep the source airy and open. (However, maybe I was wrong in wanting spaces around ->...)
-Slots and Q_SIGNALS
+Slots and signals
- Prefix Q_SLOTS with slot and Q_SIGNALS with sig: slotUpdateSelection, sigSelectionUpdated.
+ Prefix slots with slot and signals with sig: slotUpdateSelection, sigSelectionUpdated.
Boudewijn Rempt
\ No newline at end of file
diff --git a/chalk/core/createdcop.py b/chalk/core/createdcop.py
index 002698186..ffe9a9d6e 100755
--- a/chalk/core/createdcop.py
+++ b/chalk/core/createdcop.py
@@ -99,7 +99,7 @@ def parseHeader(headerfile, classname):
line.startswith("TQ_OBJECT") or
line.startswith("#") or
line.startswith("}") or
- line.startswith("public Q_SLOTS:") or
+ line.startswith("public slots:") or
line.find("~") != -1 or
len(line) == 0
):
diff --git a/chalk/doc/palettedesign.txt b/chalk/doc/palettedesign.txt
index 9dc2cfab7..549264a73 100644
--- a/chalk/doc/palettedesign.txt
+++ b/chalk/doc/palettedesign.txt
@@ -2,7 +2,7 @@ Requirements
* Flexible: plugins should be able to add palettes or palette tabs
* Connected: palette tabs should be able to connect to the main application
- using Q_SIGNALS and Q_SLOTS
+ using signals and slots
* Configurable: palette widgets should be drag & droppable from palette
to palette, and from palette to void to create a new palette.
* Persistent: the palette configuration of a view should be persisted
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
index e231e4a71..844690313 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
@@ -304,13 +304,13 @@ If <i>no delay</i> is set, the program will wait for a mouse click b
tdeglobalsettings.h
ksnapshotwidget.ui.h
-
+
newClicked()
saveClicked()
printClicked()
startImageDrag()
-
-
+
+
slotModeChanged( int mode )
slotNewClicked()
slotSaveClicked()
@@ -318,7 +318,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b
slotStartDrag()
previewWidth()
previewHeight()
-
+
setPreview( const TQPixmap & pm )
setDelay( int i )
diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui
index 2b866c2f7..8a117f9d0 100644
--- a/chalk/ui/kis_matrix_widget.ui
+++ b/chalk/ui/kis_matrix_widget.ui
@@ -200,11 +200,11 @@
kis_matrix_widget.ui.h
-
+
valueChanged()
-
-
+
+
spinboxValueChanged()
-
+
diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui
index ff8bcfbfd..16cc6bd24 100644
--- a/chalk/ui/wdgbirdeye.ui
+++ b/chalk/ui/wdgbirdeye.ui
@@ -287,11 +287,11 @@
89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002a149444154388db595df4b536118c73f3bdbecf8036c4e41f2c6695022045e486e90b721e4ba126f1a0966627f4108512004a197fd0586588220980a9a068be63abaa884cc1f6d30a7e29cfb216dceb39d9d2e2cf3c74997e417de97972fbc9fe77d1e789e57e772b9384d369b4d3deab95c2edd497784b3404ff20f460650fff732fc0ee0f5bc241298252dc710f4174e4be4908cb9661439cefa7c0fb71eee79fbe0486096b5af3d644e4e50537a3de880b4f2c7db07a7e51819156e77fe3b1860b4bb1095d871f0c1f4239108068381f84e9cc58545c6c7c78946a3d45dafa3b4b414511411f34456d756e9eded65706090924a076bdf9e1f071fd4c0c000c15010f7b49bc93793b4de6ba5abab0bd3451300bbbbbb783e7a08ac04d858dfd0cc4013dcdedebe7f368a462449a2ff553fcd4dcdf87c3eba7bba71bbdcf8fd7e8a8a8ab20703d4d6d6d2f1a00383d180b9c84c85a58282fc027c3e1ff537ea71dc71303a36caf6f6367d2ffab203773eeaa4e1660336ab8db49226c798839c9211f402b22c53535383cd6ac35261c1eff76b82353b4fafd7a3a80a899d048220904aa588842324779278bd5e9cef9cc41371ca2e9511de0a675f8ae1a161cc2633e5e5e5980a4d0882c06678133157243f2f9f85a50526a62698fb32c78c674613acf962dfb28fd05688443c41329944de95997e3fcdc8e8088b4b8bb85d6e42c110f6463b5557aab207c77ec458febe8c3fe067657585542a85d566c5bbecc5fdc18de5b285603088925168b9db927d294451c4e9745275b50a7ba39dc44e8292e212daeeb7517dad9aa9b7534833129224d1d4d4a409de9f6e9fc61eabaf9f9d7d9a7d1e7ba20e3dd5986e8a1c47c75ecf97543ab45ff117e5e416138f7af790474bb13edf435a0195d8a19ecf46eaaf2d9339609ed7a03ff56b3aabce0dfc13238259bff00a6d890000000049454e44ae426082
-
+
zoomChanged(int)
zoomMinus()
zoomPlus()
-
+
BarIcon
diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui
index acf4516b3..7e4c41b0f 100644
--- a/chalk/ui/wdgtextbrush.ui
+++ b/chalk/ui/wdgtextbrush.ui
@@ -145,9 +145,9 @@
-
+
boldButtonClicked()
-
+
klineedit.h
diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui
index 0d06f0343..0775c562d 100644
--- a/filters/kspread/latex/export/latexexportdia.ui
+++ b/filters/kspread/latex/export/latexexportdia.ui
@@ -655,10 +655,10 @@
removeLanguage()
-
+
addLanguage()
removeLanguage()
-
+
kcombobox.h
diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui
index 0d06f0343..0775c562d 100644
--- a/filters/kword/latex/export/latexexportdia.ui
+++ b/filters/kword/latex/export/latexexportdia.ui
@@ -655,10 +655,10 @@
removeLanguage()
-
+
addLanguage()
removeLanguage()
-
+
kcombobox.h
diff --git a/filters/xsltfilter/export/xsltdialog.ui b/filters/xsltfilter/export/xsltdialog.ui
index 1176908b4..44a6e029d 100644
--- a/filters/xsltfilter/export/xsltdialog.ui
+++ b/filters/xsltfilter/export/xsltdialog.ui
@@ -210,12 +210,12 @@
xsltdialog.ui.h
-
+
cancelSlot()
chooseRecentSlot()
chooseSlot()
chooseCommonSlot()
okSlot()
-
+
diff --git a/filters/xsltfilter/import/xsltdialog.ui b/filters/xsltfilter/import/xsltdialog.ui
index 1176908b4..44a6e029d 100644
--- a/filters/xsltfilter/import/xsltdialog.ui
+++ b/filters/xsltfilter/import/xsltdialog.ui
@@ -210,12 +210,12 @@
xsltdialog.ui.h
-
+
cancelSlot()
chooseRecentSlot()
chooseSlot()
chooseCommonSlot()
okSlot()
-
+
diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui
index 5a34dbb5e..2eaa31738 100644
--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@@ -702,7 +702,7 @@
KDGanttViewItem * myItem
-
+
init()
ChangeText_clicked()
ChangeStart_clicked()
@@ -732,6 +732,6 @@
CalBox_toggled( bool mode )
PrioSlider_valueChanged( int val )
getItem()
-
+
diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
index 542473051..c0e999b42 100644
--- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
@@ -176,9 +176,9 @@
chkUseSocket
chkSocketDefault
-
+
slotCBToggled( bool on )
-
+
klineedit.h
diff --git a/kexi/widget/kexiprjtypeselectorbase.ui b/kexi/widget/kexiprjtypeselectorbase.ui
index c6ff117a0..ab02d02ec 100644
--- a/kexi/widget/kexiprjtypeselectorbase.ui
+++ b/kexi/widget/kexiprjtypeselectorbase.ui
@@ -152,9 +152,9 @@
kexiprjtypeselectorbase.ui.h
-
+
slotSelectionChanged( int id )
-
+
init()
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
index 8b2cf4c05..1bba41680 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
@@ -98,11 +98,11 @@
kiconloader.h
-
+
zoomChanged(int)
zoomMinus()
zoomPlus()
-
+
BarIcon
diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
index 24a864174..e0e9e152e 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
@@ -87,11 +87,11 @@
itemClicked(TQListViewItem*,const TQPoint&,int)
-
+
itemActivated(TQListViewItem*)
itemClicked(TQListViewItem*,const TQPoint&,int)
updateButtons(TQListViewItem*)
-
+
tdetoolbar.h
diff --git a/kplato/kptconfigbehaviorpanelbase.ui b/kplato/kptconfigbehaviorpanelbase.ui
index eb329c716..29b17b073 100644
--- a/kplato/kptconfigbehaviorpanelbase.ui
+++ b/kplato/kptconfigbehaviorpanelbase.ui
@@ -92,11 +92,11 @@
kptconfigbehaviorpanelbase.ui.h
-
+
changed()
-
-
+
+
slotChanged()
-
+
diff --git a/kplato/kptdurationwidget.ui b/kplato/kptdurationwidget.ui
index f6373be43..9a094cd38 100644
--- a/kplato/kptdurationwidget.ui
+++ b/kplato/kptdurationwidget.ui
@@ -386,10 +386,10 @@
TQRegExpValidator *m_validator;
struct FieldDescriptor *m_fields;
-
+
valueChanged()
-
-
+
+
setValue( const KPlato::Duration & newDuration )
dddLostFocus()
hhLostFocus()
@@ -397,7 +397,7 @@
ssLostFocus()
msLostFocus()
handleLostFocus( int field )
-
+
init()
destroy()
diff --git a/kplato/kpttasknotespanelbase.ui b/kplato/kpttasknotespanelbase.ui
index f3f52ab9e..6cf7c918d 100644
--- a/kplato/kpttasknotespanelbase.ui
+++ b/kplato/kpttasknotespanelbase.ui
@@ -44,8 +44,8 @@
-
+
scheduling_clicked( int schedulingType )
-
+
diff --git a/kpresenter/shadowdialog.ui b/kpresenter/shadowdialog.ui
index 3c24676b3..ee48d4e01 100644
--- a/kpresenter/shadowdialog.ui
+++ b/kpresenter/shadowdialog.ui
@@ -482,13 +482,13 @@
applyButton
cancelButton
-
+
colorChanged( const TQColor & )
directionChanged( int )
distanceChanged( int )
applyClicked()
okClicked()
-
+
kcolorbutton.h
diff --git a/kword/mailmerge/sql/qtsqldatasourceeditor.ui b/kword/mailmerge/sql/qtsqldatasourceeditor.ui
index 24d32b79d..6706b2bc4 100644
--- a/kword/mailmerge/sql/qtsqldatasourceeditor.ui
+++ b/kword/mailmerge/sql/qtsqldatasourceeditor.ui
@@ -151,8 +151,8 @@
qtsqldatasourceeditor.ui.h
-
+
filterCheckBox_toggled( bool fcb_state )
-
+
diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui
index baf0e1a3c..60136009c 100644
--- a/lib/kotext/timedateformatwidget.ui
+++ b/lib/kotext/timedateformatwidget.ui
@@ -203,10 +203,10 @@
combo1
-
+
comboActivated()
updateLabel()
-
+
knuminput.h
diff --git a/lib/kross/test/testcase.py b/lib/kross/test/testcase.py
index 6db6d980a..dceb323a0 100644
--- a/lib/kross/test/testcase.py
+++ b/lib/kross/test/testcase.py
@@ -110,8 +110,8 @@ class TestPlugin(unittest.TestCase):
#print "===========> %s" % self.pluginobject2.myName()
print("testqobject1 properties=%s" % self.testqobject1.propertyNames())
- print("testqobject1 Q_SLOTS=%s" % self.testqobject1.slotNames())
- print("testqobject1 Q_SIGNALS=%s" % self.testqobject1.signalNames())
+ print("testqobject1 slots=%s" % self.testqobject1.slotNames())
+ print("testqobject1 signals=%s" % self.testqobject1.signalNames())
print("-----------------3")
print("DIR=>%s" % dir(self.testqobject1))