Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
2ec85cc6
Commit
2ec85cc6
authored
Jan 19, 2011
by
Christian Kandeler
Browse files
Maemo: Make some stateless functions static.
parent
3af81887
Changes
9
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp
View file @
2ec85cc6
#include
"maemodeploystepfactory.h"
#include
"maemodeploystep.h"
#include
"maemo
manager
.h"
#include
"maemo
global
.h"
#include
<projectexplorer/buildconfiguration.h>
#include
<projectexplorer/buildsteplist.h>
...
...
@@ -24,7 +24,7 @@ MaemoDeployStepFactory::MaemoDeployStepFactory(QObject *parent)
QStringList
MaemoDeployStepFactory
::
availableCreationIds
(
BuildStepList
*
parent
)
const
{
if
(
parent
->
id
()
==
QLatin1String
(
ProjectExplorer
::
Constants
::
BUILDSTEPS_DEPLOY
)
&&
Maemo
Manager
::
instance
().
isMaemoTargetId
(
parent
->
target
()
->
id
())
&&
Maemo
Global
::
isMaemoTargetId
(
parent
->
target
()
->
id
())
&&
!
parent
->
contains
(
MaemoDeployStep
::
Id
))
return
QStringList
()
<<
MaemoDeployStep
::
Id
;
return
QStringList
();
...
...
@@ -42,7 +42,7 @@ bool MaemoDeployStepFactory::canCreate(BuildStepList *parent, const QString &id)
{
return
parent
->
id
()
==
QLatin1String
(
ProjectExplorer
::
Constants
::
BUILDSTEPS_DEPLOY
)
&&
id
==
QLatin1String
(
MaemoDeployStep
::
Id
)
&&
Maemo
Manager
::
instance
().
isMaemoTargetId
(
parent
->
target
()
->
id
())
&&
Maemo
Global
::
isMaemoTargetId
(
parent
->
target
()
->
id
())
&&
!
parent
->
contains
(
MaemoDeployStep
::
Id
);
}
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
View file @
2ec85cc6
...
...
@@ -38,6 +38,7 @@
#include
<coreplugin/filemanager.h>
#include
<coreplugin/ssh/sshconnection.h>
#include
<qt4projectmanager/qt4projectmanagerconstants.h>
#include
<qt4projectmanager/qtversionmanager.h>
#include
<utils/environment.h>
...
...
@@ -55,6 +56,46 @@ namespace {
static
const
QLatin1String
binQmake
(
"/bin/qmake"
EXEC_SUFFIX
);
}
bool
MaemoGlobal
::
isMaemoTargetId
(
const
QString
&
id
)
{
return
id
==
QLatin1String
(
Constants
::
MAEMO5_DEVICE_TARGET_ID
)
||
id
==
QLatin1String
(
Constants
::
HARMATTAN_DEVICE_TARGET_ID
);
}
bool
MaemoGlobal
::
isValidMaemo5QtVersion
(
const
QtVersion
*
version
)
{
return
isValidMaemoQtVersion
(
version
,
Maemo5
);
}
bool
MaemoGlobal
::
isValidHarmattanQtVersion
(
const
QtVersion
*
version
)
{
return
isValidMaemoQtVersion
(
version
,
Maemo6
);
}
bool
MaemoGlobal
::
isValidMaemoQtVersion
(
const
QtVersion
*
qtVersion
,
MaemoVersion
maemoVersion
)
{
if
(
version
(
qtVersion
)
!=
maemoVersion
)
return
false
;
QProcess
madAdminProc
;
const
QStringList
arguments
(
QLatin1String
(
"list"
));
if
(
!
callMadAdmin
(
madAdminProc
,
arguments
,
qtVersion
))
return
false
;
if
(
!
madAdminProc
.
waitForStarted
()
||
!
madAdminProc
.
waitForFinished
())
return
false
;
madAdminProc
.
setReadChannel
(
QProcess
::
StandardOutput
);
const
QByteArray
tgtName
=
targetName
(
qtVersion
).
toAscii
();
while
(
madAdminProc
.
canReadLine
())
{
const
QByteArray
&
line
=
madAdminProc
.
readLine
();
if
(
line
.
contains
(
tgtName
)
&&
(
line
.
contains
(
"(installed)"
)
||
line
.
contains
(
"(default)"
)))
return
true
;
}
return
false
;
}
QString
MaemoGlobal
::
homeDirOnDevice
(
const
QString
&
uname
)
{
return
uname
==
QLatin1String
(
"root"
)
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
View file @
2ec85cc6
...
...
@@ -71,6 +71,10 @@ public:
const
QString
m_fileName
;
};
static
bool
isMaemoTargetId
(
const
QString
&
id
);
static
bool
isValidMaemo5QtVersion
(
const
Qt4ProjectManager
::
QtVersion
*
version
);
static
bool
isValidHarmattanQtVersion
(
const
Qt4ProjectManager
::
QtVersion
*
version
);
static
QString
homeDirOnDevice
(
const
QString
&
uname
);
static
QString
remoteSudo
();
static
QString
remoteCommandPrefix
(
const
QString
&
commandFilePath
);
...
...
@@ -127,6 +131,8 @@ public:
}
private:
static
bool
isValidMaemoQtVersion
(
const
Qt4ProjectManager
::
QtVersion
*
qtVersion
,
MaemoVersion
maemoVersion
);
static
QString
madAdminCommand
(
const
QtVersion
*
qtVersion
);
static
bool
callMaddeShellScript
(
QProcess
&
proc
,
const
QString
&
maddeRoot
,
const
QString
&
command
,
const
QStringList
&
args
);
...
...
src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
View file @
2ec85cc6
...
...
@@ -45,7 +45,6 @@
#include
"qt4maemotargetfactory.h"
#include
<extensionsystem/pluginmanager.h>
#include
<qt4projectmanager/qt4projectmanagerconstants.h>
#include
<qt4projectmanager/qtversionmanager.h>
#include
<QtCore/QDir>
...
...
@@ -110,45 +109,6 @@ MaemoManager &MaemoManager::instance()
return
*
m_instance
;
}
bool
MaemoManager
::
isMaemoTargetId
(
const
QString
&
id
)
const
{
return
id
==
QLatin1String
(
Constants
::
MAEMO5_DEVICE_TARGET_ID
)
||
id
==
QLatin1String
(
Constants
::
HARMATTAN_DEVICE_TARGET_ID
);
}
bool
MaemoManager
::
isValidMaemo5QtVersion
(
const
QtVersion
*
version
)
const
{
return
isValidMaemoQtVersion
(
version
,
MaemoGlobal
::
Maemo5
);
}
bool
MaemoManager
::
isValidHarmattanQtVersion
(
const
QtVersion
*
version
)
const
{
return
isValidMaemoQtVersion
(
version
,
MaemoGlobal
::
Maemo6
);
}
bool
MaemoManager
::
isValidMaemoQtVersion
(
const
QtVersion
*
qtVersion
,
MaemoGlobal
::
MaemoVersion
maemoVersion
)
const
{
if
(
MaemoGlobal
::
version
(
qtVersion
)
!=
maemoVersion
)
return
false
;
QProcess
madAdminProc
;
const
QStringList
arguments
(
QLatin1String
(
"list"
));
if
(
!
MaemoGlobal
::
callMadAdmin
(
madAdminProc
,
arguments
,
qtVersion
))
return
false
;
if
(
!
madAdminProc
.
waitForStarted
()
||
!
madAdminProc
.
waitForFinished
())
return
false
;
madAdminProc
.
setReadChannel
(
QProcess
::
StandardOutput
);
const
QByteArray
targetName
=
MaemoGlobal
::
targetName
(
qtVersion
).
toAscii
();
while
(
madAdminProc
.
canReadLine
())
{
const
QByteArray
&
line
=
madAdminProc
.
readLine
();
if
(
line
.
contains
(
targetName
)
&&
(
line
.
contains
(
"(installed)"
)
||
line
.
contains
(
"(default)"
)))
return
true
;
}
return
false
;
}
ToolChain
*
MaemoManager
::
maemo5ToolChain
(
const
QtVersion
*
version
)
const
{
return
new
Maemo5ToolChain
(
version
);
...
...
src/plugins/qt4projectmanager/qt-maemo/maemomanager.h
View file @
2ec85cc6
...
...
@@ -34,8 +34,6 @@
#ifndef MAEMOMANAGER_H
#define MAEMOMANAGER_H
#include
"maemoglobal.h"
#include
<QtCore/QObject>
namespace
ProjectExplorer
{
...
...
@@ -66,9 +64,6 @@ public:
~
MaemoManager
();
static
MaemoManager
&
instance
();
bool
isMaemoTargetId
(
const
QString
&
id
)
const
;
bool
isValidMaemo5QtVersion
(
const
Qt4ProjectManager
::
QtVersion
*
version
)
const
;
bool
isValidHarmattanQtVersion
(
const
Qt4ProjectManager
::
QtVersion
*
version
)
const
;
ToolChain
*
maemo5ToolChain
(
const
Qt4ProjectManager
::
QtVersion
*
version
)
const
;
ToolChain
*
harmattanToolChain
(
const
Qt4ProjectManager
::
QtVersion
*
version
)
const
;
...
...
@@ -76,9 +71,6 @@ public:
MaemoQemuSettingsPage
*
qemuSettingsPage
()
const
{
return
m_qemuSettingsPage
;
}
private:
bool
isValidMaemoQtVersion
(
const
Qt4ProjectManager
::
QtVersion
*
qtVersion
,
MaemoGlobal
::
MaemoVersion
maemoVersion
)
const
;
static
MaemoManager
*
m_instance
;
MaemoRunControlFactory
*
m_runControlFactory
;
...
...
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationfactory.cpp
View file @
2ec85cc6
...
...
@@ -67,7 +67,7 @@ MaemoPackageCreationFactory::MaemoPackageCreationFactory(QObject *parent)
QStringList
MaemoPackageCreationFactory
::
availableCreationIds
(
ProjectExplorer
::
BuildStepList
*
parent
)
const
{
if
(
parent
->
id
()
==
QLatin1String
(
ProjectExplorer
::
Constants
::
BUILDSTEPS_DEPLOY
)
&&
Maemo
Manager
::
instance
().
isMaemoTargetId
(
parent
->
target
()
->
id
())
&&
Maemo
Global
::
isMaemoTargetId
(
parent
->
target
()
->
id
())
&&
!
parent
->
contains
(
MaemoPackageCreationStep
::
CreatePackageId
))
return
QStringList
()
<<
MaemoPackageCreationStep
::
CreatePackageId
;
return
QStringList
();
...
...
@@ -85,7 +85,7 @@ bool MaemoPackageCreationFactory::canCreate(ProjectExplorer::BuildStepList *pare
{
return
parent
->
id
()
==
QLatin1String
(
ProjectExplorer
::
Constants
::
BUILDSTEPS_DEPLOY
)
&&
id
==
QLatin1String
(
MaemoPackageCreationStep
::
CreatePackageId
)
&&
Maemo
Manager
::
instance
().
isMaemoTargetId
(
parent
->
target
()
->
id
())
&&
Maemo
Global
::
isMaemoTargetId
(
parent
->
target
()
->
id
())
&&
!
parent
->
contains
(
MaemoPackageCreationStep
::
CreatePackageId
);
}
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
View file @
2ec85cc6
...
...
@@ -224,7 +224,7 @@ void MaemoQemuManager::projectChanged(ProjectExplorer::Project *project)
void
MaemoQemuManager
::
targetAdded
(
ProjectExplorer
::
Target
*
target
)
{
if
(
!
target
||
!
Maemo
Manager
::
instance
().
isMaemoTargetId
(
target
->
id
()))
if
(
!
target
||
!
Maemo
Global
::
isMaemoTargetId
(
target
->
id
()))
return
;
// handle all run configuration changes, add, remove, etc...
...
...
@@ -253,7 +253,7 @@ void MaemoQemuManager::targetAdded(ProjectExplorer::Target *target)
void
MaemoQemuManager
::
targetRemoved
(
ProjectExplorer
::
Target
*
target
)
{
if
(
!
target
||
!
Maemo
Manager
::
instance
().
isMaemoTargetId
(
target
->
id
()))
if
(
!
target
||
!
Maemo
Global
::
isMaemoTargetId
(
target
->
id
()))
return
;
disconnect
(
target
,
SIGNAL
(
addedRunConfiguration
(
ProjectExplorer
::
RunConfiguration
*
)),
...
...
@@ -287,14 +287,14 @@ void MaemoQemuManager::targetChanged(ProjectExplorer::Target *target)
void
MaemoQemuManager
::
runConfigurationAdded
(
ProjectExplorer
::
RunConfiguration
*
rc
)
{
if
(
!
rc
||
!
Maemo
Manager
::
instance
().
isMaemoTargetId
(
rc
->
target
()
->
id
()))
if
(
!
rc
||
!
Maemo
Global
::
isMaemoTargetId
(
rc
->
target
()
->
id
()))
return
;
toggleDeviceConnections
(
qobject_cast
<
MaemoRunConfiguration
*>
(
rc
),
true
);
}
void
MaemoQemuManager
::
runConfigurationRemoved
(
ProjectExplorer
::
RunConfiguration
*
rc
)
{
if
(
!
rc
||
!
Maemo
Manager
::
instance
().
isMaemoTargetId
(
rc
->
target
()
->
id
()))
if
(
!
rc
||
!
Maemo
Global
::
isMaemoTargetId
(
rc
->
target
()
->
id
()))
return
;
toggleDeviceConnections
(
qobject_cast
<
MaemoRunConfiguration
*>
(
rc
),
false
);
}
...
...
@@ -307,7 +307,7 @@ void MaemoQemuManager::runConfigurationChanged(ProjectExplorer::RunConfiguration
void
MaemoQemuManager
::
buildConfigurationAdded
(
ProjectExplorer
::
BuildConfiguration
*
bc
)
{
if
(
!
bc
||
!
Maemo
Manager
::
instance
().
isMaemoTargetId
(
bc
->
target
()
->
id
()))
if
(
!
bc
||
!
Maemo
Global
::
isMaemoTargetId
(
bc
->
target
()
->
id
()))
return
;
connect
(
bc
,
SIGNAL
(
environmentChanged
()),
this
,
SLOT
(
environmentChanged
()));
...
...
@@ -315,7 +315,7 @@ void MaemoQemuManager::buildConfigurationAdded(ProjectExplorer::BuildConfigurati
void
MaemoQemuManager
::
buildConfigurationRemoved
(
ProjectExplorer
::
BuildConfiguration
*
bc
)
{
if
(
!
bc
||
!
Maemo
Manager
::
instance
().
isMaemoTargetId
(
bc
->
target
()
->
id
()))
if
(
!
bc
||
!
Maemo
Global
::
isMaemoTargetId
(
bc
->
target
()
->
id
()))
return
;
disconnect
(
bc
,
SIGNAL
(
environmentChanged
()),
this
,
SLOT
(
environmentChanged
()));
...
...
@@ -529,7 +529,7 @@ bool MaemoQemuManager::sessionHasMaemoTarget() const
const
QList
<
Project
*>
&
projects
=
explorer
->
session
()
->
projects
();
foreach
(
const
Project
*
p
,
projects
)
{
foreach
(
const
Target
*
const
target
,
p
->
targets
())
{
if
(
Maemo
Manager
::
instance
().
isMaemoTargetId
(
target
->
id
()))
if
(
Maemo
Global
::
isMaemoTargetId
(
target
->
id
()))
return
true
;
}
}
...
...
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
View file @
2ec85cc6
...
...
@@ -27,11 +27,11 @@
**
**************************************************************************/
#include
"maemomanager.h"
#include
"qt4maemotargetfactory.h"
#include
"qt4project.h"
#include
"qt4projectmanagerconstants.h"
#include
"qt-maemo/maemodeploystep.h"
#include
"maemoglobal.h"
#include
"qt-maemo/maemopackagecreationstep.h"
#include
"qt-maemo/maemorunconfiguration.h"
#include
"qt-maemo/qt4maemotarget.h"
...
...
@@ -62,7 +62,7 @@ Qt4MaemoTargetFactory::~Qt4MaemoTargetFactory()
bool
Qt4MaemoTargetFactory
::
supportsTargetId
(
const
QString
&
id
)
const
{
return
Maemo
Manager
::
instance
().
isMaemoTargetId
(
id
);
return
Maemo
Global
::
isMaemoTargetId
(
id
);
}
QStringList
Qt4MaemoTargetFactory
::
supportedTargetIds
(
ProjectExplorer
::
Project
*
parent
)
const
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
2ec85cc6
...
...
@@ -37,6 +37,7 @@
#include
"qt4target.h"
#include
"profilereader.h"
#include
"qt-maemo/maemoglobal.h"
#include
"qt-maemo/maemomanager.h"
#include
"qt-s60/s60manager.h"
#include
"qt-s60/s60projectchecker.h"
...
...
@@ -1464,10 +1465,10 @@ void QtVersion::updateToolChainAndMkspec() const
m_targetIds
.
insert
(
QLatin1String
(
Constants
::
S60_DEVICE_TARGET_ID
));
# endif
}
}
else
if
(
Maemo
Manager
::
instance
().
isValidMaemo5QtVersion
(
this
))
{
}
else
if
(
Maemo
Global
::
isValidMaemo5QtVersion
(
this
))
{
m_toolChains
<<
ToolChainPtr
(
MaemoManager
::
instance
().
maemo5ToolChain
(
this
));
m_targetIds
.
insert
(
QLatin1String
(
Constants
::
MAEMO5_DEVICE_TARGET_ID
));
}
else
if
(
Maemo
Manager
::
instance
().
isValidHarmattanQtVersion
(
this
))
{
}
else
if
(
Maemo
Global
::
isValidHarmattanQtVersion
(
this
))
{
m_toolChains
<<
ToolChainPtr
(
MaemoManager
::
instance
().
harmattanToolChain
(
this
));
m_targetIds
.
insert
(
QLatin1String
(
Constants
::
HARMATTAN_DEVICE_TARGET_ID
));
}
else
if
(
qmakeCXX
==
"cl"
||
qmakeCXX
==
"icl"
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment