From 0406f543f8c9f30455199e0f3956da41f126b2fb Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 21 Jan 2011 19:40:47 +0000 Subject: [PATCH] Signal/slot repairs git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1216185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/accessibility/accessibilityconfigwidget.ui | 4 ++-- kcontrol/clock/dtime.h | 7 ++++--- kcontrol/colors/widgetcanvas.h | 1 + kcontrol/componentchooser/browserconfig_ui.ui | 4 ++-- kcontrol/componentchooser/emailclientconfig_ui.ui | 4 ++-- .../componentchooser/terminalemulatorconfig_ui.ui | 4 ++-- kcontrol/dnssd/configdialog.ui | 4 ++-- kcontrol/iccconfig/iccconfigbase.ui | 4 ++-- kcontrol/icons/iconthemes.h | 1 + kcontrol/input/xcursor/previewwidget.h | 2 +- kcontrol/input/xcursor/themepage.cpp | 12 ++++++------ kcontrol/input/xcursor/themepage.h | 2 +- kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 1 + kcontrol/kicker/hidingtab.ui | 4 ++-- kcontrol/kicker/lookandfeeltab.ui | 10 +++++----- kcontrol/kicker/positiontab.ui | 4 ++-- kcontrol/locale/kcmlocale.h | 1 + kcontrol/randr/krandrmodule.cpp | 1 + kcontrol/samba/kcmsambalog.h | 1 + kcontrol/smartcard/smartcardbase.ui | 4 ++-- kcontrol/smserver/smserverconfigdlg.ui | 4 ++-- khotkeys/kcontrol/ui/action_group_tab_ui.ui | 4 ++-- khotkeys/kcontrol/ui/action_list_widget_ui.ui | 4 ++-- khotkeys/kcontrol/ui/command_url_widget_ui.ui | 4 ++-- khotkeys/kcontrol/ui/condition_list_widget_ui.ui | 4 ++-- khotkeys/kcontrol/ui/dcop_widget_ui.ui | 4 ++-- khotkeys/kcontrol/ui/general_settings_tab_ui.ui | 4 ++-- khotkeys/kcontrol/ui/general_tab_ui.ui | 4 ++-- khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui | 4 ++-- khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui | 4 ++-- khotkeys/kcontrol/ui/menuentry_widget_ui.ui | 4 ++-- khotkeys/kcontrol/ui/triggers_tab_ui.ui | 4 ++-- khotkeys/kcontrol/ui/voice_input_widget_ui.ui | 4 ++-- khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui | 4 ++-- khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui | 4 ++-- kicker/applets/clock/digital.ui | 4 ++-- kicker/applets/clock/settings.ui | 5 +++-- kicker/extensions/kasbar/kasbarapp.cpp | 4 ++-- kicker/extensions/kasbar/kasitem.h | 1 + kicker/libkicker/panelbutton.cpp | 1 + kicker/taskmanager/tasklmbmenu.cpp | 2 +- kioslave/media/propsdlgplugin/propertiespagegui.ui | 8 ++++---- konqueror/sidebar/trees/konqsidebar_tree.cpp | 1 + konsole/konsole/TEWidget.h | 1 + konsole/konsole/kwrited.cpp | 1 + kpersonalizer/keyecandypagedlg.ui | 4 ++-- kpersonalizer/kospagedlg.ui | 4 ++-- kwin/kcmkwin/kwinrules/editshortcutbase.ui | 4 ++-- kwin/kcmkwin/kwinrules/ruleswidgetbase.ui | 4 ++-- 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 accessibilityconfigwidget.ui.h kdialog.h - + updateFlashScreenColor() - + 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 -#include -#include +#include +#include +#include +#include #include #include #include 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 +#undef None // Qt4 #include #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 @@ kdialog.h - + selectBrowser() - + 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 @@ kdialog.h - + selectEmailClient() - + 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 @@ kdialog.h - + selectTerminalApp() - + 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. - + radioButton2_2_toggled(bool) - + kcmodule.h 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 @@ ICCConfigBase.ui.h - + enableSupport_toggled(bool) - + kdialog.h 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 #include #include #include 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 #include #include #include 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 @@ knuminput.h kdialog.h - + switchPanel(int) - + 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. kcfg_BackgroundTheme - urlSelected(const QString&) + urlSelected(const TQString&) LookAndFeelTabBase browseTheme(const QString&) @@ -570,7 +570,7 @@ This option is only active if 'Enable background image' is selected. kcfg_BackgroundTheme - returnPressed(const QString&) + returnPressed(const TQString&) LookAndFeelTabBase browseTheme(const QString&) @@ -621,11 +621,11 @@ This option is only active if 'Enable background image' is selected. kurlrequester.h kdialog.h - + launchAdvancedDialog() - browseTheme(const QString&) + browseTheme(const TQString&) enableTransparency(bool) - + 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.knuminput.h kdialog.h - + lengthenPanel( int ) movePanel( int ) panelDimensionsChanged() switchPanel( int ) - + 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 #include #include 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 #include #include #include 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 #include #include +#include #include #include 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 @@ smartcardbase.ui.h - + slotTestReader() enableSupport_toggled(bool) enablePolling_toggled(bool) - + kdialog.h 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 @@ kdialog.h - + configChanged() - + 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 @@ - + action_group_name_changed( const QString& ) - + ktextedit.h 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 @@ class QListViewItem; - + copy_pressed() current_changed(QListViewItem*) delete_pressed() modify_pressed() - + kdialog.h 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 @@ - + browse_pressed() - + kdialog.h 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 @@ class QListViewItem; - + copy_pressed() current_changed(QListViewItem*) delete_pressed() modify_pressed() - + kdialog.h 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 @@ try_button PushButton1 - + run_kdcop_pressed() try_pressed() - + kdialog.h 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 @@ kdialog.h - + import_clicked() - + 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 @@ - + action_name_changed( const QString& ) action_type_changed(int) - + kdialog.h 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 @@ edit_gesture_pressed3() - + edit_gesture_pressed1() edit_gesture_pressed2() edit_gesture_pressed3() - + kdialog.h 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 @@ kdialog.h - + modify_pressed() - + 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 @@ browse_pressed() - + browse_pressed() - + kdialog.h 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 @@ class QListViewItem; - + copy_pressed() current_changed(QListViewItem*) delete_pressed() modify_pressed() - + kdialog.h 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 @@ slotPlayPressed() - + slotRecordPressed() slotPlayPressed() slotStopPressed() - + kpushbutton.h 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 @@ class QListViewItem; - + copy_pressed() current_changed(QListViewItem*) delete_pressed() modify_pressed() - + kdialog.h 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 @@ window_role_lineedit autodetect_button - + window_class_combo_changed(int) window_role_combo_changed(int) window_title_combo_changed(int) - + kdialog.h 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 @@ kfontrequester.h digital.ui.h - + kcfg_DigitalLCDStyle_stateChanged( int ) - + 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 @@ tzListView + tqheader.h kdialog.h kfontrequester.h - + configureType() - + 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 #include #include +#include #include 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 #include #include 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 -#include +//#include #include #include 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 bool m_hasChanged; - + changed() - - + + changedSlot() - + hasChanged() 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 #include #include +#include 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 #include #include +#include #include 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 // Qt +#undef FontChange // Qt4 #include #include 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 slotEyeCandySliderMoved(int) - + slotEyeCandyShowDetails(bool) slotEyeCandySliderMoved(int) - + kdialog.h 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. slotMacDescription() - + slotWindowsDescription() slotKDEDescription() slotMacDescription() slotUnixDescription() - + kdialog.h 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 "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try clearShortcut() - + editShortcut() clearShortcut() - + 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 @@ rule_disableglobalshortcuts disableglobalshortcuts - + detectClicked() wmclassMatchChanged() roleMatchChanged() @@ -2538,7 +2538,7 @@ extraMatchChanged() machineMatchChanged() shortcutEditClicked() - +