forked from qt-creator/qt-creator
		
	android: simplify code, pull out common subexpressions
Change-Id: If3540328c0f2f0af375ccaba2e10c5417e8f1ed9 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
		@@ -33,10 +33,7 @@
 | 
			
		||||
 | 
			
		||||
#include "androidrunconfiguration.h"
 | 
			
		||||
 | 
			
		||||
#include <QObject>
 | 
			
		||||
 | 
			
		||||
namespace Debugger { class DebuggerRunControl; }
 | 
			
		||||
namespace QtSupport {class BaseQtVersion; }
 | 
			
		||||
namespace ProjectExplorer { class RunControl; }
 | 
			
		||||
 | 
			
		||||
namespace Android {
 | 
			
		||||
@@ -54,7 +51,6 @@ public:
 | 
			
		||||
 | 
			
		||||
    AndroidDebugSupport(AndroidRunConfiguration *runConfig,
 | 
			
		||||
        Debugger::DebuggerRunControl *runControl);
 | 
			
		||||
    ~AndroidDebugSupport();
 | 
			
		||||
 | 
			
		||||
private slots:
 | 
			
		||||
    void handleRemoteProcessStarted(int gdbServerPort = -1, int qmlPort = -1);
 | 
			
		||||
@@ -63,9 +59,6 @@ private slots:
 | 
			
		||||
    void handleRemoteOutput(const QByteArray &output);
 | 
			
		||||
    void handleRemoteErrorOutput(const QByteArray &output);
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    static QStringList qtSoPaths(QtSupport::BaseQtVersion *qtVersion);
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    Debugger::DebuggerRunControl* m_runControl;
 | 
			
		||||
    AndroidRunner * const m_runner;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user