[Marble-commits] KDE/kdeedu/marble

[Bernhard Beschow]

SVN commit 1165672 by beschow:

remove methods from MarbleWidget that were commented to be removed a long time ago

 M  +3 -0      docs/release_notes/APIChanges-0.11.txt  
 M  +0 -48     src/lib/MarbleWidget.cpp  
 M  +0 -8      src/lib/MarbleWidget.h  


--- trunk/KDE/kdeedu/marble/docs/release_notes/APIChanges-0.11.txt #1165671:1165672
@@ -13,3 +13,6 @@
 * Introduce MarbleWidget::viewport().
   Use MarbleWidget::viewport() rather than MarbleWidget::map()->viewport().
   Use MarbleWidget::viewport()->mapCoversViewport() rahter than MarbleWidget::map()->mapCoversViewport().
+
+* From MarbleWidget remove setProxy(), proxyHost(), proxyPort(), user(), password().
+  These methods haven't been meaningful to MarbleWidget and have been commented to be removed a long time ago.
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1165671:1165672
@@ -74,10 +74,6 @@
           m_animationsEnabled( false ),
           m_inputhandler( 0 ),
           m_physics( new MarblePhysics( parent ) ),
-          m_proxyHost(),
-          m_proxyPort( 0 ),
-          m_user(),
-          m_password(),
           m_repaintTimer()
     {
     }
@@ -125,12 +121,6 @@
 
     MarblePhysics    *m_physics;
 
-    //This stuff is NEVER used. Needs to be deleted
-    QString          m_proxyHost;
-    qint16           m_proxyPort;
-    QString          m_user;
-    QString          m_password;
-
     // For scheduling repaints
     QTimer           m_repaintTimer;
 };
@@ -1293,44 +1283,6 @@
     }
 }
 
-void MarbleWidget::setProxy( const QString& proxyHost, const quint16 proxyPort, const QString& user, const QString& password  )
-{
-    d->m_proxyHost = proxyHost;
-    d->m_proxyPort = proxyPort;
-    d->m_user = user;
-    d->m_password = password;
-
-    QNetworkProxy::ProxyType type = QNetworkProxy::HttpProxy;
-
-    // Make sure that no proxy is used for an empty string or the default value: 
-    if ( proxyHost.isEmpty() || proxyHost == "http://" )
-        type = QNetworkProxy::NoProxy;
-
-    QNetworkProxy proxy( type, d->m_proxyHost, d->m_proxyPort, d->m_user, d->m_password );
-    QNetworkProxy::setApplicationProxy( proxy );
-    mDebug() << "MarbleWidget::setProxy" << type << d->m_proxyHost << d->m_proxyPort << d->m_user << d->m_password;
-}
-
-QString MarbleWidget::proxyHost() const
-{
-    return d->m_proxyHost;
-}
-
-quint16 MarbleWidget::proxyPort() const
-{
-    return d->m_proxyPort;
-}
-
-QString MarbleWidget::user() const
-{
-    return d->m_user;
-}
-
-QString MarbleWidget::password() const
-{
-    return d->m_password;
-}
-
 QList<RenderPlugin *> MarbleWidget::renderPlugins() const
 {
     return d->m_model->renderPlugins();
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h #1165671:1165672
@@ -486,14 +486,6 @@
 
     SunLocator* sunLocator();
 
-    //These methods should all be removed
-    // what does this do to binary compatibility?
-    void setProxy( const QString& proxyHost, const quint16 proxyPort, const QString& user, const QString& password );
-    QString proxyHost() const;
-    quint16 proxyPort() const;
-    QString user() const;
-    QString password() const;
-
     /**
      * @brief Returns a list of all RenderPlugins on the widget, this includes float items
      * @return the list of RenderPlugins