Browse Source

owncloudcmd: Do not read the proxy settings from the gui's config file

The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config
Olivier Goffart 8 years ago
parent
commit
204cb470b4
1 changed files with 1 additions and 4 deletions
  1. 1 4
      src/cmd/cmd.cpp

+ 1 - 4
src/cmd/cmd.cpp

@@ -23,10 +23,10 @@
 #include <QFileInfo>
 #include <QFileInfo>
 #include <QJsonDocument>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonObject>
+#include <QNetworkProxy>
 #include <qdebug.h>
 #include <qdebug.h>
 
 
 #include "account.h"
 #include "account.h"
-#include "clientproxy.h"
 #include "configfile.h" // ONLY ACCESS THE STATIC FUNCTIONS!
 #include "configfile.h" // ONLY ACCESS THE STATIC FUNCTIONS!
 #include "creds/httpcredentials.h"
 #include "creds/httpcredentials.h"
 #include "simplesslerrorhandler.h"
 #include "simplesslerrorhandler.h"
@@ -327,7 +327,6 @@ int main(int argc, char **argv)
     options.restartTimes = 3;
     options.restartTimes = 3;
     options.uplimit = 0;
     options.uplimit = 0;
     options.downlimit = 0;
     options.downlimit = 0;
-    ClientProxy clientProxy;
 
 
     parseOptions(app.arguments(), &options);
     parseOptions(app.arguments(), &options);
 
 
@@ -439,8 +438,6 @@ int main(int argc, char **argv)
         } else {
         } else {
             qFatal("Could not read httpproxy. The proxy should have the format \"http://hostname:port\".");
             qFatal("Could not read httpproxy. The proxy should have the format \"http://hostname:port\".");
         }
         }
-    } else {
-        clientProxy.setupQtProxyFromConfig();
     }
     }
 
 
     SimpleSslErrorHandler *sslErrorHandler = new SimpleSslErrorHandler;
     SimpleSslErrorHandler *sslErrorHandler = new SimpleSslErrorHandler;