From 4eec2a77cfa8719f0cf7f6741c8cfa11b23ebf5b Mon Sep 17 00:00:00 2001
From: Kevin Ottens <ervin@kde.org>
Date: Mon, 2 Apr 2007 19:30:57 +0000
Subject: [PATCH] Further cleanup to prepare the move.

svn path=/trunk/KDE/kdebase/apps/; revision=649519
---
 src/kfileplacesselector_p.h |  4 ++--
 src/kprotocolcombo_p.h      | 20 ++++++++++----------
 src/kurlnavigator.h         |  4 ++--
 src/kurlnavigatorbutton_p.h |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/kfileplacesselector_p.h b/src/kfileplacesselector_p.h
index 1efe9bb4e2..f5c60ba469 100644
--- a/src/kfileplacesselector_p.h
+++ b/src/kfileplacesselector_p.h
@@ -66,7 +66,7 @@ public:
     /** @see QWidget::sizeHint() */
     virtual QSize sizeHint() const;
 
-signals:
+Q_SIGNALS:
     /**
      * Is send when a bookmark has been activated by the user.
      * @param url URL of the selected place.
@@ -80,7 +80,7 @@ protected:
      */
     virtual void paintEvent(QPaintEvent* event);
 
-private slots:
+private Q_SLOTS:
     /**
      * Updates the selected index and the icon to the bookmark
      * which is indicated by the triggered action \a action.
diff --git a/src/kprotocolcombo_p.h b/src/kprotocolcombo_p.h
index da2e4e7569..8a58f5bfb6 100644
--- a/src/kprotocolcombo_p.h
+++ b/src/kprotocolcombo_p.h
@@ -30,20 +30,20 @@ class KProtocolCombo : public KUrlNavigatorButton
 {
     Q_OBJECT
 
-    public:
-        explicit KProtocolCombo(const QString& protocol, KUrlNavigator* parent = 0);
+public:
+    explicit KProtocolCombo(const QString& protocol, KUrlNavigator* parent = 0);
 
-        QString currentProtocol() const;
+    QString currentProtocol() const;
 
-    public slots:
-        void setProtocol(const QString& protocol);
-        void setProtocol(int index);
+public Q_SLOTS:
+    void setProtocol(const QString& protocol);
+    void setProtocol(int index);
 
-    signals:
-        void activated(const QString& protocol);
+Q_SIGNALS:
+    void activated(const QString& protocol);
 
-    private:
-        QStringList m_protocols;
+private:
+    QStringList m_protocols;
 };
 
 #endif
diff --git a/src/kurlnavigator.h b/src/kurlnavigator.h
index c8e01b7d0d..56e9761551 100644
--- a/src/kurlnavigator.h
+++ b/src/kurlnavigator.h
@@ -145,7 +145,7 @@ public:
     void dropUrls(const KUrl::List& urls,
                   const KUrl& destination);
 
-public slots:
+public Q_SLOTS:
     /**
      * Sets the current active URL.
      * The signals UrlNavigator::urlChanged and UrlNavigator::historyChanged
@@ -165,7 +165,7 @@ public slots:
      */
     void storeContentsPosition(int x, int y);
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted, if the URL navigator has been activated by
      * a user interaction.
diff --git a/src/kurlnavigatorbutton_p.h b/src/kurlnavigatorbutton_p.h
index 2244cc6994..606ccb180d 100644
--- a/src/kurlnavigatorbutton_p.h
+++ b/src/kurlnavigatorbutton_p.h
@@ -64,7 +64,7 @@ protected:
     virtual void dragEnterEvent(QDragEnterEvent* event);
     virtual void dragLeaveEvent(QDragLeaveEvent* event);
 
-private slots:
+private Q_SLOTS:
     void updateNavigatorUrl();
     void startPopupDelay();
     void stopPopupDelay();