Make AndroidManager completely static

All the methods are static now, so there's no need to instanciate the
class.

Change-Id: Ibb615f1f863ed1ad8e27dfb44d69998ea1061550
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

src/plugins/android/androidmanager.cpp

@@ -79,17 +79,6 @@ namespace {
 namespace Android {
 namespace Internal {
 
-AndroidManager *AndroidManager::m_instance = 0;
-
-AndroidManager *AndroidManager::instance()
-{
-    return m_instance;
-}
-
-AndroidManager::~AndroidManager()
-{
-}
-
 bool AndroidManager::supportsAndroid(ProjectExplorer::Target *target)
 {
     if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project()))
@@ -696,16 +685,6 @@ bool AndroidManager::saveLibsXml(ProjectExplorer::Target *target, QDomDocument &
     return saveXmlFile(target, doc, libsPath(target));
 }
 
-AndroidManager::AndroidManager(QObject *parent) :
-    QObject(parent)
-{
-    m_instance = this;
-
-//    ProjectExplorer::SessionManager *sm = ProjectExplorerPlugin::instance()->session();
-//    connect(sm, SIGNAL(projectAdded(ProjectExplorer::Project*)),
-//            this, SLOT(handleProjectAdditions(ProjectExplorer::Project*)));
-}
-
 void AndroidManager::raiseError(const QString &reason)
 {
     QMessageBox::critical(0, tr("Error creating Android templates"), reason);

src/plugins/android/androidmanager.h

@@ -58,10 +58,6 @@ public:
         ReleaseBuildSigned
     };
 
-    static AndroidManager *instance();
-
-    ~AndroidManager();
-
     static bool supportsAndroid(ProjectExplorer::Target *target);
 
     static QString packageName(ProjectExplorer::Target *target);
@@ -121,8 +117,6 @@ public:
     static bool setPrebundledLibs(ProjectExplorer::Target *target, const QStringList &libs);
 
 private:
-    explicit AndroidManager(QObject *parent = 0);
-
     static void raiseError(const QString &reason);
     static bool openXmlFile(ProjectExplorer::Target *target, QDomDocument &doc,
                             const Utils::FileName &fileName, bool createAndroidTemplates = false);
@@ -165,10 +159,6 @@ private:
     static QStringList dependencies(const Utils::FileName &readelfPath, const QString &lib);
     static int setLibraryLevel(const QString &library, LibrariesMap &mapLibs);
     static bool qtLibrariesLessThan(const Library &a, const Library &b);
-
-    static AndroidManager *m_instance;
-
-    friend class Android::AndroidPlugin;
 };
 
 } // namespace Internal

src/plugins/android/androidplugin.cpp

@@ -67,8 +67,6 @@ bool AndroidPlugin::initialize(const QStringList &arguments,
 
     Internal::AndroidConfigurations::instance(this);
 
-    new Internal::AndroidManager(this);
-
     addAutoReleasedObject(new Internal::AndroidRunControlFactory);
     addAutoReleasedObject(new Internal::AndroidRunConfigurationFactory);
     addAutoReleasedObject(new Internal::AndroidPackageInstallationFactory);