Use QT macro for signal/slots

svn path=/trunk/KDE/kdebase/nsplugins/; revision=500480

kdepasswd/kcm/chfacedlg.h

@@ -55,7 +55,7 @@ public:
       return QPixmap();
   }
 
-private slots:
+private Q_SLOTS:
   void slotFaceWidgetSelectionChanged( Q3IconViewItem *item )
   	{ enableButtonOK( !item->pixmap()->isNull() ); }
 

kdepasswd/kcm/main.h

@@ -63,7 +63,7 @@ public:
 	 */
 	bool eventFilter(QObject *, QEvent *e);
 
-private slots:
+private Q_SLOTS:
 	void slotChangePassword();
 	//void configChanged() { emit changed(true); };
 	void slotFaceButtonClicked();

keditbookmarks/actionsimpl.h

@@ -29,7 +29,7 @@ class ActionsImpl : public QObject
 public:
    bool save();
 
-public slots:
+public Q_SLOTS:
    void slotLoad();
    void slotSaveAs();
    void slotCut();

keditbookmarks/bookmarkinfo.h

@@ -39,7 +39,7 @@ public:
     KBookmark bookmark() { return m_bk; }
     void updateStatus(); //FIXME where was this called?
 
-public slots:
+public Q_SLOTS:
     void slotTextChangedURL(const QString &);
     void slotTextChangedTitle(const QString &);
     void slotTextChangedComment(const QString &);

keditbookmarks/bookmarkiterator.h

@@ -36,12 +36,12 @@ public:
    virtual ~BookmarkIterator();
    virtual BookmarkIteratorHolder* holder() const = 0;
 
-public slots:
+public Q_SLOTS:
    void nextOne();
    void delayedEmitNextOne();
    void slotCancelTest(BookmarkIterator *t);
 
-signals:
+Q_SIGNALS:
    void deleteSelf(BookmarkIterator *);
 
 protected:

keditbookmarks/bookmarklistview.h

@@ -43,7 +43,7 @@ public:
     virtual void setModel(QAbstractItemModel * view);
     virtual void dragEnterEvent(QDragEnterEvent *event);
     virtual void dragMoveEvent(QDragMoveEvent *event);
-public slots:
+public Q_SLOTS:
     void aboutToMoveRows(const QModelIndex & oldParent, int first, int last, const QModelIndex & newParent, int position);
     void rowsMoved(const QModelIndex & oldParent, int first, int last, const QModelIndex & newParent, int position);
 protected:

keditbookmarks/bookmarkmodel.h

@@ -66,7 +66,7 @@ public:
     // The pointer to the event is retrieved in dropMimeData()
     void saveDropEventPointer(QDropEvent * event);
 
-signals:
+Q_SIGNALS:
     //FIXME searchline should respond too
     void aboutToMoveRows(const QModelIndex &, int, int, const QModelIndex &, int);
     void rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);

keditbookmarks/favicons.h

@@ -51,7 +51,7 @@ public:
    ~FavIconsItr();
    virtual FavIconsItrHolder* holder() const { return FavIconsItrHolder::self(); }
 
-public slots:
+public Q_SLOTS:
    void slotDone(bool succeeded);
 
 protected:

keditbookmarks/kebsearchline.h

@@ -118,7 +118,7 @@ public:
      */
     QAbstractItemView *view() const;
 
-public slots:
+public Q_SLOTS:
     /**
      * Updates search to only make visible the items that match \a s.  If
      * \a s is null then the line edit's text will be used.
@@ -180,7 +180,7 @@ protected:
     */
     virtual void contextMenuEvent( QContextMenuEvent*e );
 
-protected slots:
+protected Q_SLOTS:
     /**
      * When keys are pressed a new search string is created and a timer is
      * activated.  The most recent search is activated when this timer runs out
@@ -252,7 +252,7 @@ private:
      */
     QModelIndex nextRow(const QModelIndex & index);
 
-private slots:
+private Q_SLOTS:
     void listViewDeleted();
     void slotDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
     void slotRowsInserted(const QModelIndex &parent, int first, int last);
@@ -301,7 +301,7 @@ public:
      */
     KViewSearchLine *searchLine() const;
 
-protected slots:
+protected Q_SLOTS:
     /**
      * Creates the widgets inside of the widget.  This is called from the
      * constructor via a single shot timer so that it it guaranteed to run
@@ -310,7 +310,7 @@ protected slots:
      */
     virtual void createWidgets();
 
-private slots:
+private Q_SLOTS:
     void positionInToolBar();
 
 private:

keditbookmarks/testlink.h

@@ -57,7 +57,7 @@ public:
    ~TestLinkItr();
    virtual TestLinkItrHolder* holder() const { return TestLinkItrHolder::self(); }
 
-public slots:
+public Q_SLOTS:
    void slotJobResult(KIO::Job *job);
    void slotJobData(KIO::Job *job, const QByteArray &data);
 

keditbookmarks/toplevel.h

@@ -53,7 +53,7 @@ public:
 
     static CmdHistory *self();
 
-protected slots:
+protected Q_SLOTS:
     void slotCommandExecuted(KCommand *k);
 
 private:
@@ -90,7 +90,7 @@ public:
     static QString makeTimeStr(const QString &);
     static QString makeTimeStr(int);
 
-protected slots:
+protected Q_SLOTS:
     void slotBookmarksChanged(const QString &, const QString &);
 
 private:
@@ -151,10 +151,10 @@ public:
     KBookmark::List selectedBookmarksExpanded() const;
     KBookmark::List allBookmarks() const
         { return KBookmark::List();} //FIXME look up what it is suppposed to do, seems like only bookmarks but not folder are returned
-public slots:
+public Q_SLOTS:
     void slotConfigureToolbars();
 
-protected slots:
+protected Q_SLOTS:
     void slotClipboardDataChanged();
     void slotNewToolbarConfig();
     void selectionChanged();

keditbookmarks/updater.h

@@ -34,7 +34,7 @@ public:
     FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url);
     ~FavIconWebGrabber() {}
 
-protected slots:
+protected Q_SLOTS:
     void slotMimetype(KIO::Job *job, const QString &_type);
     void slotFinished(KIO::Job *job);
 
@@ -58,11 +58,11 @@ public:
     virtual void notifyChange(bool isHost, QString hostOrURL, 
                               QString iconName);
 
-protected slots:
+protected Q_SLOTS:
     void setIconURL(const KURL &iconURL);
     void slotCompleted();
 
-signals:
+Q_SIGNALS:
     void done(bool succeeded);
 
 private:

kfind/kdatecombo.h

@@ -42,7 +42,7 @@ protected:
   bool eventFilter (QObject*, QEvent*);
   virtual void mousePressEvent (QMouseEvent * e);
 
-protected slots:
+protected Q_SLOTS:
    void dateEnteredEvent(QDate d=QDate());
 };
 

kfind/kfind.h

@@ -34,13 +34,13 @@ public:
     void saveState( QDataStream *stream );
     void restoreState( QDataStream *stream );
 
-public slots:
+public Q_SLOTS:
     void startSearch();
     void stopSearch();
     //void newSearch();
     void saveResults();
 
-signals:
+Q_SIGNALS:
     void haveResults(bool);
     void resultSelected(bool);
 

kfind/kfinddlg.h

@@ -37,7 +37,7 @@ private:
   /*Return a QStringList of all subdirs of d*/
   QStringList getAllSubdirs(QDir d);
 
-public slots:
+public Q_SLOTS:
   void startSearch();
   void stopSearch();
   void newSearch();
@@ -49,7 +49,7 @@ public slots:
   void slotDeleteItem(const QString&);
   void slotNewItems( const QString&  );
 
-signals:
+Q_SIGNALS:
   void haveResults(bool);
   void resultSelected(bool);
 

kfind/kfindpart.h

@@ -63,7 +63,7 @@ public:
   virtual void disableIcons( const KURL::List & ){};
   virtual const KFileItem * currentItem(){return 0;};
 
-signals:
+Q_SIGNALS:
     // Konqueror connects directly to those signals
     void started(); // started a search
     void clear(); // delete all items
@@ -73,7 +73,7 @@ signals:
     void findClosed(); // close us
     void deleteItem( KFileItem *item);
 
-protected slots:
+protected Q_SLOTS:
     void slotStarted();
     void slotDestroyMe();
     void addFile(const KFileItem *item, const QString& matchingLine);

kfind/kftabdlg.h

@@ -49,16 +49,16 @@ public:
 
   void setURL( const KURL & url );
 
-public slots:
+public Q_SLOTS:
   void setFocus();
 
-private slots:
+private Q_SLOTS:
   void getDirectory();
   void fixLayout();
   void slotSizeBoxChanged(int);
   void slotEditRegExp();
 
-signals:
+Q_SIGNALS:
     void startSearch();
 
 protected:

kfind/kfwin.h

@@ -42,11 +42,11 @@ public:
 
   QString reducedDir(const QString& fullDir);
 
-public slots:
+public Q_SLOTS:
   void copySelection();
   void slotContextMenu(KListView *,Q3ListViewItem *item,const QPoint&p);
 
-private slots:
+private Q_SLOTS:
   void deleteFiles();
   void fileProperties();
   void openFolder();
@@ -61,7 +61,7 @@ protected:
 
   virtual Q3DragObject *dragObject();
 
-signals:
+Q_SIGNALS:
   void resultSelected(bool);
 
 private:

kfind/kquery.h

@@ -46,10 +46,10 @@ class KQuery : public QObject
   /* Check if file meets the find's requirements*/
   inline void processQuery(KFileItem*);
 
- public slots: 
+ public Q_SLOTS: 
   /* List of files found using slocate */
   void slotListEntries(QStringList);
- protected slots:
+ protected Q_SLOTS:
   /* List of files found using KIO */
   void slotListEntries(KIO::Job *, const KIO::UDSEntryList &);
   void slotResult(KIO::Job *);
@@ -58,7 +58,7 @@ class KQuery : public QObject
   void slotreceivedSdterr(KProcess*,char*,int);
   void slotendProcessLocate(KProcess*);
 
- signals:
+ Q_SIGNALS:
   void addFile(const KFileItem *filename, const QString& matchingLine);
   void result(int);
 

konqueror/client/kfmclient.h

@@ -38,7 +38,7 @@ public:
   /** Make konqueror open a window for @p profile, @p url and @p mimetype */
   static bool openProfile(const QString & profile, const QString & url, const QString & mimetype = QString());
 
-protected slots:
+protected Q_SLOTS:
   void slotResult( KIO::Job * );
   void delayedQuit();
 

konqueror/delayedinitializer.h

@@ -32,10 +32,10 @@ public:
 
     virtual bool eventFilter( QObject *receiver, QEvent *event );
 
-signals:
+Q_SIGNALS:
     void initialize();
 
-private slots:
+private Q_SLOTS:
     void slotInitialize();
 private:
     int m_eventType;

konqueror/dirpart/konq_iconview.h

@@ -36,7 +36,7 @@ protected:
     virtual void mouseReleaseEvent( QMouseEvent* ev );
     virtual void keyPressEvent( QKeyEvent* ev );
     virtual QStyleOptionViewItem viewOptions() const;
-signals:
+Q_SIGNALS:
     void toolTip( const QModelIndex& index );
     void contextMenu( const QPoint& pos, const QModelIndexList& indexes );
     void execute( const QModelIndex& index, Qt::MouseButton mb );

konqueror/dirpart/konq_listview.h

@@ -38,11 +38,11 @@ protected:
     virtual void contextMenuEvent( QContextMenuEvent* ev );
     virtual void mouseReleaseEvent( QMouseEvent* ev );
     virtual void keyPressEvent( QKeyEvent* ev );
-signals:
+Q_SIGNALS:
     void toolTip( const QModelIndex& index );
     void contextMenu( const QPoint& pos, const QModelIndexList& indexes );
     void execute( const QModelIndex& index, Qt::MouseButton mb );
-private slots:
+private Q_SLOTS:
     void slotCurrentChanged( const QModelIndex& index, const QModelIndex& );
 };
 

konqueror/dirpart/konq_part.h

@@ -43,7 +43,7 @@ private:
     QAbstractItemView* m_view;
     KonqModel* m_model;
     KonqFileTip* m_fileTip;
-protected slots:
+protected Q_SLOTS:
     virtual void slotNewItems( const KFileItemList& );
     virtual bool openFile() { return true; }
     virtual void disableIcons( const KURL::List& ) {}
@@ -57,7 +57,7 @@ protected slots:
     virtual void slotRedirection( const KURL& ) {}
     virtual bool doOpenURL( const KURL& );
     virtual bool doCloseURL() { return true; }
-private slots:
+private Q_SLOTS:
     void slotExecute( const QModelIndex& index, Qt::MouseButton mb );
     void slotToolTip( const QModelIndex& index );
     void slotContextMenu( const QPoint& pos, const QModelIndexList& indexes );

konqueror/dirpart/konq_selectionmodel.h

@@ -28,7 +28,7 @@ class KonqSelectionModel : public QItemSelectionModel
 public:
     KonqSelectionModel( QAbstractItemModel* model );
     ~KonqSelectionModel();
-public slots:
+public Q_SLOTS:
     virtual void select( const QItemSelection& selection, QItemSelectionModel::SelectionFlags command );
     virtual void select( const QModelIndex& index, QItemSelectionModel::SelectionFlags command );
 };

konqueror/iconview/konq_iconview.h

@@ -73,7 +73,7 @@ public:
   void determineIcon( KFileIVI * item );
   int iconSize() { return m_pIconView->iconSize(); }
 
-public slots:
+public Q_SLOTS:
   void slotPreview( bool toggle );
   void slotShowDirectoryOverlays();
   void slotShowDot();
@@ -91,7 +91,7 @@ public slots:
   void slotSortDescending();
   void slotSortDirsFirst();
 
-protected slots:
+protected Q_SLOTS:
   // slots connected to Q3IconView
   void slotReturnPressed( Q3IconViewItem *item );
   void slotMouseButtonPressed(int, Q3IconViewItem*, const QPoint&);
@@ -238,7 +238,7 @@ public:
   virtual int xOffset();
   virtual int yOffset();
 
-public slots:
+public Q_SLOTS:
   // Those slots are automatically connected by the shell
   void reparseConfiguration();
   void setSaveViewPropertiesLocally( bool value );
@@ -283,7 +283,7 @@ public:
     void dragEntered(KonqKfmIconView *view);
     void dragFinished(KonqKfmIconView *view);
 
-private slots:
+private Q_SLOTS:
     void finished();
 
 private:

konqueror/konq_actions.h

@@ -52,10 +52,10 @@ public:
                            bool checkCurrentItem = false,
                            uint startPos = 0 );
 
-protected slots:
+protected Q_SLOTS:
     void slotActivated( int );
 
-signals:
+Q_SIGNALS:
     void menuAboutToShow();
     // -1 for one step back, 0 for don't move, +1 for one step forward, etc.
     void activated( int );
@@ -107,7 +107,7 @@ public:
     QMenu *popupMenu() const { return m_menu; }
     QString desktopEntryName() const { return m_desktopEntryName; }
 
-private slots:
+private Q_SLOTS:
     void slotPopupAboutToShow();
     void slotPopupActivated();
     void slotPopupAboutToHide();
@@ -136,10 +136,10 @@ public:
 			     const char *name );
     virtual ~KonqMostOftenURLSAction();
 
-signals:
+Q_SIGNALS:
     void activated( const KURL& );
 
-private slots:
+private Q_SLOTS:
     void slotHistoryCleared();
     void slotEntryAdded( const KonqHistoryEntry *entry );
     void slotEntryRemoved( const KonqHistoryEntry *entry );

konqueror/konq_browseriface.h

@@ -14,7 +14,7 @@ public:
 
     uint historyLength() const;
 
-public slots:
+public Q_SLOTS:
     void goHistory( int );
 
 private:

konqueror/konq_combo.h

@@ -78,7 +78,7 @@ protected:
     void paintEvent( QPaintEvent * );
     void selectWord(QKeyEvent *e);
 
-signals:
+Q_SIGNALS:
     /** 
       Specialized signal that emits the state of the modifier
       keys along with the actual activated text.
@@ -90,7 +90,7 @@ signals:
      */
     void showPageSecurity();
 
-private slots:
+private Q_SLOTS:
     void slotCleared();
     void slotSetIcon( int index );
     void slotActivated( const QString& text );

konqueror/konq_extensionmanager.h

@@ -41,7 +41,7 @@ class KonqExtensionManager : public KDialogBase
 
 		void apply();
 
-	public slots:
+	public Q_SLOTS:
 		void setChanged(bool c);
 
 		virtual void slotDefault();

konqueror/konq_frame.h

@@ -113,7 +113,7 @@ class KonqFrameStatusBar : public KStatusBar
        */
       void updateActiveStatus();
 
-   public slots:
+   public Q_SLOTS:
       void slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *oldOne,KParts::ReadOnlyPart *newOne);
       void slotLoadingProgress( int percent );
       void slotSpeedProgress( int bytesPerSecond );
@@ -122,7 +122,7 @@ class KonqFrameStatusBar : public KStatusBar
       void slotClear();
       void message ( const QString & message );
 
-   signals:
+   Q_SIGNALS:
       /**
        * This signal is emitted when the user clicked the bar.
        */
@@ -277,7 +277,7 @@ public:
 
   QString title() const { return m_title; }
 
-public slots:
+public Q_SLOTS:
 
   /**
    * Is called when the frame statusbar has been clicked
@@ -405,7 +405,7 @@ public:
   //inherited
   virtual void childEvent( QChildEvent * );
 
-signals:
+Q_SIGNALS:
   void ctrlTabPressed();
   void setRubberbandCalled();
   

konqueror/konq_guiclients.h

@@ -85,7 +85,7 @@ public:
 
   void saveConfig( bool add, const QString &serviceName );
 
-private slots:
+private Q_SLOTS:
   void slotToggleView( bool toggle );
   void slotViewAdded( KonqView *view );
   void slotViewRemoved( KonqView *view );

konqueror/konq_mainwindow.h

@@ -327,11 +327,11 @@ public:
 
   QStringList configModules() const;
 
-signals:
+Q_SIGNALS:
   void viewAdded( KonqView *view );
   void viewRemoved( KonqView *view );
 
-public slots:
+public Q_SLOTS:
   void slotCtrlTabPressed();
 
   // for KBookmarkMenu and KBookmarkBar
@@ -424,7 +424,7 @@ public slots:
 
   void slotAddTab();
 
-protected slots:
+protected Q_SLOTS:
   void slotViewCompleted( KonqView * view );
 
   void slotURLEntered( const QString &text, int );
@@ -543,7 +543,7 @@ protected:
 
   bool askForTarget(const QString& text, KURL& url);
 
-private slots:
+private Q_SLOTS:
   void slotRequesterClicked( KURLRequester * );
   void slotIntro();
   /**

konqueror/konq_mainwindow_p.h

@@ -30,7 +30,7 @@ public:
   virtual void openBookmarkURL( const QString & _url );
   virtual QString currentTitle() const;
   virtual QString currentURL() const;
-public slots:
+public Q_SLOTS:
   // for KExtendedBookmarkOwner
   void slotFillBookmarksList( KExtendedBookmarkOwner::QStringPairList & list );
 private:

konqueror/konq_misc.h

@@ -126,7 +126,7 @@ protected:
     void dragEnterEvent( QDragEnterEvent *ev );
     void dropEvent( QDropEvent* ev );
 
-private slots:
+private Q_SLOTS:
     void delayedOpenURL();
 
 private:

konqueror/konq_profiledlg.h

@@ -59,7 +59,7 @@ public:
    */
   static KonqProfileMap readAllProfiles();
 
-protected slots:
+protected Q_SLOTS:
   virtual void slotUser1(); // User1 is "Rename Profile" button
   virtual void slotUser2(); // User2 is "Delete Profile" button
   virtual void slotUser3(); // User3 is Save button

konqueror/konq_run.h

@@ -59,7 +59,7 @@ protected:
   virtual void init();
   virtual void scanFile();
 
-protected slots:
+protected Q_SLOTS:
   void slotRedirection( KIO::Job *, const KURL& );
 
 protected:

konqueror/konq_tabs.h

@@ -91,11 +91,11 @@ public:
   void moveTabForward(int index);
 
 
-public slots:
+public Q_SLOTS:
   void slotCurrentChanged( QWidget* newPage );
   void setAlwaysTabbedMode( bool );
 
-signals:
+Q_SIGNALS:
   void ctrlTabPressed();
   void removeTabPopup();
 
@@ -105,7 +105,7 @@ protected:
 
   Q3PtrList<KonqFrameBase>* m_pChildFrameList;
 
-private slots:
+private Q_SLOTS:
   void slotContextMenu( const QPoint& );
   void slotContextMenu( QWidget*, const QPoint& );
   void slotCloseRequest( QWidget* );

konqueror/konq_view.h

@@ -325,7 +325,7 @@ public:
 
   static KParts::BrowserHostExtension *hostExtension( KParts::ReadOnlyPart *part, const QString &name );
 
-signals:
+Q_SIGNALS:
 
   /**
    * Signal the main window that the embedded part changed (e.g. because of changeViewMode)
@@ -342,7 +342,7 @@ signals:
    */
   void backRightClick();
 
-public slots:
+public Q_SLOTS:
   /**
    * Store location-bar URL in the child view
    * and updates the main view if this view is the current one
@@ -364,7 +364,7 @@ public slots:
   // but also to KonqRun's job
   void slotInfoMessage( KIO::Job *, const QString &msg );
 
-protected slots:
+protected Q_SLOTS:
   // connected to the KROP's KIO::Job
   void slotStarted( KIO::Job * job );
   void slotCompleted();

konqueror/konq_viewmgr.h

@@ -285,7 +285,7 @@ public:
 
   QString profileHomeURL() const { return m_profileHomeURL; }
 
-protected slots:
+protected Q_SLOTS:
   void emitActivePartChanged();
 
   void slotProfileDlg();

konqueror/kttsplugin/khtmlkttsd.h

@@ -39,7 +39,7 @@ public:
      * Destructor.
      */
     virtual ~KHTMLPluginKTTSD();
-public slots:
+public Q_SLOTS:
     void slotReadOut();
 };
  

konqueror/listview/konq_infolistviewwidget.h

@@ -44,7 +44,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget
       
       virtual bool openURL( const KURL &url );
 
-   protected slots:
+   protected Q_SLOTS:
       // slots connected to the directory lister
 //      virtual void setComplete();
       virtual void slotNewItems( const KFileItemList & );

konqueror/listview/konq_listview.h

@@ -99,7 +99,7 @@ protected:
   void setupActions();
   void guiActivateEvent( KParts::GUIActivateEvent *event );
 
-protected slots:
+protected Q_SLOTS:
   void slotSelect();
   void slotUnselect();
   void slotSelectAll();
@@ -180,7 +180,7 @@ class ListViewBrowserExtension : public KonqDirPartBrowserExtension
       virtual int xOffset();
       virtual int yOffset();
 
-   protected slots:
+   protected Q_SLOTS:
       void updateActions();
 
       void copy() { copySelection( false ); }

konqueror/listview/konq_listviewwidget.h

@@ -148,16 +148,16 @@ public:
    KonqListView *m_pBrowserView;
    KonqFMSettings *m_pSettings;
 
-signals:
+Q_SIGNALS:
    void viewportAdjusted();
 
-public slots:
+public Q_SLOTS:
    //virtual void slotOnItem( KonqBaseListViewItem* _item );
    void slotMouseButtonClicked( int _button, Q3ListViewItem *_item, const QPoint& pos, int );
    virtual void slotExecuted( Q3ListViewItem *_item );
    void slotItemRenamed( Q3ListViewItem *, const QString &, int );
 
-protected slots:
+protected Q_SLOTS:
    void slotAutoScroll();
 
    // from QListView

konqueror/listview/konq_textviewwidget.h

@@ -38,7 +38,7 @@ class KonqTextViewWidget : public KonqBaseListViewWidget
       ~KonqTextViewWidget();
       virtual bool isExecuteArea( const QPoint& point );
 
-   protected slots:
+   protected Q_SLOTS:
       // slots connected to the directory lister
       virtual void setComplete();
       virtual void slotNewItems( const KFileItemList & );

konqueror/listview/konq_treeviewwidget.h

@@ -42,7 +42,7 @@ public:
    virtual void saveState( QDataStream &stream );
    virtual void restoreState( QDataStream &stream );
 
-protected slots:
+protected Q_SLOTS:
    // slots connected to the directory lister
    virtual void slotCompleted();
    virtual void slotCompleted( const KURL & );

konqueror/preloader/preloader.h

@@ -37,7 +37,7 @@ class KonqyPreloader
         ASYNC unregisterPreloadedKonqy( DCOPCString id );
         void reconfigure();
         void unloadAllPreloaded();
-    private slots:
+    private Q_SLOTS:
         void appRemoved( const QByteArray& id );
 	void checkAlwaysPreloaded();
     private:

konqueror/remoteencodingplugin/kremoteencodingplugin.h

@@ -38,7 +38,7 @@ public:
 			const QStringList &);
   ~KRemoteEncodingPlugin();
 
-protected slots:
+protected Q_SLOTS:
   void slotAboutToOpenURL();
   void slotAboutToShow();
   void slotItemSelected(int);

konqueror/settings/css/kcmcss.h

@@ -41,7 +41,7 @@ public:
   void save();
   void defaults();
 
-public slots:
+public Q_SLOTS:
  
   void slotPreview();
   void slotCustomize();

konqueror/settings/ebrowsing/filteropts.h

@@ -38,7 +38,7 @@ public:
     void save();
     void defaults();
 
-protected slots:
+protected Q_SLOTS:
     void moduleChanged(bool state);
 
 private:

konqueror/settings/ebrowsing/plugins/ikws/ikwsopts.h

@@ -42,7 +42,7 @@ public:
     void defaults();
     QString quickHelp() const;
 
-protected slots:
+protected Q_SLOTS:
     void configChanged();
     void checkFavoritesChanged();
 

konqueror/settings/ebrowsing/plugins/ikws/searchproviderdlg.h

@@ -34,7 +34,7 @@ public:
 
     SearchProvider *provider() { return m_provider; }
 
-protected slots:
+protected Q_SLOTS:
     void slotChanged();
     void slotOk();
 

konqueror/settings/ebrowsing/plugins/localdomain/localdomainurifilter.h

@@ -58,7 +58,7 @@ class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject
     mutable QString m_fullname;
     QRegExp m_hostPortPattern;
 
-  private slots:
+  private Q_SLOTS:
     void receiveOutput( KProcess *, char *, int );
 };
 

konqueror/settings/filetypes/filegroupdetails.h

@@ -34,10 +34,10 @@ public:
 
   void setTypeItem( TypesListItem * item );
 
-signals:
+Q_SIGNALS:
   void changed(bool);
 
-protected slots:
+protected Q_SLOTS:
   void slotAutoEmbedClicked(int button);
 
 private:

konqueror/settings/filetypes/filetypedetails.h

@@ -30,11 +30,11 @@ protected:
   void updateRemoveButton();
   void updateAskSave();
 
-signals:
+Q_SIGNALS:
   void embedMajor(const QString &major, bool &embed); // To adjust whether major type is being embedded
   void changed(bool);
 
-protected slots:
+protected Q_SLOTS:
   void updateIcon(QString icon);
   void updateDescription(const QString &desc);
   void addExtension();

konqueror/settings/filetypes/filetypesview.h

@@ -35,7 +35,7 @@ public:
   void save();
   void defaults();
 
-protected slots:
+protected Q_SLOTS:
   /** fill in the various graphical elements, set up other stuff. */
   void init();
 

konqueror/settings/filetypes/keditfiletype.h

@@ -32,7 +32,7 @@ public:
   FileTypeDialog( KMimeType::Ptr mime );
   FileTypeDialog( KMimeType::Ptr mime, bool newItem );
 
-protected slots:
+protected Q_SLOTS:
 
   //virtual void slotDefault();
   //virtual void slotUser1(); // Reset

konqueror/settings/filetypes/kservicelistwidget.h

@@ -53,10 +53,10 @@ public:
 
   void setTypeItem( TypesListItem * item );
 
-signals:
+Q_SIGNALS:
   void changed(bool);
 
-protected slots:
+protected Q_SLOTS:
   void promoteService();
   void demoteService();
   void addService();

konqueror/settings/kio/cache.h

@@ -39,7 +39,7 @@ public:
   virtual void defaults();
   QString quickHelp() const;
 
-protected slots:
+protected Q_SLOTS:
   void configChanged();
   void slotClearCache();
 

konqueror/settings/kio/kcookiesmanagement.h

@@ -73,7 +73,7 @@ public:
     virtual void defaults();
     virtual QString quickHelp() const;
 
-private slots:
+private Q_SLOTS:
     void deleteCookie();
     void deleteAllCookies();
     void getDomains();

konqueror/settings/kio/kcookiespolicies.h

@@ -51,7 +51,7 @@ public:
 
     void addNewPolicy(const QString& domain);
 
-protected slots:
+protected Q_SLOTS:
     void autoAcceptSessionCookies ( bool );
     void ignoreCookieExpirationDate ( bool );
     void cookiesEnabled( bool );

konqueror/settings/kio/kenvvarproxydlg.h

@@ -38,7 +38,7 @@ public:
     virtual const KProxyData data() const;
     virtual void setProxyData( const KProxyData &data );
 
-protected slots:
+protected Q_SLOTS:
     virtual void slotOk();
 
     void showValue();

konqueror/settings/kio/kmanualproxydlg.h

@@ -43,7 +43,7 @@ protected:
   void init();
   bool validate();
   
-protected slots:
+protected Q_SLOTS:
   virtual void slotOk();
   
   void copyDown();

konqueror/settings/kio/kproxydlg.h

@@ -63,7 +63,7 @@ public:
   virtual void defaults();
   QString quickHelp() const;
 
-private slots:
+private Q_SLOTS:
   void slotChanged();
   void slotUseProxyChanged();
 

konqueror/settings/kio/netpref.h

@@ -26,7 +26,7 @@ public:
 
     QString quickHelp() const;
 
-protected slots:
+protected Q_SLOTS:
     void configChanged() { emit changed(true); }
 
 private:

konqueror/settings/kio/policydlg.h

@@ -78,7 +78,7 @@ public:
   void setEnableHostEdit( bool, const QString& host = QString() );
   void setPolicy (int policy);
 
-protected slots:
+protected Q_SLOTS:
   void slotTextChanged( const QString& );
 
 private:

konqueror/settings/kio/smbrodlg.h

@@ -41,7 +41,7 @@ class SMBRoOptions : public KCModule
       virtual void defaults();
       QString quickHelp() const;
 
-   private slots:
+   private Q_SLOTS:
       void changed();
 
    private:

konqueror/settings/kio/socks.h

@@ -49,10 +49,10 @@ public:
   int buttons();
   QString quickHelp() const;
 
-public slots:
+public Q_SLOTS:
   void configChanged();
 
-private slots:
+private Q_SLOTS:
   void enableChanged();
   void methodChanged(int id);
   void testClicked();

konqueror/settings/kio/uagentproviderdlg.h

@@ -54,7 +54,7 @@ public:
   QString identity();
   QString alias();
 
-protected slots:
+protected Q_SLOTS:
   void slotActivated( const QString& );
   void slotTextChanged( const QString& );
 

konqueror/settings/kio/useragentdlg.h

@@ -44,7 +44,7 @@ public:
   virtual void defaults();
   QString quickHelp() const;
 
-private slots:
+private Q_SLOTS:
   void updateButtons();
   void selectionChanged();
 

konqueror/settings/konq/behaviour.h

@@ -45,7 +45,7 @@ public:
   virtual void save();
   virtual void defaults();
 
-protected slots:
+protected Q_SLOTS:
 
   void updateWinPixmap(bool);
   void slotShowTips(bool);

konqueror/settings/konq/desktop.h

@@ -43,7 +43,7 @@ class KDesktopConfig : public KCModule
   void save();
   void defaults();
   
- protected slots:
+ protected Q_SLOTS:
   void slotValueChanged(int);
     
  private:

konqueror/settings/konq/desktopbehavior_impl.h

@@ -37,10 +37,10 @@ public:
         friend class DesktopBehaviorPreviewItem;
 	friend class DesktopBehaviorMediaItem;
 
-signals:
+Q_SIGNALS:
         void changed();
 
-private slots:
+private Q_SLOTS:
         void enableChanged();
 	void comboBoxChanged();
 	void editButtonPressed();
@@ -68,7 +68,7 @@ public:
         virtual void save() { m_behavior->save(); emit KCModule::changed( false ); }
         virtual void defaults() { m_behavior->defaults(); emit KCModule::changed( true ); }
 
-private slots:
+private Q_SLOTS:
         void changed();
 
 private:

konqueror/settings/konq/fontopts.h

@@ -60,7 +60,7 @@ public:
   virtual void save();
   virtual void defaults();
 
-public slots:
+public Q_SLOTS:
   void slotFontSize(int i);
   void slotStandardFont(const QString& n);
   void slotTextBackgroundClicked();

konqueror/settings/konq/previews.h

@@ -54,7 +54,7 @@ public:
 protected:
     void load(bool useDefaults);
 
-public slots:
+public Q_SLOTS:
     void changed();
 
 private:

konqueror/settings/konq/rootopts.h

@@ -42,7 +42,7 @@ public:
         virtual void save();
         virtual void defaults();
 
-private slots:
+private Q_SLOTS:
     void slotEntries( KIO::Job * job, const KIO::UDSEntryList& list);
 
 private:
@@ -56,7 +56,7 @@ private:
         KURL m_copyToDest; // used when the destination directory already exists
         KURL m_copyFromSrc;
 
-private slots:
+private Q_SLOTS:
         void slotResult( KIO::Job * job );
 };
 

konqueror/settings/konqhtml/advancedTabDialog.h

@@ -32,7 +32,7 @@ class advancedTabDialog : public KDialogBase
         advancedTabDialog(QWidget* parent, KConfig *config, const char* name);
         ~advancedTabDialog();
 
-    protected slots:
+    protected Q_SLOTS:
         void load();
         void save();
         void changed();

konqueror/settings/konqhtml/appearance.h

@@ -30,7 +30,7 @@ public:
   virtual void save();
   virtual void defaults();
 
-public slots:
+public Q_SLOTS:
   void slotFontSize( int );
   void slotMinimumFontSize( int );
   void slotStandardFont(const QString& n);

konqueror/settings/konqhtml/domainlistview.h

@@ -132,7 +132,7 @@ public:
   void save(const QString &group, const QString &domainListKey);
 
 
-signals:
+Q_SIGNALS:
   /**
    * indicates that a configuration has been changed within this list view.
    * @param state true if changed, false if not
@@ -181,7 +181,7 @@ protected:
   virtual void setupPolicyDlg(PushButton trigger,PolicyDialog &pDlg,
   		Policies *copy);
 
-private slots:
+private Q_SLOTS:
   void addPressed();
   void changePressed();
   void deletePressed();

konqueror/settings/konqhtml/filteropts.h

@@ -40,9 +40,9 @@ public:
     void defaults();
     QString quickHelp() const;
     
-public slots:
+public Q_SLOTS:
 
-protected slots:
+protected Q_SLOTS:
     void insertFilter();
     void updateFilter();
     void removeFilter();

konqueror/settings/konqhtml/htmlopts.h

@@ -39,7 +39,7 @@ public:
     virtual void save();
     virtual void defaults();
 
-private slots:
+private Q_SLOTS:
     void slotChanged();
     void launchAdvancedTabDialog();
 

konqueror/settings/konqhtml/javaopts.h

@@ -96,7 +96,7 @@ public:
 
     bool _removeJavaScriptDomainAdvice;
 
-private slots:
+private Q_SLOTS:
     void slotChanged();
     void toggleJavaControls();
 

konqueror/settings/konqhtml/jsopts.h

@@ -65,7 +65,7 @@ public:
 
   bool _removeJavaScriptDomainAdvice;
 
-private slots:
+private Q_SLOTS:
   void slotChangeJSEnabled();
 
 private:

konqueror/settings/konqhtml/jspolicies.h

@@ -242,13 +242,13 @@ public:
     refresh();
   }
 
-signals:
+Q_SIGNALS:
   /**
    * emitted every time an option has been changed
    */
   void changed();
 
-private slots:
+private Q_SLOTS:
   void setWindowOpenPolicy(int id);
   void setWindowResizePolicy(int id);
   void setWindowMovePolicy(int id);

konqueror/settings/konqhtml/khttpoptdlg.h

@@ -40,7 +40,7 @@ Q_OBJECT
 
     QString defaultCharsets;
 
-private slots:
+private Q_SLOTS:
     void slotChanged();
 
 };

konqueror/settings/konqhtml/pluginopts.h

@@ -82,7 +82,7 @@ public:
 
   void setMainWidget(QWidget *widget);
 
-private slots:
+private Q_SLOTS:
   virtual void slotClose();
 
 private:
@@ -103,7 +103,7 @@ public:
     virtual void defaults();
     QString quickHelp() const;
 
-private slots:
+private Q_SLOTS:
     void slotChanged();
     void slotTogglePluginsEnabled();
     void slotShowDomainDlg();
@@ -116,7 +116,7 @@ private:
     QCheckBox *enablePluginsGloballyCB, *enableHTTPOnly, *enableUserDemand;
 
 
- protected slots:
+ protected Q_SLOTS:
   void progress(KProcIO *);
   void updatePLabel(int);
   void change() { change( true ); };
@@ -141,7 +141,7 @@ private:
   void dirLoad( KConfig *config );
   void dirSave( KConfig *config );
 
- protected slots:
+ protected Q_SLOTS:
   void dirNew();
   void dirRemove();
   void dirUp();

konqueror/settings/konqhtml/policydlg.h

@@ -110,7 +110,7 @@ public:
      */
     void addPolicyPanel(QWidget *panel);
 
-protected slots:
+protected Q_SLOTS:
 
     virtual void accept();
     void slotTextChanged( const QString &text);

konqueror/settings/performance/konqueror.h

@@ -33,9 +33,9 @@ class Konqueror
         void load();
         void save();
         void defaults();
-    signals:
+    Q_SIGNALS:
         void changed();
-    private slots:
+    private Q_SLOTS:
 	void preload_count_changed( int );
     private:
         QString allowed_parts;

konqueror/settings/performance/system.h

@@ -35,7 +35,7 @@ class SystemWidget
         void load();
         void save();
         void defaults();
-    signals:
+    Q_SIGNALS:
         void changed();
     };
 

konqueror/shellcmdplugin/kshellcmddialog.h

@@ -40,7 +40,7 @@ class KShellCommandDialog:public KDialog
       KShellCommandExecutor *m_shell;
       KPushButton *cancelButton;
       KPushButton *closeButton;
-   protected slots:
+   protected Q_SLOTS:
       void disableStopButton();
       void slotClose();
 };

konqueror/shellcmdplugin/kshellcmdexecutor.h

@@ -33,16 +33,16 @@ class KShellCommandExecutor:public Q3TextView
       KShellCommandExecutor(const QString& command, QWidget* parent=0);
       virtual ~KShellCommandExecutor();
       int exec();
-   signals:
+   Q_SIGNALS:
       void finished();
-   public slots:
+   public Q_SLOTS:
       void slotFinished();
    protected:
       PtyProcess *m_shellProcess;
       QString m_command;
       QSocketNotifier *m_readNotifier;
       QSocketNotifier *m_writeNotifier;
-   protected slots:
+   protected Q_SLOTS:
       void readDataFromShell();
       void writeDataToShell();
 };

konqueror/shellcmdplugin/kshellcmdplugin.h

@@ -29,7 +29,7 @@ public:
     KShellCmdPlugin( QObject* parent, const char* name, const QStringList & );
     ~KShellCmdPlugin() {}
 
-public slots:
+public Q_SLOTS:
     void slotExecuteShellCommand();
 };
 

konqueror/sidebar/konqsidebar.h

@@ -47,7 +47,7 @@ class KonqSidebarBrowserExtension : public KParts::BrowserExtension
 
 
 // The following slots are needed for konqueror's standard actions
-	protected slots:
+	protected Q_SLOTS:
 	    void copy(){if (widget) widget->stdAction("copy()");}
 	    void cut(){if (widget) widget->stdAction("cut()");}
 	    void paste(){if (widget) widget->stdAction("paste()");}

konqueror/sidebar/konqsidebarplugin.h

@@ -49,7 +49,7 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
 	private:
 		KonqSidebarPluginPrivate *d;
 
-	signals:
+	Q_SIGNALS:
 		void requestURL(KURL&);
 		void started(KIO::Job *);
 		void completed();
@@ -59,7 +59,7 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject
 
 	protected:
 		bool universalMode();
-	public slots:
+	public Q_SLOTS:
 	  void openURL(const KURL& url);
 
 	  void openPreview(const KFileItemList& items);

konqueror/sidebar/sidebar_widget.h

@@ -75,12 +75,12 @@ class addBackEnd: public QObject
 public:
 	addBackEnd(QWidget *parent,class QMenu *addmenu, bool univeral, const QString &currentProfile, const char *name=0);
 	~addBackEnd(){;}
-protected slots:
+protected Q_SLOTS:
 	void aboutToShowAddMenu();
 	void triggeredAddMenu(QAction* action);
 	void doRollBack();
 
-signals:
+Q_SIGNALS:
 	void updateNeeded();
 	void initialCopyNeeded();
 private:
@@ -106,7 +106,7 @@ public:
 	KParts::BrowserExtension *getExtension();
         virtual QSize sizeHint() const;	
 
-public slots:
+public Q_SLOTS:
 	void addWebSideBar(const KURL& url, const QString& name);
 
 protected:
@@ -115,7 +115,7 @@ protected:
 	virtual bool eventFilter(QObject*,QEvent*);
 	virtual void mousePressEvent(QMouseEvent*);
 
-protected slots:
+protected Q_SLOTS:
 	void showHidePage(int value);
 	void createButtons();
 	void updateButtons();
@@ -133,7 +133,7 @@ protected slots:
 	void slotSetIcon();
 	void slotRemove();
 
-signals:
+Q_SIGNALS:
 	void started(KIO::Job *);
 	void completed();
 	void fileSelection(const KFileItemList& iems);
@@ -148,7 +148,7 @@ public:
 
 
  /* The following public slots are wrappers for browserextension fields */
-public slots:
+public Q_SLOTS:
 	void openURLRequest( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() );
 	/* @internal
 	 * @since 3.2
@@ -218,7 +218,7 @@ private:
 	QStringList m_visibleViews; // The views that are actually open
 	QStringList m_openViews; // The views that should be opened
 
-signals:
+Q_SIGNALS:
 	void panelHasBeenExpanded(bool);
 };
 

konqueror/sidebar/trees/bookmark_module/bookmark_module.h

@@ -48,7 +48,7 @@ public:
     void showPopupMenu();
 
 
-protected slots:
+protected Q_SLOTS:
     void slotBookmarksChanged( const QString & );
     void slotMoved(Q3ListViewItem*,Q3ListViewItem*,Q3ListViewItem*);
     void slotDropped(KListView*,QDropEvent*,Q3ListViewItem*,Q3ListViewItem*);
@@ -64,7 +64,7 @@ protected:
     void fillGroup( KonqSidebarTreeItem * parentItem, KBookmarkGroup group );
     KonqSidebarBookmarkItem * findByAddress( const QString & address ) const;
 
-private slots:
+private Q_SLOTS:
     void slotOpenChange(Q3ListViewItem*);
 
 private:
@@ -89,7 +89,7 @@ public:
     QString finalUrl() const;
     QString finalTitle() const;
 
-protected slots:
+protected Q_SLOTS:
     void slotOk();
     void slotCancel();
 

konqueror/sidebar/trees/dirtree_module/dirtree_module.h

@@ -49,7 +49,7 @@ public:
     void addSubDir( KonqSidebarTreeItem *item );
     void removeSubDir( KonqSidebarTreeItem *item, bool childrenonly = false );
 
-private slots:
+private Q_SLOTS:
     void slotNewItems( const KFileItemList & );
     void slotRefreshItems( const KFileItemList & );
     void slotDeleteItem( KFileItem *item );

konqueror/sidebar/trees/history_module/history_module.h

@@ -65,10 +65,10 @@ public:
 	return url.host().isEmpty() ? misc : url.host();
     }
 
-public slots:
+public Q_SLOTS:
     void clear();
 
-private slots:
+private Q_SLOTS:
     void slotCreateItems();
     void slotEntryAdded( const KonqHistoryEntry * );
     void slotEntryRemoved( const KonqHistoryEntry * );

konqueror/sidebar/trees/history_module/history_settings.h

@@ -50,7 +50,7 @@ public:
     QFont m_fontYoungerThan;
     QFont m_fontOlderThan;
 
-signals:
+Q_SIGNALS:
     void settingsChanged();
 
 protected:

konqueror/sidebar/trees/history_module/kcmhistory.h

@@ -40,7 +40,7 @@ public:
 
   QString quickHelp() const;
 
-private slots:
+private Q_SLOTS:
   void configChanged();
 
   void slotGetFontNewer();