Merge pull request #38 from macgitver/sacu/repoman-extracts

Extracts from the RepoMan branch

CMakeLists.txt

@@ -29,6 +29,7 @@ ENDIF()
 
 IF(UNIX)
     GCC_ADD_FLAG("-Wall")
+    GCC_ADD_FLAG("-W")
     GCC_ADD_FLAG("-fvisibility=hidden")
     GCC_ADD_FLAG("-fvisibility-inlines-hidden")
 ENDIF()

CfgComp/CfgComp.cpp

@@ -88,11 +88,11 @@ int main( int argc, char** argv )
 
     ConfigSection sect( doc.documentElement() );
 
-    WriteClassSource wcs( outputFileDir % sect.className() % QLatin1String( ".cpp" ),
-                          sect.className() % QLatin1String( ".hpp" ), sect );
+    WriteClassSource wcs( outputFileDir % sect.className() % QStringLiteral( ".cpp" ),
+                          sect.className() % QStringLiteral( ".hpp" ), sect );
     wcs.generate();
 
-    WriteClassHeader wch( outputFileDir % sect.className() % QLatin1String( ".hpp" ), sect );
+    WriteClassHeader wch( outputFileDir % sect.className() % QStringLiteral( ".hpp" ), sect );
     wch.generate();
 
     return 0;

CfgComp/Model.cpp

@@ -28,14 +28,14 @@ ConfigSetting::ConfigSetting( QDomElement el, ConfigSubSection* parent )
 {
     mSubSection = parent;
 
-    mName = el.attribute( QLatin1String( "Name" ) );
-    mDefaultValue = el.attribute( QLatin1String( "Default" ), QString() );
-    mType = el.attribute( QLatin1String( "Type" ) );
-    mSubType = el.attribute( QLatin1String( "Subtype" ), QString() );
-    mValidatorRule = el.attribute( QLatin1String( "Validate" ), QString() );
+    mName = el.attribute( QStringLiteral( "Name" ) );
+    mDefaultValue = el.attribute( QStringLiteral( "Default" ), QString() );
+    mType = el.attribute( QStringLiteral( "Type" ) );
+    mSubType = el.attribute( QStringLiteral( "Subtype" ), QString() );
+    mValidatorRule = el.attribute( QStringLiteral( "Validate" ), QString() );
 
-    mEmitSignal = el.attribute( QLatin1String( "Notify" ), QLatin1String( "no" ) ).toLower() !=
-            QLatin1String( "no" );
+    mEmitSignal = el.attribute( QStringLiteral( "Notify" ), QStringLiteral( "no" ) ).toLower() !=
+            QStringLiteral( "no" );
 }
 
 bool ConfigSetting::isSubSectioned() const
@@ -102,11 +102,11 @@ QString ConfigSetting::defaultValue() const
 
 QString ConfigSetting::defaultInitializer() const
 {
-    if( mType == QLatin1String( "String" ) )
+    if( mType == QStringLiteral( "String" ) )
     {
-        return QLatin1String( "QString::fromUtf8( \"" )
+        return QStringLiteral( "QString::fromUtf8( \"" )
                 % utf8Encoded( mDefaultValue )
-                % QLatin1String( "\" )" );
+                % QStringLiteral( "\" )" );
     }
     else if( mDefaultValue.isEmpty() )
     {
@@ -121,18 +121,18 @@ QString ConfigSetting::defaultInitializer() const
 ConfigSubSection::ConfigSubSection( QDomElement el, ConfigSubSection* parent )
 {
     mParent = parent;
-    mName = el.attribute( QLatin1String( "Name" ), QString() );
+    mName = el.attribute( QStringLiteral( "Name" ), QString() );
 
     //qDebug() << "Subsection:" << mName;
 
     QDomElement elChild = el.firstChildElement();
     while( elChild.isElement() )
     {
-        if( elChild.tagName() == QLatin1String( "Setting" ) )
+        if( elChild.tagName() == QStringLiteral( "Setting" ) )
         {
             mSettings.append( new ConfigSetting( elChild, this ) );
         }
-        else if( elChild.tagName() == QLatin1String( "SubSection" ) )
+        else if( elChild.tagName() == QStringLiteral( "SubSection" ) )
         {
             mSections.append( new ConfigSubSection( elChild, this ) );
         }
@@ -195,17 +195,17 @@ void ConfigSubSection::addAllSettings( QList< ConfigSetting* >& settings) const
 
 ConfigSection::ConfigSection( QDomElement el )
 {
-    mClassName = el.attribute( QLatin1String( "Class" ) );
-    mConfigPath = el.attribute( QLatin1String( "ConfigPath" ) );
+    mClassName = el.attribute( QStringLiteral( "Class" ) );
+    mConfigPath = el.attribute( QStringLiteral( "ConfigPath" ) );
 
     QDomElement elChild = el.firstChildElement();
     while( elChild.isElement() )
     {
-        if( elChild.tagName() == QLatin1String( "Setting" ) )
+        if( elChild.tagName() == QStringLiteral( "Setting" ) )
         {
             mSettings.append( new ConfigSetting( elChild ) );
         }
-        else if( elChild.tagName() == QLatin1String( "SubSection" ) )
+        else if( elChild.tagName() == QStringLiteral( "SubSection" ) )
         {
             mSections.append( new ConfigSubSection( elChild ) );
         }

CfgComp/VariantTypes.cpp

@@ -47,7 +47,7 @@ VariantType::VariantType( const QString& typeName,
 
 bool VariantType::isUserType() const
 {
-    return mType == QLatin1String( "User" );
+    return mType == QStringLiteral( "User" );
 }
 
 bool VariantType::requiresTemplateMagic() const
@@ -77,20 +77,20 @@ QVariant::Type VariantType::typeId() const
 
 QString VariantType::typeIdName() const
 {
-    return QLatin1String( QVariant::typeToName( mTypeId ) );
+    return QString::fromUtf8(QVariant::typeToName(mTypeId));
 }
 
 QString VariantType::defaultCTored() const
 {
     switch( mTypeId )
     {
-    case QVariant::Bool:        return QLatin1String( "false" );
+    case QVariant::Bool:        return QStringLiteral( "false" );
     case QVariant::Int:
-    case QVariant::UInt:        return QLatin1String( "0" );
+    case QVariant::UInt:        return QStringLiteral( "0" );
     case QVariant::LongLong:
-    case QVariant::ULongLong:   return QLatin1String( "0LL" );
-    case QVariant::Double:      return QLatin1String( "0.0" );
-    case QVariant::Char:        return QLatin1String( "'\\0'" );
+    case QVariant::ULongLong:   return QStringLiteral( "0LL" );
+    case QVariant::Double:      return QStringLiteral( "0.0" );
+    case QVariant::Char:        return QStringLiteral( "'\\0'" );
 
     case QVariant::Map:
     case QVariant::List:
@@ -112,28 +112,28 @@ QString VariantType::defaultCTored() const
     case QVariant::Point:
     case QVariant::PointF:
     case QVariant::RegExp:
-    case QVariant::Hash:        return mCppType + QLatin1String( "()" );
-    default:                    return QLatin1String( "/* UNSUPPORTED */" );
+    case QVariant::Hash:        return mCppType + QStringLiteral( "()" );
+    default:                    return QStringLiteral( "/* UNSUPPORTED */" );
     }
 }
 
 VariantTypes::VariantTypes()
 {
-    mTypes.append(VariantType(QLatin1String("String"),
+    mTypes.append(VariantType(QStringLiteral("String"),
                               QVariant::String,
-                              QLatin1String("QString")));
+                              QStringLiteral("QString")));
 
-    mTypes.append(VariantType(QLatin1String("Int"),
+    mTypes.append(VariantType(QStringLiteral("Int"),
                               QVariant::Int,
-                              QLatin1String("qint32")));
+                              QStringLiteral("qint32")));
 
-    mTypes.append(VariantType(QLatin1String("UInt"),
+    mTypes.append(VariantType(QStringLiteral("UInt"),
                               QVariant::UInt,
-                              QLatin1String("quint32")));
+                              QStringLiteral("quint32")));
 
-    mTypes.append(VariantType(QLatin1String("Bool"),
+    mTypes.append(VariantType(QStringLiteral("Bool"),
                               QVariant::Bool,
-                              QLatin1String("bool")));
+                              QStringLiteral("bool")));
 }
 
 VariantTypes* VariantTypes::sSelf = NULL;

CfgComp/WriteClassHeader.cpp

@@ -31,8 +31,8 @@ WriteClassHeader::WriteClassHeader( const QString& outFile, const ConfigSection&
 
 void WriteClassHeader::generate()
 {
-    QString protector = QLatin1String( "CFGCOMP_" ) + mSection.className().toUpper() +
-            QLatin1String( "_HPP" );
+    QString protector = QStringLiteral( "CFGCOMP_" ) + mSection.className().toUpper() +
+            QStringLiteral( "_HPP" );
 
     mOutStream << "\n"
                   "#ifndef " << protector << "\n"

CfgComp/WriteClassSource.cpp

@@ -106,7 +106,7 @@ void WriteClassSource::generate()
 
     foreach( ConfigSetting* setting, mSection.allSettings() )
     {
-        mOutStream << "\n\tif( subPath == QLatin1String( \"" << setting->fullPath() << "\" ) )\n"
+        mOutStream << "\n\tif( subPath == QStringLiteral( \"" << setting->fullPath() << "\" ) )\n"
                       "\t{\n"
                       "\t\tmValue" << setting->fullName() << " = value.";
 

Libs/libDiffViews/Model/FilePatch.cpp

@@ -45,12 +45,12 @@ namespace DiffViews
     {
         Q_ASSERT( mPathNames.count() == 2 );
 
-        stream << "diff " << mOptions.join( QLatin1String( " " ) );
+        stream << "diff " << mOptions.join( QStringLiteral( " " ) );
         if( mOptions.count() > 0 )
             stream << ' ';
-        stream << mPathNames.join( QLatin1String( " " ) ) << '\n';
+        stream << mPathNames.join( QStringLiteral( " " ) ) << '\n';
 
-        stream << mOptionLines.join( QLatin1String( "\n" ) );
+        stream << mOptionLines.join( QStringLiteral( "\n" ) );
         if( mOptionLines.count() > 0 )
             stream << '\n';
 

Libs/libDiffViews/Model/Hunk.cpp

@@ -60,7 +60,7 @@ namespace DiffViews
 
     QString Hunk::area() const
     {
-        return QString( QLatin1String( "@@ %1,%2 %3,%4 @@" ) )
+        return QString( QStringLiteral( "@@ %1,%2 %3,%4 @@" ) )
                 .arg( firstLine( 0 ) )
                 .arg( numLines( 0 ) )
                 .arg( firstLine( 1 ) )

Libs/libDiffViews/Views/Raw/RawHighlighter.cpp

@@ -30,9 +30,9 @@ namespace DiffViews
     {
         QColor c = Qt::black;
 
-        if( text.startsWith( QLatin1String( "diff" ) ) ||
-            text.startsWith( QLatin1String( "---" ) ) ||
-            text.startsWith( QLatin1String( "+++" ) ) )
+        if( text.startsWith( QStringLiteral( "diff" ) ) ||
+            text.startsWith( QStringLiteral( "---" ) ) ||
+            text.startsWith( QStringLiteral( "+++" ) ) )
         {
             c = Qt::darkGreen;
         }
@@ -48,9 +48,9 @@ namespace DiffViews
         {
             c = Qt::gray;
         }
-        else if( text.startsWith( QLatin1String( "@@" ) ) )
+        else if( text.startsWith( QStringLiteral( "@@" ) ) )
         {
-            int i = text.indexOf( QLatin1String( "@@" ), 2 );
+            int i = text.indexOf( QStringLiteral( "@@" ), 2 );
             i += 2;
             setFormat( 0, i, Qt::darkYellow );
             setFormat( i, text.length() - i, Qt::blue );

Libs/libDiffViews/Views/Seq/SeqViewDiffStat.cpp

@@ -54,9 +54,9 @@ namespace DiffViews
     {
         if( mBinary )
         {
-            return QLatin1String( "Bin" );
+            return QStringLiteral( "Bin" );
         }
-        return QString( QLatin1String( "+%1 -%2" ) ).arg( mAdded ).arg( mRemoved );
+        return QString( QStringLiteral( "+%1 -%2" ) ).arg( mAdded ).arg( mRemoved );
     }
 
     void SeqViewDiffStat::postRendering()

Libs/libDiffViews/Views/Seq/SeqViewHunk.cpp

@@ -126,7 +126,7 @@ namespace DiffViews
     qreal SeqViewHunkContent::setWidth( qreal width )
     {
         QFontMetricsF fm( info()->mFixed );
-        QRectF r = fm.boundingRect( QLatin1String( "X" ) );
+        QRectF r = fm.boundingRect( QStringLiteral( "X" ) );
         qreal height = 1 + ( r.height() + 1 ) * mLines.count();
 
         mSpaceLeft = mSpaceRight = 20;
@@ -155,7 +155,7 @@ namespace DiffViews
 
         QFontMetricsF fm( ifo->mFixed );
         QRectF outline(10, 0, width() - 20, height());
-        QRectF r = fm.boundingRect( QLatin1String( "X" ) );
+        QRectF r = fm.boundingRect( QStringLiteral( "X" ) );
         qreal lh = r.height() + 1;
         qreal top = 0;
 

Libs/libLogger/CMakeLists.txt

@@ -3,11 +3,6 @@ PROJECT(LOGGER)
 
 QT_PREPARE(Core)
 
-INCLUDE_DIRECTORIES( BEFORE
-    ${MGV_CORE_SOURCE_DIR}
-    ${MGV_CORE_BINARY_DIR}
-)
-
 SET( SRC_FILES
 
     Event.cpp

Libs/libLogger/Internal.cpp

@@ -23,6 +23,8 @@
 #include <QCoreApplication>
 #include <QThread>
 
+Q_DECLARE_METATYPE(Log::Event)
+
 namespace Log
 {
 
@@ -38,6 +40,7 @@ namespace Log
             : mNextId(1)
             , mConsumer(nullptr)
         {
+            qRegisterMetaType<Log::Event>();
             createDefaultChannels();
         }
 

Libs/libLogger/Template.cpp

@@ -210,16 +210,16 @@ namespace Log
             s = event.param(QString());
         }
         else {
-            s.replace(QLatin1String("$$"), event.param(QString()));
+            s.replace(QStringLiteral("$$"), event.param(QString()));
         }
 
         foreach (QString pname, event.paramNames()) {
             if (!pname.isEmpty()) {
                 QString key = QChar(L'$') % pname % QChar(L'$');
                 QString value = event.param(pname);
 
-                value.replace(QChar(L'&'), QLatin1String("&"));
-                value.replace(QChar(L'<'), QLatin1String("&lt;"));
+                value.replace(QChar(L'&'), QStringLiteral("&amp;"));
+                value.replace(QChar(L'<'), QStringLiteral("&lt;"));
 
                 s.replace(key, value);
             }

Libs/libMacGitverCore/App/MacGitver.cpp

@@ -1,6 +1,9 @@
 /*
  * MacGitver
- * Copyright (C) 2012-2013 Sascha Cunz <sascha@babbelbox.org>
+ * Copyright (C) 2012-2015 The MacGitver-Developers <dev@macgitver.org>
+ *
+ * (C) Sascha Cunz <sascha@cunz-rad.com>
+ * (C) Cunz RaD Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License (Version 2) as published by the Free Software Foundation.
@@ -61,21 +64,21 @@ void MacGitverPrivate::init()
     // These are used to accquire global settings and stuff...
     // Set them differently, so we can run unit tests without fiddeling about the global settings.
     if (isGui) {
-        QApplication::setOrganizationName( QLatin1String( "MacGitver" ) );
-        QApplication::setApplicationName( QLatin1String( "MacGitver" ) );
+        QApplication::setOrganizationName(QStringLiteral("MacGitver"));
+        QApplication::setApplicationName(QStringLiteral("MacGitver"));
 
-        Heaven::IconManager::self().defaultProvider()->addSearchPath(QLatin1String(":/Images"));
+        Heaven::IconManager::self().defaultProvider()->addSearchPath(QStringLiteral(":/Images"));
     } else {
-        QApplication::setOrganizationName( QLatin1String( "MacGitver" ) );
-        QApplication::setApplicationName( QLatin1String( "MacGitver_NonGui" ) );
+        QApplication::setOrganizationName(QStringLiteral("MacGitver"));
+        QApplication::setApplicationName(QStringLiteral("MacGitver_NonGui"));
     }
 
     sRepoMan    = new RM::RepoMan;
     sModules    = new Modules;
 
     if (isGui) {
         // Continue with the rest of the init-process after QApplication::exec() has started to run.
-        QMetaObject::invokeMethod( this, "bootGui", Qt::QueuedConnection );
+        QMetaObject::invokeMethod(this, "bootGui", Qt::QueuedConnection);
     }
 }
 
@@ -152,7 +155,7 @@ BlueSky::ViewDescriptor* MacGitver::registerView(const BlueSky::ViewIdentifier&
                                                  const QString &displayName,
                                                  MgvViewCreator creator)
 {
-    return new BlueSky::ViewDescriptor( identifier, displayName, creator );
+    return new BlueSky::ViewDescriptor(identifier, displayName, creator);
 }
 
 void MacGitver::unregisterView(const BlueSky::ViewIdentifier& identifier)
@@ -163,17 +166,17 @@ void MacGitver::unregisterView(const BlueSky::ViewIdentifier& identifier)
     }
 }
 
-void MacGitver::log( Log::Type type, const QString& logMessage )
+void MacGitver::log(Log::Type type, const QString& logMessage)
 {
     Log::Manager().addMessage(logMessage, type);
 }
 
-void MacGitver::log( Log::Type type, const char* logMessage )
+void MacGitver::log(Log::Type type, const char* logMessage)
 {
     Log::Manager().addMessage(QString::fromUtf8(logMessage), type);
 }
 
-void MacGitver::log( Log::Type type, const Git::Result& r, const char* logMessage )
+void MacGitver::log(Log::Type type, const Git::Result& r, const char* logMessage)
 {
     if (logMessage) {
         Log::Manager().addMessage(tr("GitWrap-Error: %1\n(%2)")