From cb1b22d0821b4fa3b72801659c6e8472e26c2b99 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 3 Feb 2024 16:26:56 +0900
Subject: Replace Q_SIGNALS and Q_SLOTS

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit bda52bd053029243d499bbaf14d35beb8b6e43e1)
---
 kdvi/optionDialogFontsWidget_base.ui           | 4 ++--
 kghostview/gssettingswidget.ui                 | 8 ++++----
 kolourpaint/patches/doc_resize_no_flicker.diff | 2 +-
 kpdf/conf/dlgperformance.ui                    | 4 ++--
 kpovmodeler/StyleConvention                    | 8 ++++----
 ksnapshot/ksnapshotwidget.ui                   | 8 ++++----
 kview/modules/presenter/imagelistdialog.ui     | 4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/kdvi/optionDialogFontsWidget_base.ui b/kdvi/optionDialogFontsWidget_base.ui
index bb7e18f4..2a36bb98 100644
--- a/kdvi/optionDialogFontsWidget_base.ui
+++ b/kdvi/optionDialogFontsWidget_base.ui
@@ -56,9 +56,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>buttonGroup1_clicked(int)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kghostview/gssettingswidget.ui b/kghostview/gssettingswidget.ui
index c2c18d05..f8ddc0ad 100644
--- a/kghostview/gssettingswidget.ui
+++ b/kghostview/gssettingswidget.ui
@@ -142,12 +142,12 @@
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
-<Q_SIGNALS>
+<signals>
     <signal>configClicked()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot specifier="non virtual">setDetectedVersion( TQString v )</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index 112b48d1..a3593b95 100644
--- a/kolourpaint/patches/doc_resize_no_flicker.diff
+++ b/kolourpaint/patches/doc_resize_no_flicker.diff
@@ -519,7 +519,7 @@ diff -u -p -r1.3 kpviewscrollablecontainer.h
      virtual void viewportPaintEvent (QPaintEvent *e);
      virtual void paintEvent (QPaintEvent *e);
  
-+protected Q_SLOTS:
++protected slots:
 +    void windowActivationChanged ();
 +protected:
 +    virtual void windowActivationChange (bool wasActive);
diff --git a/kpdf/conf/dlgperformance.ui b/kpdf/conf/dlgperformance.ui
index 3676c3ba..d0730717 100644
--- a/kpdf/conf/dlgperformance.ui
+++ b/kpdf/conf/dlgperformance.ui
@@ -265,11 +265,11 @@
     <include location="global" impldecl="in implementation">kiconloader.h</include>
     <include location="local" impldecl="in implementation">dlgperformance.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>lowRadio_toggled( bool on )</slot>
     <slot>normalRadio_toggled( bool on )</slot>
     <slot>aggressiveRadio_toggled( bool on )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function access="private">init()</function>
 </functions>
diff --git a/kpovmodeler/StyleConvention b/kpovmodeler/StyleConvention
index 5418fb0c..8199c913 100644
--- a/kpovmodeler/StyleConvention
+++ b/kpovmodeler/StyleConvention
@@ -201,11 +201,11 @@ things are set multiple times. But it works :-)
   (load-library "vc")
   
   ;;for QT
-  (set c-C++-access-key "\\<\\(Q_SIGNALS\\|public\\|protected\\|private
-  \\|public Q_SLOTS\\|protected Q_SLOTS\\|private Q_SLOTS\\)\\>[ \t]*:")
-  ;; modify the colour of Q_SLOTS to match public, private, etc ...
+  (set c-C++-access-key "\\<\\(signals\\|public\\|protected\\|private
+  \\|public slots\\|protected slots\\|private slots\\)\\>[ \t]*:")
+  ;; modify the colour of slots to match public, private, etc ...
   (font-lock-add-keywords 'c++-mode
-  '(("\\<\\(Q_SLOTS\\|Q_SIGNALS\\)\\>" . font-lock-type-face)))
+  '(("\\<\\(slots\\|signals\\)\\>" . font-lock-type-face)))
   ;; make new font for rest of qt keywords
   (make-face 'qt-keywords-face)
   (set-face-foreground 'qt-keywords-face "green")
diff --git a/ksnapshot/ksnapshotwidget.ui b/ksnapshot/ksnapshotwidget.ui
index d0f815c3..71385f90 100644
--- a/ksnapshot/ksnapshotwidget.ui
+++ b/ksnapshot/ksnapshotwidget.ui
@@ -357,15 +357,15 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
     <include location="global" impldecl="in implementation">tdeglobalsettings.h</include>
     <include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include>
 </includes>
-<Q_SIGNALS>
+<signals>
     <signal>newClicked()</signal>
     <signal>saveClicked()</signal>
     <signal>copyClicked()</signal>
     <signal>printClicked()</signal>
     <signal>openWithKPClicked()</signal>
     <signal>startImageDrag()</signal>
-</Q_SIGNALS>
-<Q_SLOTS>
+</signals>
+<slots>
     <slot access="protected" specifier="non virtual">slotModeChanged( int mode )</slot>
     <slot access="protected" specifier="non virtual">slotNewClicked()</slot>
     <slot access="protected" specifier="non virtual">slotSaveClicked()</slot>
@@ -375,7 +375,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
     <slot access="protected" specifier="non virtual">slotOpenWithKPClicked()</slot>
     <slot specifier="non virtual" returnType="int">previewWidth()</slot>
     <slot specifier="non virtual" returnType="int">previewHeight()</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function specifier="non virtual">setPreview( const TQPixmap &amp; pm )</function>
     <function specifier="non virtual">setDelay( int i )</function>
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index 26e03b01..1f7a2435 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -270,10 +270,10 @@
 <forwards>
     <forward>class KURL</forward>
 </forwards>
-<Q_SLOTS>
+<slots>
     <slot access="private" specifier="non virtual">init()</slot>
     <slot specifier="non virtual">noSort()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
-- 
cgit v1.2.1