[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kfile
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-04 8:31:28
Message-ID: 20101104083128.C5178AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192886 by ervin:

Remove deprecated symbols from the build (if KDE_NO_DEPRECATED is defined).

 M  +22 -0     kurlnavigator.cpp  
 M  +20 -0     kurlnavigator.h  


--- trunk/KDE/kdelibs/kfile/kurlnavigator.cpp #1192885:1192886
@@ -56,8 +56,10 @@
 struct LocationData
 {
     KUrl url;
+#ifndef KDE_NO_DEPRECATED
     KUrl rootUrl;      // KDE5: remove after the deprecated methods have been removed
     QPoint pos;        // KDE5: remove after the deprecated methods have been removed
+#endif
     QByteArray state;
 };
 
@@ -400,9 +402,11 @@
     if (!urls.isEmpty()) {
         emit q->urlsDropped(destination, event);
 
+#ifndef KDE_NO_DEPRECATED
         // KDE5: remove, as the signal has been replaced by
         // urlsDropped(const KUrl& destination, QDropEvent* event)
         emit q->urlsDropped(urls, destination);
+#endif
     }
 }
 
@@ -1066,23 +1070,29 @@
     }
 }
 
+#ifndef KDE_NO_DEPRECATED
 void KUrlNavigator::setUrl(const KUrl& url)
 {
     // deprecated
     setLocationUrl(url);
 }
+#endif
 
+#ifndef KDE_NO_DEPRECATED
 void KUrlNavigator::saveRootUrl(const KUrl& url)
 {
     // deprecated
     d->m_history[d->m_historyIndex].rootUrl = url;
 }
+#endif
 
+#ifndef KDE_NO_DEPRECATED
 void KUrlNavigator::savePosition(int x, int y)
 {
     // deprecated
     d->m_history[d->m_historyIndex].pos = QPoint(x, y);
 }
+#endif
 
 void KUrlNavigator::keyPressEvent(QKeyEvent* event)
 {
@@ -1159,6 +1169,7 @@
     return d->m_customProtocols;
 }
 
+#ifndef KDE_NO_DEPRECATED
 const KUrl& KUrlNavigator::url() const
 {
     // deprecated
@@ -1169,19 +1180,25 @@
     url = locationUrl();
     return url;
 }
+#endif
 
+#ifndef KDE_NO_DEPRECATED
 KUrl KUrlNavigator::url(int index) const
 {
     // deprecated
     return d->buttonUrl(index);
 }
+#endif
 
+#ifndef KDE_NO_DEPRECATED
 KUrl KUrlNavigator::historyUrl(int historyIndex) const
 {
     // deprecated
     return locationUrl(historyIndex);
 }
+#endif
 
+#ifndef KDE_NO_DEPRECATED
 const KUrl& KUrlNavigator::savedRootUrl() const
 {
     // deprecated
@@ -1192,17 +1209,22 @@
     rootUrl = d->m_history[d->m_historyIndex].rootUrl;
     return rootUrl;
 }
+#endif
 
+#ifndef KDE_NO_DEPRECATED
 QPoint KUrlNavigator::savedPosition() const
 {
     // deprecated
     return d->m_history[d->m_historyIndex].pos;
 }
+#endif
 
+#ifndef KDE_NO_DEPRECATED
 void KUrlNavigator::setHomeUrl(const QString& homeUrl)
 {
     // deprecated
     setLocationUrl(KUrl(homeUrl));
 }
+#endif
 
 #include "kurlnavigator.moc"
--- trunk/KDE/kdelibs/kfile/kurlnavigator.h #1192885:1192886
@@ -276,7 +276,9 @@
      * @return     The current URL of the location.
      * @deprecated Use KUrlNavigator::locationUrl() instead.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED const KUrl& url() const;
+#endif
 
     /**
      * @return The portion of the current URL up to the path part given
@@ -288,7 +290,9 @@
      * - index >= 3: /home/peter/Documents/Music
      * @deprecated It should not be necessary for a client of KUrlNavigator to query this information.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED KUrl url(int index) const;
+#endif
 
     /**
      * @return URL for the history element with the index \a historyIndex.
@@ -296,23 +300,31 @@
      * @since 4.3
      * @deprecated Use KUrlNavigator::locationUrl(historyIndex) instead.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED KUrl historyUrl(int historyIndex) const;
+#endif
 
     /**
      * @return The saved root URL for the current URL (see KUrlNavigator::saveRootUrl()).
      * @deprecated Use KUrlNavigator::locationState() instead.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED const KUrl& savedRootUrl() const;
+#endif
 
     /**
      * @return The saved contents position of the upper left corner
      *         for the current URL.
      * @deprecated Use KUrlNavigator::locationState() instead.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED QPoint savedPosition() const;
+#endif
 
     /** @deprecated Use setHomeUrl(const KUrl& url) instead. */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED void setHomeUrl(const QString& homeUrl);
+#endif
 
 public Q_SLOTS:
     /**
@@ -338,19 +350,25 @@
      * Sets the location to \a url.
      * @deprecated Use KUrlNavigator::setLocationUrl(url).
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED void setUrl(const KUrl& url);
+#endif
 
     /**
      * Saves the used root URL of the content for the current history element.
      * @deprecated Use KUrlNavigator::saveLocationState() instead.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED void saveRootUrl(const KUrl& url);
+#endif
 
     /**
      * Saves the coordinates of the contents for the current history element.
      * @deprecated Use KUrlNavigator::saveLocationState() instead.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED void savePosition(int x, int y);
+#endif
 
 Q_SIGNALS:
     /**
@@ -417,8 +435,10 @@
      */
     // KDE5: remove, as the signal has been replaced by
     // urlsDropped(const KUrl& destination, QDropEvent* event)
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED void urlsDropped(const KUrl::List& urls,
                                     const KUrl& destination);
+#endif
 
 protected:
     /*
[prev in list] [next in list] [prev in thread] [next in thread]