Further cleanup of qmake codes

1 files changed, 35 insertions, 26 deletions

diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
index 3bf9f1d..a5781ee 100644
--- a/qmake/generators/symbian/symmake.h
+++ b/qmake/generators/symbian/symmake.h
@@ -54,12 +54,19 @@ QT_BEGIN_NAMESPACE
 class SymbianMakefileGenerator : public MakefileGenerator
 {
 protected:
+    enum TargetType {
+        TypeExe,
+        TypeDll,
+        TypeLib,
+        TypePlugin,
+        TypeSubdirs
+    };
 
     QString platform;
     QString uid2;
     QString uid3;
     QString privateDirUid;
-    QString targetType;
+    TargetType targetType;
     QMap<QString, QStringList> sources;
     QMap<QString, QStringList> systeminclude;
     QMap<QString, QStringList> library;
@@ -70,46 +77,50 @@ protected:
     QStringList generatedDirs;
     QHash<QString, QString> qt2S60LangMapTable;
 
+    QString fixedTarget;
+
     void removeSpecialCharacters(QString& str);
     QString fixPathForMmp(const QString& origPath, const QDir& parentDir);
     QString canonizePath(const QString& origPath);
 
     virtual bool writeMakefile(QTextStream &t);
-    bool generatePkgFile(const QString &compiler, const QString &config, const QString &iconFile);
+    void generatePkgFile(const QString &compiler, const QString &config, const QString &iconFile);
     bool containsStartWithItem(const QChar &c, const QStringList& src);
 
     virtual void init();
 
     QString getTargetExtension();
-    bool isConfigSetToSymbian();
 
     QString generateUID3();
 
-    bool initMmpVariables();
+    void initMmpVariables();
 
     void writeHeader(QTextStream &t);
-    bool writeBldInfContent(QTextStream& t, bool addDeploymentExtension);
+    void writeBldInfContent(QTextStream& t, bool addDeploymentExtension);
 
     static bool removeDuplicatedStrings(QStringList& stringList);
 
-    bool writeMmpFileHeader(QTextStream &t);
-    bool writeMmpFile(QString &filename, QStringList &symbianLangCodes);
-    bool writeMmpFileMacrosPart(QTextStream& t);
-    bool addMacro(QTextStream& t, const QString& value);
-    bool writeMmpFileTargetPart(QTextStream& t);
-    bool writeMmpFileResourcePart(QTextStream& t, QStringList &symbianLangCodes);
-    bool writeMmpFileSystemIncludePart(QTextStream& t);
-    bool writeMmpFileIncludePart(QTextStream& t);
-    bool writeMmpFileLibraryPart(QTextStream& t);
-    bool writeMmpFileCapabilityPart(QTextStream& t);
-    bool writeMmpFileCompilerOptionPart(QTextStream& t);
-    bool writeMmpFileBinaryVersionPart(QTextStream& t);
-    bool writeMmpFileRulesPart(QTextStream& t);
-
-    bool writeRegRssFile(QString &appname, QStringList &useritems);
-    bool writeRssFile(QString &appName, QString &numberOfIcons, QString &iconfile);
-    bool writeLocFile(QString &appName, QStringList &symbianLangCodes);
+    void writeMmpFileHeader(QTextStream &t);
+    void writeMmpFile(QString &filename, QStringList &symbianLangCodes);
+    void writeMmpFileMacrosPart(QTextStream& t);
+    void addMacro(QTextStream& t, const QString& value);
+    void writeMmpFileTargetPart(QTextStream& t);
+    void writeMmpFileResourcePart(QTextStream& t, QStringList &symbianLangCodes);
+    void writeMmpFileSystemIncludePart(QTextStream& t);
+    void writeMmpFileIncludePart(QTextStream& t);
+    void writeMmpFileLibraryPart(QTextStream& t);
+    void writeMmpFileCapabilityPart(QTextStream& t);
+    void writeMmpFileCompilerOptionPart(QTextStream& t);
+    void writeMmpFileBinaryVersionPart(QTextStream& t);
+    void writeMmpFileRulesPart(QTextStream& t);
+
+    void writeCustomDefFile();
+
+    void writeRegRssFile(QString &appname, QStringList &useritems);
+    void writeRssFile(QString &appName, QString &numberOfIcons, QString &iconfile);
+    void writeLocFile(QString &appName, QStringList &symbianLangCodes);
     void readRssRules(QString &numberOfIcons, QString &iconFile, QStringList &userRssRules);
+
     QStringList symbianLangCodesFromTsFiles();
     void fillQt2S60LangMapTable();
 
@@ -127,12 +138,10 @@ protected:
 
     void generateDistcleanTargets(QTextStream& t);
 
-    bool writeCustomDefFile();
-
     // Subclass implements
-    virtual bool writeBldInfExtensionRulesPart(QTextStream& t) = 0;
+    virtual void writeBldInfExtensionRulesPart(QTextStream& t) = 0;
     virtual void writeBldInfMkFilePart(QTextStream& t, bool addDeploymentExtension) = 0;
-    virtual bool writeMkFile(const QString& wrapperFileName, bool deploymentOnly) = 0;
+    virtual void writeMkFile(const QString& wrapperFileName, bool deploymentOnly) = 0;
     virtual void writeWrapperMakefile(QFile& wrapperFile, bool isPrimaryMakefile) = 0;
 
 public: