Signal/slot repairs

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

49 files changed, 96 insertions, 83 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>
diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
index 16a4ebee1..18c8fbacc 100644
--- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
@@ -98,9 +98,9 @@
         </widget>
     </vbox>
 </widget>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">action_group_name_changed( const QString&amp; )</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
index 8cd292afd..4af53b2bf 100644
--- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
@@ -157,12 +157,12 @@
 <forwards>
     <forward>class QListViewItem;</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
index 041aeacf4..ec18138de 100644
--- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
@@ -50,9 +50,9 @@
         </widget>
     </vbox>
 </widget>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">browse_pressed()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
index c8969d531..a9f8b9d25 100644
--- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
@@ -156,12 +156,12 @@
 <forwards>
     <forward>class QListViewItem;</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
index 173e7d7aa..fdb849ea5 100644
--- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
@@ -261,10 +261,10 @@
     <tabstop>try_button</tabstop>
     <tabstop>PushButton1</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">run_kdcop_pressed()</slot>
     <slot access="protected" specifier="pure virtual">try_pressed()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
index 2463d3f2c..bf7c5321a 100644
--- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
@@ -106,9 +106,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">import_clicked()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui
index 3d19b3256..164331529 100644
--- a/khotkeys/kcontrol/ui/general_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_tab_ui.ui
@@ -133,10 +133,10 @@
         </widget>
     </vbox>
 </widget>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">action_name_changed( const QString&amp; )</slot>
     <slot access="protected" specifier="pure virtual">action_type_changed(int)</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
index 9e843764f..5fc15b458 100644
--- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
@@ -506,11 +506,11 @@
         <slot>edit_gesture_pressed3()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">edit_gesture_pressed1()</slot>
     <slot access="protected" specifier="pure virtual">edit_gesture_pressed2()</slot>
     <slot access="protected" specifier="pure virtual">edit_gesture_pressed3()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
index 55a7d6188..81baf6679 100644
--- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
@@ -182,9 +182,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
index ed3cc119e..4bc827575 100644
--- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
@@ -89,9 +89,9 @@
         <slot>browse_pressed()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">browse_pressed()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
index 44b9d6d56..f0b6c5691 100644
--- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
@@ -157,12 +157,12 @@
 <forwards>
     <forward>class QListViewItem;</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
index 71c724aff..ee5968743 100644
--- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
@@ -90,11 +90,11 @@
         <slot>slotPlayPressed()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">slotRecordPressed()</slot>
     <slot access="protected" specifier="pure virtual">slotPlayPressed()</slot>
     <slot access="protected" specifier="pure virtual">slotStopPressed()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
index fca2934d7..855b40e6a 100644
--- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
@@ -156,12 +156,12 @@
 <forwards>
     <forward>class QListViewItem;</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
     <slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
index 6e96e06ab..8cdc03d05 100644
--- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
@@ -480,11 +480,11 @@
     <tabstop>window_role_lineedit</tabstop>
     <tabstop>autodetect_button</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">window_class_combo_changed(int)</slot>
     <slot access="protected" specifier="pure virtual">window_role_combo_changed(int)</slot>
     <slot access="protected" specifier="pure virtual">window_title_combo_changed(int)</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index ab90a6438..fc2b66cac 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -292,9 +292,9 @@
     <include location="local" impldecl="in implementation">kfontrequester.h</include>
     <include location="local" impldecl="in implementation">digital.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 53e9c80cd..6cf1d30f0 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -495,12 +495,13 @@
     <tabstop>tzListView</tabstop>
 </tabstops>
 <includes>
+    <include location="local" impldecl="in implementation">tqheader.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">kfontrequester.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>configureType()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 3360b95cb..17cbfb967 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -88,7 +88,7 @@ int main( int argc, char **argv )
   KConfig conf( "kasbarrc" );
 
   if ( args->isSet("test") ) {
-      kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
+      kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags );
       kasbar->setItemSize( KasBar::Large );
       kasbar->append( new KasClockItem(kasbar) );
       kasbar->append( new KasItem(kasbar) );
@@ -97,7 +97,7 @@ int main( int argc, char **argv )
       kasbar->addTestItems();
   }
   else {
-      KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
+      KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags );
       kastasker->setConfig( &conf );
       kastasker->setStandAlone( true );
       kasbar = kastasker;
diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h
index 08f5436d4..66cecf9ac 100644
--- a/kicker/extensions/kasbar/kasitem.h
+++ b/kicker/extensions/kasbar/kasitem.h
@@ -64,6 +64,7 @@ class KasPopup;
 #include <tqguardedptr.h>
 #include <tqpoint.h>
 #include <tqvaluevector.h>
+#include <tqapplication.h>
 
 #include <kdemacros.h>
 
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 0edae6987..4d61566b2 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -21,6 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
+#undef None	// Qt4
 #include <tqcursor.h>
 #include <tqfile.h>
 #include <tqfontmetrics.h>
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 837a7fcec..eed255b64 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tasklmbmenu.moc"
 
 #include <tqpainter.h>
-#include <tqstyle.h>
+//#include <tqstyle.h>
 
 #include <kdebug.h>
 #include <kglobalsettings.h>
diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui b/kioslave/media/propsdlgplugin/propertiespagegui.ui
index 416c85c13..62ce92d3b 100644
--- a/kioslave/media/propsdlgplugin/propertiespagegui.ui
+++ b/kioslave/media/propsdlgplugin/propertiespagegui.ui
@@ -374,12 +374,12 @@ Display the short name as is; store a long name when the short name is not all u
 <variables>
     <variable>bool m_hasChanged;</variable>
 </variables>
-<signals>
+<Q_SIGNALS>
     <signal>changed()</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
     <slot access="protected">changedSlot()</slot>
-</slots>
+</Q_SLOTS>
 <functions>
     <function returnType="bool">hasChanged()</function>
 </functions>
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 916e152fd..2711c723a 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -12,6 +12,7 @@
 #include <tqdragobject.h>
 #include <tqtoolbutton.h>
 #include <tqvbox.h>
+#include <tqapplication.h>
 
 KonqSidebar_Tree::KonqSidebar_Tree(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name):
                    KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name)
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index af0bef9c1..514db41d5 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -27,6 +27,7 @@
 #include <tqkeycode.h>
 #include <tqtimer.h>
 #include <tqscrollbar.h>
+#include <tqdragobject.h>
 
 #include <kpopupmenu.h>
 
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp
index 9a89c6cb7..c1bc0a06c 100644
--- a/konsole/konsole/kwrited.cpp
+++ b/konsole/konsole/kwrited.cpp
@@ -30,6 +30,7 @@
 #include <fixx11h.h>
 
 // Qt
+#undef FontChange	// Qt4
 #include <dcopclient.h>
 #include <tqsocketnotifier.h>
 
diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui
index 81baf5c80..c988c1607 100644
--- a/kpersonalizer/keyecandypagedlg.ui
+++ b/kpersonalizer/keyecandypagedlg.ui
@@ -251,10 +251,10 @@ If you have a fast, new processor, you might want to turn them all on, but for t
         <slot>slotEyeCandySliderMoved(int)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>slotEyeCandyShowDetails(bool)</slot>
     <slot>slotEyeCandySliderMoved(int)</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui
index 1419a11bc..7e8a8a63c 100644
--- a/kpersonalizer/kospagedlg.ui
+++ b/kpersonalizer/kospagedlg.ui
@@ -207,12 +207,12 @@ Trinity allows you to customize its behavior according to your needs.</string>
         <slot>slotMacDescription()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>slotWindowsDescription()</slot>
     <slot>slotKDEDescription()</slot>
     <slot>slotMacDescription()</slot>
     <slot>slotUnixDescription()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
diff --git a/kwin/kcmkwin/kwinrules/editshortcutbase.ui b/kwin/kcmkwin/kwinrules/editshortcutbase.ui
index 7f03bb946..af704c0a2 100644
--- a/kwin/kcmkwin/kwinrules/editshortcutbase.ui
+++ b/kwin/kcmkwin/kwinrules/editshortcutbase.ui
@@ -155,10 +155,10 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
         <slot>clearShortcut()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">editShortcut()</slot>
     <slot access="protected" specifier="pure virtual">clearShortcut()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui
index dbcdbb374..5a5640ca2 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui
+++ b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui
@@ -2530,7 +2530,7 @@
     <tabstop>rule_disableglobalshortcuts</tabstop>
     <tabstop>disableglobalshortcuts</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">detectClicked()</slot>
     <slot access="protected" specifier="pure virtual">wmclassMatchChanged()</slot>
     <slot access="protected" specifier="pure virtual">roleMatchChanged()</slot>
@@ -2538,7 +2538,7 @@
     <slot access="protected" specifier="pure virtual">extraMatchChanged()</slot>
     <slot access="protected" specifier="pure virtual">machineMatchChanged()</slot>
     <slot access="protected" specifier="pure virtual">shortcutEditClicked()</slot>
-</slots>
+</Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>