Signal/slot repairs

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1216185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

21 files changed, 43 insertions, 36 deletions

diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui
index e81a6155b..041939a7f 100644
--- a/kcontrol/accessibility/accessibilityconfigwidget.ui
+++ b/kcontrol/accessibility/accessibilityconfigwidget.ui
@@ -1607,9 +1607,9 @@ Please note that on slow machines this may cause a "lag" between the event causi
     <include location="local" impldecl="in implementation">accessibilityconfigwidget.ui.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="private" specifier="non virtual">updateFlashScreenColor()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h
index c48b7ecee..74680d579 100644
--- a/kcontrol/clock/dtime.h
+++ b/kcontrol/clock/dtime.h
@@ -22,9 +22,10 @@
 #ifndef dtime_included
 #define dtime_included
 
-#include <tqdatetime.h> 
-#include <tqlineedit.h> 
-#include <tqspinbox.h> 
+#include <tqapplication.h>
+#include <tqdatetime.h>
+#include <tqlineedit.h>
+#include <tqspinbox.h>
 #include <tqstring.h>
 #include <tqtimer.h>
 #include <tqvalidator.h>
diff --git a/kcontrol/colors/widgetcanvas.h b/kcontrol/colors/widgetcanvas.h
index aea314664..83cb4d6fa 100644
--- a/kcontrol/colors/widgetcanvas.h
+++ b/kcontrol/colors/widgetcanvas.h
@@ -9,6 +9,7 @@
 #define __WIDGETCANVAS_H__
 
 #include <tqmap.h>
+#undef None	// Qt4
 #include <kapplication.h>
 
 #define MAX_HOTSPOTS   28
diff --git a/kcontrol/componentchooser/browserconfig_ui.ui b/kcontrol/componentchooser/browserconfig_ui.ui
index 84fed5cfc..6fb35aba4 100644
--- a/kcontrol/componentchooser/browserconfig_ui.ui
+++ b/kcontrol/componentchooser/browserconfig_ui.ui
@@ -166,9 +166,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">selectBrowser()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui
index 2cae19a55..9a5879b00 100644
--- a/kcontrol/componentchooser/emailclientconfig_ui.ui
+++ b/kcontrol/componentchooser/emailclientconfig_ui.ui
@@ -228,9 +228,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">selectEmailClient()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
index 91d11f64b..aa7a63506 100644
--- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
+++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
@@ -186,9 +186,9 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">selectTerminalApp()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 4e7c2ac77..a0695d3ed 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -312,9 +312,9 @@ is configured with 'Browse local network' option above.</string>
         </widget>
     </grid>
 </widget>
-<slots>
+<Q_SLOTS>
     <slot>radioButton2_2_toggled(bool)</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in declaration">kcmodule.h</include>
 </includes>
diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui
index 98b985229..ae39951a6 100644
--- a/kcontrol/iccconfig/iccconfigbase.ui
+++ b/kcontrol/iccconfig/iccconfigbase.ui
@@ -191,9 +191,9 @@
 <includes>
 	<include location="local" impldecl="in implementation">ICCConfigBase.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>enableSupport_toggled(bool)</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index d252eca10..6c13bba98 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -19,6 +19,7 @@
 #ifndef ICONTHEMES_H
 #define ICONTHEMES_H
 
+#include <tqimage.h>
 #include <kcmodule.h>
 #include <tqmap.h>
 #include <klistview.h>
diff --git a/kcontrol/input/xcursor/previewwidget.h b/kcontrol/input/xcursor/previewwidget.h
index a3db01d88..a6412a907 100644
--- a/kcontrol/input/xcursor/previewwidget.h
+++ b/kcontrol/input/xcursor/previewwidget.h
@@ -24,7 +24,7 @@
 class PreviewCursor;
 
 
-class PreviewWidget : public QWidget
+class PreviewWidget : public TQWidget
 {
 	public:
 		PreviewWidget( TQWidget *parent = NULL, const char *name = NULL );
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index 27438a4d2..2a0255857 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -170,9 +170,9 @@ void ThemePage::load( bool useDefaults )
             currentTheme = "system";
 
 	// Find the theme in the listview and select it
-	TQListViewItem *item = listview->findItem( currentTheme, DirColumn );
+	TQListViewItem *item = listview->tqfindItem( currentTheme, DirColumn );
         if( !item )
-                item = listview->findItem( "system", DirColumn );
+                item = listview->tqfindItem( "system", DirColumn );
 	selectedTheme = item->text( DirColumn );
 	listview->setSelected( item, true );
 	listview->ensureItemVisible( item );
@@ -260,7 +260,7 @@ void ThemePage::removeClicked()
 	KIO::del( u );
 
 	// Remove the theme from the listview and from the themeinfo dict
-	delete listview->findItem( selectedTheme, DirColumn );
+	delete listview->tqfindItem( selectedTheme, DirColumn );
 	themeInfo.remove( selectedTheme );
 	listview->setSelected( listview->currentItem(), true );
 
@@ -371,7 +371,7 @@ void ThemePage::insertTheme( const TQString &path )
 	info->writable = true;
 
 	// If an item with the same name already exists, remove it
-	delete listview->findItem( dirName, DirColumn );
+	delete listview->tqfindItem( dirName, DirColumn );
 
 	// Create the listview item and insert it into the list.
 	KListViewItem *item = new KListViewItem( listview, name, desc, /*hidden*/ dirName );
@@ -471,7 +471,7 @@ void ThemePage::insertThemes()
 			// in the list. Xcursor will use the first theme it finds in that
 			// case, and since we use the same search order that should also be
 			// the theme we end up adding to the list.
-			if ( listview->findItem( *it, DirColumn ) )
+			if ( listview->tqfindItem( *it, DirColumn ) )
 				continue;
 
 			const TQString path       = dir.path() + '/' + *it;
@@ -621,7 +621,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 
 		// Scale down the image if we need to
 		if ( image.width() > iconSize || image.height() > iconSize )
-			image = image.smoothScale( iconSize, iconSize, TQImage::ScaleMin );
+			image = image.smoothScale( iconSize, iconSize, TQ_ScaleMin );
 
 		pix.convertFromImage( image );
 		XcursorImageDestroy( xcur );
diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h
index a4949a6ac..4197d73d1 100644
--- a/kcontrol/input/xcursor/themepage.h
+++ b/kcontrol/input/xcursor/themepage.h
@@ -32,7 +32,7 @@ class TQPushButton;
 struct ThemeInfo;
 
 
-class ThemePage : public QWidget
+class ThemePage : public TQWidget
 {
 	Q_OBJECT
 
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 044b2a38d..bf5017d5b 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -34,6 +34,7 @@
 #include "KfiPrint.h"
 #include "FcEngine.h"
 #endif
+#include <tqapplication.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui
index eaa5961fe..20db3beba 100644
--- a/kcontrol/kicker/hidingtab.ui
+++ b/kcontrol/kicker/hidingtab.ui
@@ -750,9 +750,9 @@
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot specifier="pure virtual">switchPanel(int)</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index 7eb945008..3684ff599 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -558,7 +558,7 @@ This option is only active if 'Enable background image' is selected.</string>
 <connections>
     <connection>
         <sender>kcfg_BackgroundTheme</sender>
-        <signal>urlSelected(const QString&amp;)</signal>
+        <signal>urlSelected(const TQString&amp;)</signal>
         <receiver>LookAndFeelTabBase</receiver>
         <slot>browseTheme(const QString&amp;)</slot>
     </connection>
@@ -570,7 +570,7 @@ This option is only active if 'Enable background image' is selected.</string>
     </connection>
     <connection>
         <sender>kcfg_BackgroundTheme</sender>
-        <signal>returnPressed(const QString&amp;)</signal>
+        <signal>returnPressed(const TQString&amp;)</signal>
         <receiver>LookAndFeelTabBase</receiver>
         <slot>browseTheme(const QString&amp;)</slot>
     </connection>
@@ -621,11 +621,11 @@ This option is only active if 'Enable background image' is selected.</string>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">launchAdvancedDialog()</slot>
-    <slot access="protected" specifier="pure virtual">browseTheme(const QString&amp;)</slot>
+    <slot access="protected" specifier="pure virtual">browseTheme(const TQString&amp;)</slot>
     <slot access="protected" specifier="pure virtual">enableTransparency(bool)</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui
index 7af261fde..e7ea78bb3 100644
--- a/kcontrol/kicker/positiontab.ui
+++ b/kcontrol/kicker/positiontab.ui
@@ -1112,12 +1112,12 @@ how it is positioned on the screen and how much of the screen it should use.</st
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">lengthenPanel( int )</slot>
     <slot access="protected" specifier="pure virtual">movePanel( int )</slot>
     <slot access="protected" specifier="pure virtual">panelDimensionsChanged()</slot>
     <slot specifier="pure virtual">switchPanel( int )</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h
index 00691bfa4..511d9e9fd 100644
--- a/kcontrol/locale/kcmlocale.h
+++ b/kcontrol/locale/kcmlocale.h
@@ -25,6 +25,7 @@
 #ifndef KCMLOCALE_H
 #define KCMLOCALE_H
 
+#include <tqapplication.h>
 #include <tqwidget.h>
 #include <tqstringlist.h>
 
diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp
index 668b36ddb..e87dbad5b 100644
--- a/kcontrol/randr/krandrmodule.cpp
+++ b/kcontrol/randr/krandrmodule.cpp
@@ -16,6 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <tqapplication.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqdesktopwidget.h>
diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h
index b7d236325..ff2799ccc 100644
--- a/kcontrol/samba/kcmsambalog.h
+++ b/kcontrol/samba/kcmsambalog.h
@@ -29,6 +29,7 @@
 #include <tqpushbutton.h>
 #include <tqlistview.h>
 #include <tqevent.h>
+#include <tqapplication.h>
 #include <kconfig.h>
 
 #include <kurlrequester.h>
diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui
index df12f9deb..a17da184f 100644
--- a/kcontrol/smartcard/smartcardbase.ui
+++ b/kcontrol/smartcard/smartcardbase.ui
@@ -297,11 +297,11 @@
 <includes>
     <include location="local" impldecl="in implementation">smartcardbase.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>slotTestReader()</slot>
     <slot>enableSupport_toggled(bool)</slot>
     <slot>enablePolling_toggled(bool)</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui
index 5090fca0b..e10f3a813 100644
--- a/kcontrol/smserver/smserverconfigdlg.ui
+++ b/kcontrol/smserver/smserverconfigdlg.ui
@@ -240,9 +240,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>configChanged()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>