diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a10a17c..fbed2818 100644 --- a/CMakeLists.txt +++ b/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() diff --git a/CfgComp/CfgComp.cpp b/CfgComp/CfgComp.cpp index 7755748b..771587cc 100644 --- a/CfgComp/CfgComp.cpp +++ b/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; diff --git a/CfgComp/Model.cpp b/CfgComp/Model.cpp index 144e03c0..00185d40 100644 --- a/CfgComp/Model.cpp +++ b/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 ) ); } diff --git a/CfgComp/VariantTypes.cpp b/CfgComp/VariantTypes.cpp index 79b125dd..709a9ffa 100644 --- a/CfgComp/VariantTypes.cpp +++ b/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; diff --git a/CfgComp/WriteClassHeader.cpp b/CfgComp/WriteClassHeader.cpp index ca7e90a1..315c192c 100644 --- a/CfgComp/WriteClassHeader.cpp +++ b/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" diff --git a/CfgComp/WriteClassSource.cpp b/CfgComp/WriteClassSource.cpp index 94bf3628..dab954a8 100644 --- a/CfgComp/WriteClassSource.cpp +++ b/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."; diff --git a/Libs/libDiffViews/Model/FilePatch.cpp b/Libs/libDiffViews/Model/FilePatch.cpp index a8143504..149b0820 100644 --- a/Libs/libDiffViews/Model/FilePatch.cpp +++ b/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'; diff --git a/Libs/libDiffViews/Model/Hunk.cpp b/Libs/libDiffViews/Model/Hunk.cpp index 78ad243b..a18ab6bf 100644 --- a/Libs/libDiffViews/Model/Hunk.cpp +++ b/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 ) ) diff --git a/Libs/libDiffViews/Views/Raw/RawHighlighter.cpp b/Libs/libDiffViews/Views/Raw/RawHighlighter.cpp index 45340b90..dc2155a8 100644 --- a/Libs/libDiffViews/Views/Raw/RawHighlighter.cpp +++ b/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 ); diff --git a/Libs/libDiffViews/Views/Seq/SeqViewDiffStat.cpp b/Libs/libDiffViews/Views/Seq/SeqViewDiffStat.cpp index 4abf72ab..b726a1d7 100644 --- a/Libs/libDiffViews/Views/Seq/SeqViewDiffStat.cpp +++ b/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() diff --git a/Libs/libDiffViews/Views/Seq/SeqViewHunk.cpp b/Libs/libDiffViews/Views/Seq/SeqViewHunk.cpp index bd3850bb..685d1ffc 100644 --- a/Libs/libDiffViews/Views/Seq/SeqViewHunk.cpp +++ b/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; diff --git a/Libs/libLogger/CMakeLists.txt b/Libs/libLogger/CMakeLists.txt index f5e33592..23d6ad57 100644 --- a/Libs/libLogger/CMakeLists.txt +++ b/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 diff --git a/Libs/libLogger/Internal.cpp b/Libs/libLogger/Internal.cpp index 29d4b711..64264727 100644 --- a/Libs/libLogger/Internal.cpp +++ b/Libs/libLogger/Internal.cpp @@ -23,6 +23,8 @@ #include #include +Q_DECLARE_METATYPE(Log::Event) + namespace Log { @@ -38,6 +40,7 @@ namespace Log : mNextId(1) , mConsumer(nullptr) { + qRegisterMetaType(); createDefaultChannels(); } diff --git a/Libs/libLogger/Template.cpp b/Libs/libLogger/Template.cpp index 3ed7beb4..90abd37f 100644 --- a/Libs/libLogger/Template.cpp +++ b/Libs/libLogger/Template.cpp @@ -210,7 +210,7 @@ namespace Log s = event.param(QString()); } else { - s.replace(QLatin1String("$$"), event.param(QString())); + s.replace(QStringLiteral("$$"), event.param(QString())); } foreach (QString pname, event.paramNames()) { @@ -218,8 +218,8 @@ namespace Log QString key = QChar(L'$') % pname % QChar(L'$'); QString value = event.param(pname); - value.replace(QChar(L'&'), QLatin1String("&")); - value.replace(QChar(L'<'), QLatin1String("<")); + value.replace(QChar(L'&'), QStringLiteral("&")); + value.replace(QChar(L'<'), QStringLiteral("<")); s.replace(key, value); } diff --git a/Libs/libMacGitverCore/App/MacGitver.cpp b/Libs/libMacGitverCore/App/MacGitver.cpp index 1641fdc1..da9a3405 100644 --- a/Libs/libMacGitverCore/App/MacGitver.cpp +++ b/Libs/libMacGitverCore/App/MacGitver.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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,13 +64,13 @@ 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; @@ -75,7 +78,7 @@ void MacGitverPrivate::init() 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)") diff --git a/Libs/libMacGitverCore/App/MacGitver.hpp b/Libs/libMacGitverCore/App/MacGitver.hpp index 05b0fbb5..46ba1d41 100644 --- a/Libs/libMacGitverCore/App/MacGitver.hpp +++ b/Libs/libMacGitverCore/App/MacGitver.hpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_MACGITVER_H -#define MGV_MACGITVER_H +#pragma once #include "libMacGitverCore/MacGitverApi.hpp" @@ -38,7 +40,8 @@ typedef BlueSky::ViewDescriptor::CreatorFunc MgvViewCreator; class MacGitverPrivate; -class MGV_CORE_API MacGitver : public QObject +class MGV_CORE_API MacGitver + : public QObject { Q_OBJECT public: @@ -63,13 +66,10 @@ class MGV_CORE_API MacGitver : public QObject MgvViewCreator creator); void unregisterView(const BlueSky::ViewIdentifier& identifier); - static void log( Log::Type type, const QString& logMessage ); - static void log( Log::Type type, const char* logMessage ); - static void log( Log::Type type, const Git::Result& r, const char* logMessage = NULL ); + static void log(Log::Type type, const QString& logMessage); + static void log(Log::Type type, const char* logMessage); + static void log(Log::Type type, const Git::Result& r, const char* logMessage = nullptr); private: MacGitverPrivate* d; }; - -#endif - diff --git a/Libs/libMacGitverCore/App/MgvPrimaryWindow.cpp b/Libs/libMacGitverCore/App/MgvPrimaryWindow.cpp index 4162bd33..c1c85aae 100644 --- a/Libs/libMacGitverCore/App/MgvPrimaryWindow.cpp +++ b/Libs/libMacGitverCore/App/MgvPrimaryWindow.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,6 +17,20 @@ * */ +#include "libMacGitverCore/App/MacGitverPrivate.hpp" +#include "libMacGitverCore/App/MgvPrimaryWindow.hpp" +#include "libMacGitverCore/App/MgvPrimaryWindowPrivate.hpp" +#include "libMacGitverCore/MacGitver/Modules.h" + +#include "libMacGitverCore/RepoMan/RepoMan.hpp" + +#include "libMacGitverCore/Config/Config.h" +#include "libMacGitverCore/Config/Ui/ConfigDialog.hpp" +#include "libMacGitverCore/Widgets/RepoStateWidget.hpp" + +#include "libBlueSky/Application.hpp" +#include "libBlueSky/FooterWidget.hpp" + #include #include #include @@ -25,23 +42,6 @@ #include #include - -#include "libGitWrap/ObjectId.hpp" -#include "libGitWrap/Reference.hpp" - -#include "libBlueSky/Application.hpp" -#include "libBlueSky/FooterWidget.hpp" - -#include "libMacGitverCore/App/MacGitverPrivate.hpp" -#include "libMacGitverCore/App/MgvPrimaryWindow.hpp" -#include "libMacGitverCore/App/MgvPrimaryWindowPrivate.hpp" -#include "libMacGitverCore/MacGitver/Modules.h" -#include "libMacGitverCore/RepoMan/RepoMan.hpp" -#include "libMacGitverCore/RepoMan/Repo.hpp" -#include "libMacGitverCore/Config/Config.h" -#include "libMacGitverCore/Config/Ui/ConfigDialog.hpp" -#include "libMacGitverCore/Widgets/RepoStateWidget.hpp" - #if 0 #include "libStairway/StairwayToHeavenTool.hpp" #endif @@ -83,7 +83,7 @@ MgvPrimaryWindow::~MgvPrimaryWindow() void MgvPrimaryWindow::setupUi() { - QIcon icon( QLatin1String( ":/mgv_sak32.png" ) ); + QIcon icon( QStringLiteral( ":/mgv_sak32.png" ) ); setWindowIcon( icon ); setupActions( this ); @@ -158,7 +158,7 @@ void MgvPrimaryWindow::moveToCenter() void MgvPrimaryWindow::activateModeForRepo() { if (MacGitver::repoMan().repositories().count() > 0) { - activateMode(QLatin1String("HistoryMode")); + activateMode(QStringLiteral("HistoryMode")); } else { activateMode(QString()); diff --git a/Libs/libMacGitverCore/App/MgvPrimaryWindow.hpp b/Libs/libMacGitverCore/App/MgvPrimaryWindow.hpp index d6675b2c..18022dc2 100644 --- a/Libs/libMacGitverCore/App/MgvPrimaryWindow.hpp +++ b/Libs/libMacGitverCore/App/MgvPrimaryWindow.hpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_PRIMARY_WINDOW_HPP -#define MGV_PRIMARY_WINDOW_HPP +#pragma once #include "libGitWrap/Repository.hpp" @@ -61,5 +63,3 @@ private slots: private: MgvPrimaryWindowPrivate* d; }; - -#endif diff --git a/Libs/libMacGitverCore/App/MgvPrimaryWindowActions.hid b/Libs/libMacGitverCore/App/MgvPrimaryWindowActions.hid index cf66420b..3818c92c 100644 --- a/Libs/libMacGitverCore/App/MgvPrimaryWindowActions.hid +++ b/Libs/libMacGitverCore/App/MgvPrimaryWindowActions.hid @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/App/MgvPrimaryWindowPrivate.hpp b/Libs/libMacGitverCore/App/MgvPrimaryWindowPrivate.hpp index 16d7fc93..5aef6fab 100644 --- a/Libs/libMacGitverCore/App/MgvPrimaryWindowPrivate.hpp +++ b/Libs/libMacGitverCore/App/MgvPrimaryWindowPrivate.hpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,13 +17,10 @@ * */ -#ifndef MGV_PRIMARY_WINDOW_PRIVATE_HPP -#define MGV_PRIMARY_WINDOW_PRIVATE_HPP +#pragma once class MgvPrimaryWindowPrivate { public: MgvPrimaryWindowPrivate(); }; - -#endif diff --git a/Libs/libMacGitverCore/Config/Config.cpp b/Libs/libMacGitverCore/Config/Config.cpp index 3f27df86..40e9d57b 100644 --- a/Libs/libMacGitverCore/Config/Config.cpp +++ b/Libs/libMacGitverCore/Config/Config.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -53,20 +56,20 @@ void Config::loadSettings() QString fontName = get( "General/Font", "#" ).toString(); - if( fontName == QLatin1String( "#" ) ) + if( fontName == QStringLiteral( "#" ) ) mDefaultFont = QFont(); else mDefaultFont.fromString( fontName ); fontName = get( "General/DialogFont", "#" ).toString(); - if( fontName == QLatin1String( "#" ) ) + if( fontName == QStringLiteral( "#" ) ) mDefaultDialogFont = mDefaultFont; else mDefaultDialogFont.fromString( fontName ); fontName = get( "General/FixedFont", "#" ).toString(); - if( fontName == QLatin1String( "#" ) ) - mDefaultFixedFont = QFont( QLatin1String( "Courier New" ), 10 ); + if( fontName == QStringLiteral( "#" ) ) + mDefaultFixedFont = QFont( QStringLiteral( "Courier New" ), 10 ); else mDefaultFixedFont.fromString( fontName ); } @@ -81,12 +84,12 @@ void Config::saveSettings() QVariant Config::get( const char* szPath, const char* szDefaultValue ) const { - return get( szPath, QLatin1String( szDefaultValue ) ); + return get(szPath, QString::fromUtf8(szDefaultValue)); } QVariant Config::get( const char* szPath, const QVariant& defaultValue ) const { - return get( QLatin1String( szPath ), defaultValue ); + return get(QString::fromUtf8(szPath), defaultValue); } QVariant Config::get( const QString& path, const QVariant& defaultValue ) const @@ -108,7 +111,7 @@ QVariant Config::get( const QString& path, const QVariant& defaultValue ) const void Config::set( const char* pszPath, const QVariant& value ) { - set( QLatin1String( pszPath ), value ); + set(QString::fromUtf8(pszPath), value); } void Config::set( const QString& path, const QVariant& value ) diff --git a/Libs/libMacGitverCore/Config/Config.h b/Libs/libMacGitverCore/Config/Config.h index 1e1133f4..27f4e8a3 100644 --- a/Libs/libMacGitverCore/Config/Config.h +++ b/Libs/libMacGitverCore/Config/Config.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_CONFIG_H -#define MGV_CONFIG_H +#pragma once #include #include @@ -77,5 +79,3 @@ class MGV_CORE_API Config : public QObject QFont mDefaultDialogFont; QFont mDefaultFixedFont; }; - -#endif diff --git a/Libs/libMacGitverCore/Config/ConfigUser.cpp b/Libs/libMacGitverCore/Config/ConfigUser.cpp index 044581f9..13ec3a97 100644 --- a/Libs/libMacGitverCore/Config/ConfigUser.cpp +++ b/Libs/libMacGitverCore/Config/ConfigUser.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -26,12 +29,6 @@ ConfigUser::ConfigUser( const QString& configBasePath ) Config::self().addConfigUser( this ); } -ConfigUser::ConfigUser( const char* pszConfigBasePath ) - : mConfigBase( QLatin1String( pszConfigBasePath ) ) -{ - Config::self().addConfigUser( this ); -} - ConfigUser::~ConfigUser() { Config::self().delConfigUser( this ); @@ -44,7 +41,7 @@ QString ConfigUser::configSubPath( const QString& subPath ) const QString ConfigUser::configSubPath( const char* pszSubPath ) const { - return mConfigBase % QChar( L'/' ) % QLatin1String( pszSubPath ); + return mConfigBase % QChar( L'/' ) % QString::fromUtf8(pszSubPath); } QVariant ConfigUser::configGetV( const QString& subPath, diff --git a/Libs/libMacGitverCore/Config/ConfigUser.h b/Libs/libMacGitverCore/Config/ConfigUser.h index 9543fc5f..8f3d0a38 100644 --- a/Libs/libMacGitverCore/Config/ConfigUser.h +++ b/Libs/libMacGitverCore/Config/ConfigUser.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_CONFIG_USER_H -#define MGV_CONFIG_USER_H +#pragma once #include @@ -24,8 +26,10 @@ class MGV_CORE_API ConfigUser { protected: - ConfigUser( const QString& configBasePath ); - ConfigUser( const char* pszConfigBasePath ); + ConfigUser(const QString& configBasePath); + ConfigUser(const char* pszConfigBasePath) + : ConfigUser(QString::fromUtf8(pszConfigBasePath)) {} + virtual ~ConfigUser(); public: @@ -56,7 +60,7 @@ class MGV_CORE_API ConfigUser inline QString configGet( const char* pszSubPath, const char* pszValue ) const { - return configGet< QString >( pszSubPath, QLatin1String( pszValue ) ); + return configGet< QString >( pszSubPath, QString::fromUtf8(pszValue) ); } public: @@ -65,5 +69,3 @@ class MGV_CORE_API ConfigUser private: QString mConfigBase; }; - -#endif diff --git a/Libs/libMacGitverCore/Config/Ui/ConfigDialog.cpp b/Libs/libMacGitverCore/Config/Ui/ConfigDialog.cpp index dcf3a783..2cb00c45 100644 --- a/Libs/libMacGitverCore/Config/Ui/ConfigDialog.cpp +++ b/Libs/libMacGitverCore/Config/Ui/ConfigDialog.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Config/Ui/ConfigDialog.hpp b/Libs/libMacGitverCore/Config/Ui/ConfigDialog.hpp index e94ed527..36fe9e65 100644 --- a/Libs/libMacGitverCore/Config/Ui/ConfigDialog.hpp +++ b/Libs/libMacGitverCore/Config/Ui/ConfigDialog.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CONFIG_WIDGET_H -#define MGV_CONFIG_WIDGET_H +#pragma once #include #include @@ -71,5 +70,3 @@ private slots: static QMap< int, QSet > sProviders; }; - -#endif diff --git a/Libs/libMacGitverCore/Config/Ui/ConfigPage.cpp b/Libs/libMacGitverCore/Config/Ui/ConfigPage.cpp index f1300100..8b914515 100644 --- a/Libs/libMacGitverCore/Config/Ui/ConfigPage.cpp +++ b/Libs/libMacGitverCore/Config/Ui/ConfigPage.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Config/Ui/ConfigPage.hpp b/Libs/libMacGitverCore/Config/Ui/ConfigPage.hpp index ce132fa2..bdc96134 100644 --- a/Libs/libMacGitverCore/Config/Ui/ConfigPage.hpp +++ b/Libs/libMacGitverCore/Config/Ui/ConfigPage.hpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_I_CONFIG_PAGE_H -#define MGV_I_CONFIG_PAGE_H +#pragma once #include @@ -46,5 +48,3 @@ protected slots: private: ConfigDialog* mDialog; }; - -#endif diff --git a/Libs/libMacGitverCore/Config/Ui/ConfigPageProvider.cpp b/Libs/libMacGitverCore/Config/Ui/ConfigPageProvider.cpp index 6ca03206..76fce6a7 100644 --- a/Libs/libMacGitverCore/Config/Ui/ConfigPageProvider.cpp +++ b/Libs/libMacGitverCore/Config/Ui/ConfigPageProvider.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the diff --git a/Libs/libMacGitverCore/Config/Ui/ConfigPageProvider.hpp b/Libs/libMacGitverCore/Config/Ui/ConfigPageProvider.hpp index d6002669..55666d55 100644 --- a/Libs/libMacGitverCore/Config/Ui/ConfigPageProvider.hpp +++ b/Libs/libMacGitverCore/Config/Ui/ConfigPageProvider.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_CONFIG_PAGE_PROVIDER_HPP -#define MGV_CORE_CONFIG_PAGE_PROVIDER_HPP +#pragma once #include "libMacGitverCore/MacGitverApi.hpp" @@ -86,6 +85,3 @@ class MGV_CORE_API ConfigPageProvider { \ delete PageCreator::sSelf; \ } - - -#endif diff --git a/Libs/libMacGitverCore/Config/Ui/GeneralConfigPage.cpp b/Libs/libMacGitverCore/Config/Ui/GeneralConfigPage.cpp index 8598d1fa..de8a4f84 100644 --- a/Libs/libMacGitverCore/Config/Ui/GeneralConfigPage.cpp +++ b/Libs/libMacGitverCore/Config/Ui/GeneralConfigPage.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Config/Ui/GeneralConfigPage.hpp b/Libs/libMacGitverCore/Config/Ui/GeneralConfigPage.hpp index d475ac07..959cf4e6 100644 --- a/Libs/libMacGitverCore/Config/Ui/GeneralConfigPage.hpp +++ b/Libs/libMacGitverCore/Config/Ui/GeneralConfigPage.hpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_GENERAL_CONFIG_PAGE_H -#define MGV_GENERAL_CONFIG_PAGE_H +#pragma once #include @@ -50,5 +52,3 @@ class GeneralConfigPage private slots: void onFontChanged(); }; - -#endif diff --git a/Libs/libMacGitverCore/MacGitver/GitPatchConsumer.cpp b/Libs/libMacGitverCore/MacGitver/GitPatchConsumer.cpp index 38761dd7..e5d967f1 100644 --- a/Libs/libMacGitverCore/MacGitver/GitPatchConsumer.cpp +++ b/Libs/libMacGitverCore/MacGitver/GitPatchConsumer.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/MacGitver/GitPatchConsumer.hpp b/Libs/libMacGitverCore/MacGitver/GitPatchConsumer.hpp index 5bdb05b2..0162e84e 100644 --- a/Libs/libMacGitverCore/MacGitver/GitPatchConsumer.hpp +++ b/Libs/libMacGitverCore/MacGitver/GitPatchConsumer.hpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_DIFF_GIT_PATCH_CONSUMER_H -#define MGV_DIFF_GIT_PATCH_CONSUMER_H +#pragma once #include "libMacGitverCore/MacGitverApi.hpp" @@ -54,5 +56,3 @@ class MGV_CORE_API GitPatchConsumer : public Git::PatchConsumer enum { None, Context, Add, Del, Change } mCurType; }; - -#endif diff --git a/Libs/libMacGitverCore/MacGitver/IRepositoryContext.hpp b/Libs/libMacGitverCore/MacGitver/IRepositoryContext.hpp index 10a1beec..3ad14874 100644 --- a/Libs/libMacGitverCore/MacGitver/IRepositoryContext.hpp +++ b/Libs/libMacGitverCore/MacGitver/IRepositoryContext.hpp @@ -1,8 +1,9 @@ /* - * libHeaven - A Qt-based ui framework for strongly modularized applications - * Copyright (C) 2012-2013 The MacGitver-Developers + * MacGitver + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz + * (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. @@ -16,8 +17,7 @@ * */ -#ifndef MGVCORE_IREPOSITORY_CONTEXT_HPP -#define MGVCORE_IREPOSITORY_CONTEXT_HPP +#pragma once #include @@ -34,6 +34,3 @@ class IRepositoryContext Q_DECLARE_INTERFACE( IRepositoryContext, "org.macgitver.IRepositoryContext/0.1" ) - -#endif - diff --git a/Libs/libMacGitverCore/MacGitver/Module.cpp b/Libs/libMacGitverCore/MacGitver/Module.cpp index ffaee1c1..19c565b2 100644 --- a/Libs/libMacGitverCore/MacGitver/Module.cpp +++ b/Libs/libMacGitverCore/MacGitver/Module.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/MacGitver/Module.h b/Libs/libMacGitverCore/MacGitver/Module.h index 00db66f4..efbaf8fb 100644 --- a/Libs/libMacGitverCore/MacGitver/Module.h +++ b/Libs/libMacGitverCore/MacGitver/Module.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_MODULE_H -#define MGV_MODULE_H +#pragma once #include @@ -122,5 +124,3 @@ class MGV_CORE_API Module : public QObject, public ConfigPageProvider Q_DECLARE_INTERFACE( Module, "org.macgitver.Module/0.1" ) - -#endif diff --git a/Libs/libMacGitverCore/MacGitver/Modules.cpp b/Libs/libMacGitverCore/MacGitver/Modules.cpp index 205baf92..8ab5a964 100644 --- a/Libs/libMacGitverCore/MacGitver/Modules.cpp +++ b/Libs/libMacGitverCore/MacGitver/Modules.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -42,7 +45,7 @@ Modules::~Modules() void Modules::search( const QDir& binDir ) { QStringList modFiles; - modFiles << QLatin1String( "Mod*.mgv" ); + modFiles << QStringLiteral( "Mod*.mgv" ); // qDebug( "Searching for Modules in %s", qPrintable( binDir.absolutePath() ) ); diff --git a/Libs/libMacGitverCore/MacGitver/Modules.h b/Libs/libMacGitverCore/MacGitver/Modules.h index 4ea6a191..b09f40d3 100644 --- a/Libs/libMacGitverCore/MacGitver/Modules.h +++ b/Libs/libMacGitverCore/MacGitver/Modules.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_MODULES_H -#define MGV_MODULES_H +#pragma once #include @@ -44,5 +46,3 @@ class Modules : public QObject private: QSet< Module* > mModules; }; - -#endif diff --git a/Libs/libMacGitverCore/MacGitverApi.hpp b/Libs/libMacGitverCore/MacGitverApi.hpp index 7bf2948a..8ab9b45b 100644 --- a/Libs/libMacGitverCore/MacGitverApi.hpp +++ b/Libs/libMacGitverCore/MacGitverApi.hpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,15 +17,12 @@ * */ -#ifndef MGV_MGV_CORE_API_H -#define MGV_MGV_CORE_API_H +#pragma once -#include +#include #ifdef MacGitverCore_EXPORTS # define MGV_CORE_API Q_DECL_EXPORT #else # define MGV_CORE_API Q_DECL_IMPORT #endif - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/AutoRefresher.cpp b/Libs/libMacGitverCore/RepoMan/AutoRefresher.cpp index 5e827936..14545ed6 100644 --- a/Libs/libMacGitverCore/RepoMan/AutoRefresher.cpp +++ b/Libs/libMacGitverCore/RepoMan/AutoRefresher.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the diff --git a/Libs/libMacGitverCore/RepoMan/AutoRefresher.hpp b/Libs/libMacGitverCore/RepoMan/AutoRefresher.hpp index 926ef254..6d3de627 100644 --- a/Libs/libMacGitverCore/RepoMan/AutoRefresher.hpp +++ b/Libs/libMacGitverCore/RepoMan/AutoRefresher.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_AUTO_REFRESHER_HPP -#define MGV_CORE_REPOMAN_AUTO_REFRESHER_HPP +#pragma once #include @@ -66,5 +65,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Base.cpp b/Libs/libMacGitverCore/RepoMan/Base.cpp index 78d0a224..c8d7e53e 100644 --- a/Libs/libMacGitverCore/RepoMan/Base.cpp +++ b/Libs/libMacGitverCore/RepoMan/Base.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -391,7 +391,7 @@ namespace RM QString BasePrivate::displayName() const { - return QLatin1String(""); + return QStringLiteral(""); } /** diff --git a/Libs/libMacGitverCore/RepoMan/Base.hpp b/Libs/libMacGitverCore/RepoMan/Base.hpp index 03d5980a..888212b8 100644 --- a/Libs/libMacGitverCore/RepoMan/Base.hpp +++ b/Libs/libMacGitverCore/RepoMan/Base.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_BASE_HPP -#define MGV_CORE_REPOMAN_BASE_HPP +#pragma once #include #include @@ -175,5 +174,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Branch.cpp b/Libs/libMacGitverCore/RepoMan/Branch.cpp index 0a35bb10..dd0115ae 100644 --- a/Libs/libMacGitverCore/RepoMan/Branch.cpp +++ b/Libs/libMacGitverCore/RepoMan/Branch.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -108,14 +108,14 @@ namespace RM void BranchPrivate::dumpSelf(Internal::Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("Branch 0x%1 - %2")) + dumper.addLine(QString(QStringLiteral("Branch 0x%1 - %2")) .arg(quintptr(mPub),0,16) .arg(mName)); } QString BranchPrivate::objectTypeName() const { - return QLatin1String("Branch"); + return QStringLiteral("Branch"); } void BranchPrivate::emitMoved() diff --git a/Libs/libMacGitverCore/RepoMan/Branch.hpp b/Libs/libMacGitverCore/RepoMan/Branch.hpp index e0e74430..f511f537 100644 --- a/Libs/libMacGitverCore/RepoMan/Branch.hpp +++ b/Libs/libMacGitverCore/RepoMan/Branch.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_BRANCH_HPP -#define MGV_CORE_REPOMAN_BRANCH_HPP +#pragma once #include "Ref.hpp" @@ -45,5 +44,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/CollectionNode.cpp b/Libs/libMacGitverCore/RepoMan/CollectionNode.cpp index 4affb2e8..8f703ffb 100644 --- a/Libs/libMacGitverCore/RepoMan/CollectionNode.cpp +++ b/Libs/libMacGitverCore/RepoMan/CollectionNode.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -78,7 +78,7 @@ namespace RM void CollectionNodePrivate::dumpSelf(Internal::Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("Collection '%2' 0x%1")) + dumper.addLine(QString(QStringLiteral("Collection '%2' 0x%1")) .arg(quintptr(mPub),0,16) .arg(displayName())); } @@ -100,7 +100,7 @@ namespace RM QString CollectionNodePrivate::objectTypeName() const { - return QLatin1String("CollectionNode"); + return QStringLiteral("CollectionNode"); } Heaven::IconRef CollectionNodePrivate::icon(bool small) const @@ -109,10 +109,10 @@ namespace RM QString s; switch (ctype) { - case ctBranches: s = QLatin1String("Branches"); break; - case ctTags: s = QLatin1String("Tags"); break; - case ctNotes: s = QLatin1String("Notes"); break; - case ctNamespaces: s = QLatin1String("Namespaces"); break; + case ctBranches: s = QStringLiteral("Branches"); break; + case ctTags: s = QStringLiteral("Tags"); break; + case ctNotes: s = QStringLiteral("Notes"); break; + case ctNamespaces: s = QStringLiteral("Namespaces"); break; default: return Heaven::IconRef(); } diff --git a/Libs/libMacGitverCore/RepoMan/CollectionNode.hpp b/Libs/libMacGitverCore/RepoMan/CollectionNode.hpp index 2f700aa8..b0ea932d 100644 --- a/Libs/libMacGitverCore/RepoMan/CollectionNode.hpp +++ b/Libs/libMacGitverCore/RepoMan/CollectionNode.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_COLLECTION_NODE_HPP -#define MGV_CORE_REPOMAN_COLLECTION_NODE_HPP +#pragma once #include @@ -51,5 +50,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.cpp b/Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.cpp index d4426e87..bd2a5409 100644 --- a/Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.cpp +++ b/Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the diff --git a/Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.hpp b/Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.hpp index a895180a..979536bf 100644 --- a/Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.hpp +++ b/Libs/libMacGitverCore/RepoMan/Config/RepoManConfigPage.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_CFG_PAGE_HPP -#define MGV_CORE_REPOMAN_CFG_PAGE_HPP +#pragma once #include "libMacGitverCore/Config/Ui/ConfigDialog.hpp" #include "libMacGitverCore/Config/Ui/ConfigPage.hpp" @@ -31,7 +30,9 @@ namespace RM class AutoRefresher; } -class RepoManConfigPage : public ConfigPage, private Ui::RepoManConfigPage +class RepoManConfigPage + : public ConfigPage + , private Ui::RepoManConfigPage { Q_OBJECT DECLARE_NESTED_PAGE_CREATOR(); @@ -56,5 +57,3 @@ private slots: private: RM::AutoRefresher* refresher; }; - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Events.cpp b/Libs/libMacGitverCore/RepoMan/Events.cpp index ff123178..9a96bb03 100644 --- a/Libs/libMacGitverCore/RepoMan/Events.cpp +++ b/Libs/libMacGitverCore/RepoMan/Events.cpp @@ -1,3 +1,21 @@ +/* + * MacGitver + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program; if + * not, see . + * + */ #include "RepoMan/Events.hpp" diff --git a/Libs/libMacGitverCore/RepoMan/Events.hpp b/Libs/libMacGitverCore/RepoMan/Events.hpp index f9a8c16e..5f30ee04 100644 --- a/Libs/libMacGitverCore/RepoMan/Events.hpp +++ b/Libs/libMacGitverCore/RepoMan/Events.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_EVENTS_HPP -#define MGV_CORE_REPOMAN_EVENTS_HPP +#pragma once #include @@ -141,5 +140,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Head.cpp b/Libs/libMacGitverCore/RepoMan/Head.cpp index cc817053..0a312cda 100644 --- a/Libs/libMacGitverCore/RepoMan/Head.cpp +++ b/Libs/libMacGitverCore/RepoMan/Head.cpp @@ -2,7 +2,7 @@ * MacGitver * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -59,7 +59,7 @@ namespace RM void HeadPrivate::dumpSelf(Internal::Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("Head 0x%1 - %2")) + dumper.addLine(QString(QStringLiteral("Head 0x%1 - %2")) .arg(quintptr(mPub),0,16) .arg(symbolicName)); } diff --git a/Libs/libMacGitverCore/RepoMan/Head.hpp b/Libs/libMacGitverCore/RepoMan/Head.hpp index 2fee788e..5e26d838 100644 --- a/Libs/libMacGitverCore/RepoMan/Head.hpp +++ b/Libs/libMacGitverCore/RepoMan/Head.hpp @@ -2,7 +2,7 @@ * MacGitver * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the diff --git a/Libs/libMacGitverCore/RepoMan/Namespace.cpp b/Libs/libMacGitverCore/RepoMan/Namespace.cpp index ccc0b95a..19ba0b7e 100644 --- a/Libs/libMacGitverCore/RepoMan/Namespace.cpp +++ b/Libs/libMacGitverCore/RepoMan/Namespace.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -84,7 +84,7 @@ namespace RM void NamespacePrivate::dumpSelf(Internal::Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("Namespace 0x%1 - %2")) + dumper.addLine(QString(QStringLiteral("Namespace 0x%1 - %2")) .arg(quintptr(mPub),0,16) .arg(name)); } @@ -119,7 +119,7 @@ namespace RM QString NamespacePrivate::objectTypeName() const { - return QLatin1String("Namespace"); + return QStringLiteral("Namespace"); } bool NamespacePrivate::inherits(ObjTypes type) const diff --git a/Libs/libMacGitverCore/RepoMan/Namespace.hpp b/Libs/libMacGitverCore/RepoMan/Namespace.hpp index 1ab5d55c..2a0d986e 100644 --- a/Libs/libMacGitverCore/RepoMan/Namespace.hpp +++ b/Libs/libMacGitverCore/RepoMan/Namespace.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_NAMESPACE_HPP -#define MGV_CORE_REPOMAN_NAMESPACE_HPP +#pragma once #include "Base.hpp" #include "CollectionNode.hpp" @@ -53,5 +52,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/BasePrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/BasePrivate.hpp index 0daa4d3e..ea703066 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/BasePrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/BasePrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef REPOMAN_BASE_PRIVATE_HPP -#define REPOMAN_BASE_PRIVATE_HPP +#pragma once #include "RepoMan/Base.hpp" @@ -120,5 +119,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/BranchPrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/BranchPrivate.hpp index 1f5105fb..ad7f54bb 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/BranchPrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/BranchPrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef REPOMAN_BRANCH_PRIVATE_HPP -#define REPOMAN_BRANCH_PRIVATE_HPP +#pragma once #include "RepoMan/Private/RefPrivate.hpp" @@ -55,5 +54,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/CollectionNodePrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/CollectionNodePrivate.hpp index ce5e724e..ca4fd49d 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/CollectionNodePrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/CollectionNodePrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef REPOMAN_COLLECTION_NODE_PRIVATE_HPP -#define REPOMAN_COLLECTION_NODE_PRIVATE_HPP +#pragma once #include "RepoMan/Private/BasePrivate.hpp" @@ -53,5 +52,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/Dumper.cpp b/Libs/libMacGitverCore/RepoMan/Private/Dumper.cpp index babe4c77..61ddc999 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/Dumper.cpp +++ b/Libs/libMacGitverCore/RepoMan/Private/Dumper.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the diff --git a/Libs/libMacGitverCore/RepoMan/Private/Dumper.hpp b/Libs/libMacGitverCore/RepoMan/Private/Dumper.hpp index a2b5ac87..fb488430 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/Dumper.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/Dumper.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_DUMPER_HPP -#define MGV_CORE_REPOMAN_DUMPER_HPP +#pragma once #include #include @@ -52,5 +51,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/HeadPrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/HeadPrivate.hpp index 8637ad20..2b67f393 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/HeadPrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/HeadPrivate.hpp @@ -2,7 +2,7 @@ * MacGitver * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the diff --git a/Libs/libMacGitverCore/RepoMan/Private/NamespacePrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/NamespacePrivate.hpp index 2bbfac4e..8af0ae3b 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/NamespacePrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/NamespacePrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef REPOMAN_NAMESPACE_PRIVATE_HPP -#define REPOMAN_NAMESPACE_PRIVATE_HPP +#pragma once #include "RepoMan/Private/BasePrivate.hpp" @@ -52,5 +51,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/RefLogPrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/RefLogPrivate.hpp index 8254b2b0..f5945d2a 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/RefLogPrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/RefLogPrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef REPOMAN_REF_LOG_PRIVATE_HPP -#define REPOMAN_REF_LOG_PRIVATE_HPP +#pragma once #include "RepoMan/Private/BasePrivate.hpp" @@ -48,5 +47,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/RefPrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/RefPrivate.hpp index 2614d986..377b79d5 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/RefPrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/RefPrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,6 +17,8 @@ * */ +#pragma once + #include "RepoMan/Private/BasePrivate.hpp" #include "RepoMan/Ref.hpp" @@ -54,4 +56,3 @@ namespace RM } } - diff --git a/Libs/libMacGitverCore/RepoMan/Private/RefTreeNodePrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/RefTreeNodePrivate.hpp index b456ab33..fa60c315 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/RefTreeNodePrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/RefTreeNodePrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef REPOMAN_REF_TREE_NODE_PRIVATE_HPP -#define REPOMAN_REF_TREE_NODE_PRIVATE_HPP +#pragma once #include "RepoMan/Private/BasePrivate.hpp" @@ -53,5 +52,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/RemotePrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/RemotePrivate.hpp index edd3d1a7..0c8b2fec 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/RemotePrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/RemotePrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef REPOMAN_REMOTE_PRIVATE_HPP -#define REPOMAN_REMOTE_PRIVATE_HPP +#pragma once #include "RepoMan/Private/BasePrivate.hpp" @@ -55,5 +54,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/RepoManActions.hid b/Libs/libMacGitverCore/RepoMan/Private/RepoManActions.hid index 25b730e0..8f764558 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/RepoManActions.hid +++ b/Libs/libMacGitverCore/RepoMan/Private/RepoManActions.hid @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the diff --git a/Libs/libMacGitverCore/RepoMan/Private/RepoManPrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/RepoManPrivate.hpp index 08a478a3..2095cb9f 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/RepoManPrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/RepoManPrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef REPOMAN_REPO_MAN_PRIVATE_HPP -#define REPOMAN_REPO_MAN_PRIVATE_HPP +#pragma once #include "libMacGitverCore/RepoMan/Private/BasePrivate.hpp" @@ -57,5 +56,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/RepoPrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/RepoPrivate.hpp index 02ff2b83..296229e4 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/RepoPrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/RepoPrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,6 +17,8 @@ * */ +#pragma once + #include "RepoMan/Private/BasePrivate.hpp" #include "RepoMan/Repo.hpp" @@ -81,4 +83,3 @@ namespace RM } } - diff --git a/Libs/libMacGitverCore/RepoMan/Private/SubmodulePrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/SubmodulePrivate.hpp index 2b6ca8c1..38bb9e65 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/SubmodulePrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/SubmodulePrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef REPOMAN_SUBMODULE_PRIVATE_HPP -#define REPOMAN_SUBMODULE_PRIVATE_HPP +#pragma once #include "RepoMan/Private/RepoPrivate.hpp" @@ -47,5 +46,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Private/TagPrivate.hpp b/Libs/libMacGitverCore/RepoMan/Private/TagPrivate.hpp index e9de4e27..896da3b1 100644 --- a/Libs/libMacGitverCore/RepoMan/Private/TagPrivate.hpp +++ b/Libs/libMacGitverCore/RepoMan/Private/TagPrivate.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef REPOMAN_TAG_PRIVATE_HPP -#define REPOMAN_TAG_PRIVATE_HPP +#pragma once #include "RepoMan/Private/RefPrivate.hpp" @@ -47,5 +46,3 @@ namespace RM } } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Ref.cpp b/Libs/libMacGitverCore/RepoMan/Ref.cpp index fc9ff19d..4bcdd5dd 100644 --- a/Libs/libMacGitverCore/RepoMan/Ref.cpp +++ b/Libs/libMacGitverCore/RepoMan/Ref.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -101,7 +101,7 @@ namespace RM void RefPrivate::dumpSelf(Internal::Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("Ref 0x%1 [%2]")) + dumper.addLine(QString(QStringLiteral("Ref 0x%1 [%2]")) .arg(quintptr(mPub),0,16) .arg(mName)); } @@ -118,7 +118,7 @@ namespace RM QString RefPrivate::objectTypeName() const { - return QLatin1String("Ref"); + return QStringLiteral("Ref"); } bool RefPrivate::inherits(ObjTypes type) const diff --git a/Libs/libMacGitverCore/RepoMan/Ref.hpp b/Libs/libMacGitverCore/RepoMan/Ref.hpp index 8d91c82a..ada176ce 100644 --- a/Libs/libMacGitverCore/RepoMan/Ref.hpp +++ b/Libs/libMacGitverCore/RepoMan/Ref.hpp @@ -2,7 +2,7 @@ * MacGitver * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the diff --git a/Libs/libMacGitverCore/RepoMan/RefLog.cpp b/Libs/libMacGitverCore/RepoMan/RefLog.cpp index 34b548d6..443fbc5e 100644 --- a/Libs/libMacGitverCore/RepoMan/RefLog.cpp +++ b/Libs/libMacGitverCore/RepoMan/RefLog.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -48,7 +48,7 @@ namespace RM void RefLogPrivate::dumpSelf(Internal::Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("RefLog 0x%1")) + dumper.addLine(QString(QStringLiteral("RefLog 0x%1")) .arg(quintptr(mPub),0,16)); } @@ -70,7 +70,7 @@ namespace RM QString RefLogPrivate::objectTypeName() const { - return QLatin1String("RefLog"); + return QStringLiteral("RefLog"); } bool RefLogPrivate::inherits(ObjTypes type) const diff --git a/Libs/libMacGitverCore/RepoMan/RefLog.hpp b/Libs/libMacGitverCore/RepoMan/RefLog.hpp index e0cf9af7..45bcab0f 100644 --- a/Libs/libMacGitverCore/RepoMan/RefLog.hpp +++ b/Libs/libMacGitverCore/RepoMan/RefLog.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_REFLOG_HPP -#define MGV_CORE_REPOMAN_REFLOG_HPP +#pragma once #include "Base.hpp" @@ -41,5 +40,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/RefTreeNode.cpp b/Libs/libMacGitverCore/RepoMan/RefTreeNode.cpp index 4041c57c..4fae6a5a 100644 --- a/Libs/libMacGitverCore/RepoMan/RefTreeNode.cpp +++ b/Libs/libMacGitverCore/RepoMan/RefTreeNode.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -56,7 +56,7 @@ namespace RM void RefTreeNodePrivate::dumpSelf(Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("RefTreeNode 0x%1 [%2]")) + dumper.addLine(QString(QStringLiteral("RefTreeNode 0x%1 [%2]")) .arg(quintptr(mPub),0,16) .arg(name)); } @@ -97,7 +97,7 @@ namespace RM QString RefTreeNodePrivate::objectTypeName() const { - return QLatin1String("RefTreeNode"); + return QStringLiteral("RefTreeNode"); } bool RefTreeNodePrivate::inherits(ObjTypes type) const diff --git a/Libs/libMacGitverCore/RepoMan/RefTreeNode.hpp b/Libs/libMacGitverCore/RepoMan/RefTreeNode.hpp index 83644790..be0f5455 100644 --- a/Libs/libMacGitverCore/RepoMan/RefTreeNode.hpp +++ b/Libs/libMacGitverCore/RepoMan/RefTreeNode.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_REF_TREE_NODE_HPP -#define MGV_CORE_REPOMAN_REF_TREE_NODE_HPP +#pragma once #include @@ -48,5 +47,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Remote.cpp b/Libs/libMacGitverCore/RepoMan/Remote.cpp index b13a2958..7a402400 100644 --- a/Libs/libMacGitverCore/RepoMan/Remote.cpp +++ b/Libs/libMacGitverCore/RepoMan/Remote.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -77,7 +77,7 @@ namespace RM void RemotePrivate::dumpSelf(Internal::Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("Remote %2 0x%1")) + dumper.addLine(QString(QStringLiteral("Remote %2 0x%1")) .arg(quintptr(mPub),0,16) .arg(name)); } @@ -113,7 +113,7 @@ namespace RM QString RemotePrivate::objectTypeName() const { - return QLatin1String("Remote"); + return QStringLiteral("Remote"); } bool RemotePrivate::inherits(ObjTypes type) const diff --git a/Libs/libMacGitverCore/RepoMan/Remote.hpp b/Libs/libMacGitverCore/RepoMan/Remote.hpp index 038e20ed..d47d5e6c 100644 --- a/Libs/libMacGitverCore/RepoMan/Remote.hpp +++ b/Libs/libMacGitverCore/RepoMan/Remote.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_REMOTE_HPP -#define MGV_CORE_REPOMAN_REMOTE_HPP +#pragma once #include "libGitWrap/Remote.hpp" @@ -51,5 +50,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Repo.cpp b/Libs/libMacGitverCore/RepoMan/Repo.cpp index e33afa3c..d41233fb 100644 --- a/Libs/libMacGitverCore/RepoMan/Repo.cpp +++ b/Libs/libMacGitverCore/RepoMan/Repo.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -354,7 +354,7 @@ namespace RM { mRepo = repo; mHead = NULL; - mPath = mRepo.basePath(); + mPath = mRepo.workTreePath(); mIsLoaded = mRepo.isValid(); mIsActive = false; mIsBare = mRepo.isValid() && mRepo.isBare(); @@ -465,7 +465,7 @@ namespace RM Q_ASSERT(subRepo.isValid()); Repo* subInfo = NULL; - QString path = subRepo.basePath(); + QString path = subRepo.workTreePath(); if (path.endsWith(L'/')) { path = path.left(path.length() - 1); @@ -546,10 +546,10 @@ namespace RM void RepoPrivate::dumpSelf(Internal::Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("Repository 0x%1 - %02")) + dumper.addLine(QString(QStringLiteral("Repository 0x%1 - %02")) .arg(quintptr(mPub),0,16) .arg(mIsLoaded ? pub()->gitLoadedRepo().name() - : QLatin1String(""))); + : QStringLiteral(""))); } @@ -753,7 +753,7 @@ namespace RM QString RepoPrivate::objectTypeName() const { - return QLatin1String("Repo"); + return QStringLiteral("Repo"); } bool RepoPrivate::inherits(ObjTypes type) const diff --git a/Libs/libMacGitverCore/RepoMan/Repo.hpp b/Libs/libMacGitverCore/RepoMan/Repo.hpp index e5646724..9a68f7b1 100644 --- a/Libs/libMacGitverCore/RepoMan/Repo.hpp +++ b/Libs/libMacGitverCore/RepoMan/Repo.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_REPOSITORY_INFO_HPP -#define MGV_REPOSITORY_INFO_HPP +#pragma once #include @@ -109,5 +108,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/RepoMan.cpp b/Libs/libMacGitverCore/RepoMan/RepoMan.cpp index d4e4eb76..3c5c1132 100644 --- a/Libs/libMacGitverCore/RepoMan/RepoMan.cpp +++ b/Libs/libMacGitverCore/RepoMan/RepoMan.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,7 +17,6 @@ * */ - #include "libMacGitverCore/App/MacGitver.hpp" #include "RepoMan/RepoMan.hpp" @@ -106,7 +108,7 @@ namespace RM { RM_D(RepoMan); - Repo* repo = repoByPath(gitRepo.basePath(), false); + Repo* repo = repoByPath(gitRepo.workTreePath(), false); if(!repo) { repo = new Repo(gitRepo, this); @@ -254,7 +256,7 @@ namespace RM void RepoManPrivate::dumpSelf(Internal::Dumper& dumper) const { - dumper.addLine(QLatin1String("Repository-Manager")); + dumper.addLine(QStringLiteral("Repository-Manager")); } void RepoManPrivate::preTerminate() @@ -264,12 +266,12 @@ namespace RM QString RepoManPrivate::displayName() const { - return QLatin1String("RepoMan"); + return QStringLiteral("RepoMan"); } QString RepoManPrivate::objectTypeName() const { - return QLatin1String("RepoMan"); + return QStringLiteral("RepoMan"); } Heaven::Menu* RepoManPrivate::contextMenuFor(Base* object) diff --git a/Libs/libMacGitverCore/RepoMan/RepoMan.hpp b/Libs/libMacGitverCore/RepoMan/RepoMan.hpp index 204b48cc..602298b3 100644 --- a/Libs/libMacGitverCore/RepoMan/RepoMan.hpp +++ b/Libs/libMacGitverCore/RepoMan/RepoMan.hpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_REPO_MANAGER_HPP -#define MGV_REPO_MANAGER_HPP +#pragma once #include @@ -109,5 +111,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Submodule.cpp b/Libs/libMacGitverCore/RepoMan/Submodule.cpp index 4f0c04e7..4f5e148e 100644 --- a/Libs/libMacGitverCore/RepoMan/Submodule.cpp +++ b/Libs/libMacGitverCore/RepoMan/Submodule.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -56,7 +56,7 @@ namespace RM void SubmodulePrivate::dumpSelf(Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("Submodule 0x%1")) + dumper.addLine(QString(QStringLiteral("Submodule 0x%1")) .arg(quintptr(mPub),0,16)); } @@ -80,7 +80,7 @@ namespace RM QString SubmodulePrivate::objectTypeName() const { - return QLatin1String("Submodule"); + return QStringLiteral("Submodule"); } bool SubmodulePrivate::inherits(ObjTypes type) const diff --git a/Libs/libMacGitverCore/RepoMan/Submodule.hpp b/Libs/libMacGitverCore/RepoMan/Submodule.hpp index ce4d243e..2d366d7d 100644 --- a/Libs/libMacGitverCore/RepoMan/Submodule.hpp +++ b/Libs/libMacGitverCore/RepoMan/Submodule.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_SUBMODULE_HPP -#define MGV_CORE_REPOMAN_SUBMODULE_HPP +#pragma once #include "Repo.hpp" @@ -44,5 +43,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/RepoMan/Tag.cpp b/Libs/libMacGitverCore/RepoMan/Tag.cpp index 25dab440..a530ef13 100644 --- a/Libs/libMacGitverCore/RepoMan/Tag.cpp +++ b/Libs/libMacGitverCore/RepoMan/Tag.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -67,14 +67,14 @@ namespace RM void TagPrivate::dumpSelf(Internal::Dumper& dumper) const { - dumper.addLine(QString(QLatin1String("Tag 0x%1 - %2")) + dumper.addLine(QString(QStringLiteral("Tag 0x%1 - %2")) .arg(quintptr(mPub),0,16) .arg(mName)); } QString TagPrivate::objectTypeName() const { - return QLatin1String("Tag"); + return QStringLiteral("Tag"); } bool TagPrivate::inherits(ObjTypes type) const diff --git a/Libs/libMacGitverCore/RepoMan/Tag.hpp b/Libs/libMacGitverCore/RepoMan/Tag.hpp index 0cbb8fda..e40064d8 100644 --- a/Libs/libMacGitverCore/RepoMan/Tag.hpp +++ b/Libs/libMacGitverCore/RepoMan/Tag.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Cunz RaD Ltd. * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -17,8 +17,7 @@ * */ -#ifndef MGV_CORE_REPOMAN_TAG_HPP -#define MGV_CORE_REPOMAN_TAG_HPP +#pragma once #include "Ref.hpp" @@ -46,5 +45,3 @@ namespace RM }; } - -#endif diff --git a/Libs/libMacGitverCore/SHMParser/ShellExpand.cpp b/Libs/libMacGitverCore/SHMParser/ShellExpand.cpp index 8586f0be..544d8530 100644 --- a/Libs/libMacGitverCore/SHMParser/ShellExpand.cpp +++ b/Libs/libMacGitverCore/SHMParser/ShellExpand.cpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Nils Fenner * (C) Cunz RaD Ltd. * @@ -200,7 +200,7 @@ const ShellExpand::Macros& ShellExpand::macros() const */ QString ShellExpand::expandText(const QString &input) { - static QString cmdChars = QLatin1String(":#/%+-=&"); + static QString cmdChars = QStringLiteral(":#/%+-=&"); State s(input); @@ -325,22 +325,22 @@ QString ShellExpand::replacementLogic(const QString& parameter, const QString& c if (!command.isEmpty()) { - bool replaced = replaceExpandedValue(value, (command == QLatin1String(":+")) && !value.isEmpty(), arg); + bool replaced = replaceExpandedValue(value, (command == QStringLiteral(":+")) && !value.isEmpty(), arg); if (!replaced) - replaced = replaceExpandedValue(value, (command == QLatin1String(":-")) && value.isEmpty(), arg); + replaced = replaceExpandedValue(value, (command == QStringLiteral(":-")) && value.isEmpty(), arg); if (!replaced) { - replaced = replaceExpandedValue(value, command == QLatin1String(":=") && value.isEmpty(), arg); + replaced = replaceExpandedValue(value, command == QStringLiteral(":=") && value.isEmpty(), arg); if (replaced) mMacros[parameter] = value; } - if (!replaced && (command == QLatin1String(":"))) + if (!replaced && (command == QStringLiteral(":"))) { replaced = true; - QStringList sl = arg.split(QLatin1String(":")); + QStringList sl = arg.split(QStringLiteral(":")); if (sl.count() == 1) { value = value.mid(sl[0].toInt()); @@ -351,7 +351,7 @@ QString ShellExpand::replacementLogic(const QString& parameter, const QString& c } else { - value = QLatin1String(">Error: Bar arg count<"); + value = QStringLiteral(">Error: Bar arg count<"); } } @@ -369,11 +369,11 @@ bool ShellExpand::processExternal(QString &value, const QString &command, const { bool result = true; - if (command == QLatin1String("&-")) + if (command == QStringLiteral("&-")) { expandFile( arg ); } - else if (command == QLatin1String("&")) + else if (command == QStringLiteral("&")) { if (value.isEmpty()) value = expandFile( arg ); diff --git a/Libs/libMacGitverCore/SHMParser/ShellExpand.hpp b/Libs/libMacGitverCore/SHMParser/ShellExpand.hpp index 5c2607e1..cdae36a8 100644 --- a/Libs/libMacGitverCore/SHMParser/ShellExpand.hpp +++ b/Libs/libMacGitverCore/SHMParser/ShellExpand.hpp @@ -1,8 +1,8 @@ /* * MacGitver - * Copyright (C) 2012-2013 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Nils Fenner * (C) Cunz RaD Ltd. * @@ -18,9 +18,6 @@ * */ -#ifndef SHELL_EXPAND_HPP -#define SHELL_EXPAND_HPP - #include "libMacGitverCore/MacGitverApi.hpp" #include @@ -58,6 +55,3 @@ class MGV_CORE_API ShellExpand Macros mMacros; bool mOverwriteMacroDecls; }; - - -#endif diff --git a/Libs/libMacGitverCore/Widgets/ExpandableDlg.cpp b/Libs/libMacGitverCore/Widgets/ExpandableDlg.cpp index 1154050d..69a078f4 100644 --- a/Libs/libMacGitverCore/Widgets/ExpandableDlg.cpp +++ b/Libs/libMacGitverCore/Widgets/ExpandableDlg.cpp @@ -1,9 +1,10 @@ /* * MacGitver - * Copyright (C) 2015 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * - * (C) Sascha Cunz + * (C) Sascha Cunz * (C) Nils Fenner + * (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. diff --git a/Libs/libMacGitverCore/Widgets/ExpandableDlg.hpp b/Libs/libMacGitverCore/Widgets/ExpandableDlg.hpp index 2fa96aac..c8573d41 100644 --- a/Libs/libMacGitverCore/Widgets/ExpandableDlg.hpp +++ b/Libs/libMacGitverCore/Widgets/ExpandableDlg.hpp @@ -1,9 +1,10 @@ /* * MacGitver - * Copyright (C) 2015 The MacGitver-Developers + * Copyright (C) 2012-2015 The MacGitver-Developers * * (C) Sascha Cunz * (C) Nils Fenner + * (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. diff --git a/Libs/libMacGitverCore/Widgets/FlatTreeComboBox.cpp b/Libs/libMacGitverCore/Widgets/FlatTreeComboBox.cpp index 88731e37..3ee7b725 100644 --- a/Libs/libMacGitverCore/Widgets/FlatTreeComboBox.cpp +++ b/Libs/libMacGitverCore/Widgets/FlatTreeComboBox.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Widgets/FlatTreeComboBox.h b/Libs/libMacGitverCore/Widgets/FlatTreeComboBox.h index 4b036dc9..389827a5 100644 --- a/Libs/libMacGitverCore/Widgets/FlatTreeComboBox.h +++ b/Libs/libMacGitverCore/Widgets/FlatTreeComboBox.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_FLAT_TREE_COMBOBOX_H -#define MGV_FLAT_TREE_COMBOBOX_H +#pragma once #include "libMacGitverCore/MacGitverApi.hpp" @@ -44,5 +46,3 @@ class MGV_CORE_API FlatTreeComboBox : public QComboBox // prevent setting a random QAbstractItemModel using QComboBox::setModel; }; - -#endif diff --git a/Libs/libMacGitverCore/Widgets/FlatTreeDelegate.cpp b/Libs/libMacGitverCore/Widgets/FlatTreeDelegate.cpp index da571926..b3feee92 100644 --- a/Libs/libMacGitverCore/Widgets/FlatTreeDelegate.cpp +++ b/Libs/libMacGitverCore/Widgets/FlatTreeDelegate.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Widgets/FlatTreeDelegate.h b/Libs/libMacGitverCore/Widgets/FlatTreeDelegate.h index 7be3947f..460aa3b6 100644 --- a/Libs/libMacGitverCore/Widgets/FlatTreeDelegate.h +++ b/Libs/libMacGitverCore/Widgets/FlatTreeDelegate.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_FLAT_TREE_DELEGATE_H -#define MGV_FLAT_TREE_DELEGATE_H +#pragma once #include "libMacGitverCore/MacGitverApi.hpp" @@ -30,5 +32,3 @@ class MGV_CORE_API FlatTreeDelegate : public QItemDelegate void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const; }; - -#endif diff --git a/Libs/libMacGitverCore/Widgets/FlatTreeModel.cpp b/Libs/libMacGitverCore/Widgets/FlatTreeModel.cpp index 09e100bd..c0e33ea7 100644 --- a/Libs/libMacGitverCore/Widgets/FlatTreeModel.cpp +++ b/Libs/libMacGitverCore/Widgets/FlatTreeModel.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Widgets/FlatTreeModel.h b/Libs/libMacGitverCore/Widgets/FlatTreeModel.h index e63b2b15..564ad53e 100644 --- a/Libs/libMacGitverCore/Widgets/FlatTreeModel.h +++ b/Libs/libMacGitverCore/Widgets/FlatTreeModel.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_FLAT_TREE_MODEL_H -#define MGV_FLAT_TREE_MODEL_H +#pragma once #include "libMacGitverCore/MacGitverApi.hpp" @@ -57,5 +59,3 @@ class MGV_CORE_API FlatTreeModel : public QAbstractListModel private: FlatTreeModelPrivate* d; }; - -#endif diff --git a/Libs/libMacGitverCore/Widgets/FlatTreeModelPrivate.h b/Libs/libMacGitverCore/Widgets/FlatTreeModelPrivate.h index ecc859f8..00fd3b2d 100644 --- a/Libs/libMacGitverCore/Widgets/FlatTreeModelPrivate.h +++ b/Libs/libMacGitverCore/Widgets/FlatTreeModelPrivate.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_FLAT_TREE_MODEL_PRIVATE_H -#define MGV_FLAT_TREE_MODEL_PRIVATE_H +#pragma once #include #include @@ -62,5 +64,3 @@ class FlatTreeModelPrivate QList< FlatTreeModelEntry* > mEntries; FlatTreeModelEntry mRoot; }; - -#endif diff --git a/Libs/libMacGitverCore/Widgets/FontSelectWidget.cpp b/Libs/libMacGitverCore/Widgets/FontSelectWidget.cpp index cee13831..816abe7f 100644 --- a/Libs/libMacGitverCore/Widgets/FontSelectWidget.cpp +++ b/Libs/libMacGitverCore/Widgets/FontSelectWidget.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Widgets/FontSelectWidget.h b/Libs/libMacGitverCore/Widgets/FontSelectWidget.h index 765fd1f3..b1db56eb 100644 --- a/Libs/libMacGitverCore/Widgets/FontSelectWidget.h +++ b/Libs/libMacGitverCore/Widgets/FontSelectWidget.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_FONT_SELECT_WIDGET_H -#define MGV_FONT_SELECT_WIDGET_H +#pragma once #include "libMacGitverCore/MacGitverApi.hpp" @@ -62,5 +64,3 @@ private slots: QCheckBox* mchkItalic; QComboBox* mcboSize; }; - -#endif diff --git a/Libs/libMacGitverCore/Widgets/HeaderView.cpp b/Libs/libMacGitverCore/Widgets/HeaderView.cpp index f6d1a34f..c16108eb 100644 --- a/Libs/libMacGitverCore/Widgets/HeaderView.cpp +++ b/Libs/libMacGitverCore/Widgets/HeaderView.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Widgets/HeaderView.h b/Libs/libMacGitverCore/Widgets/HeaderView.h index d329d9a1..d361d3e3 100644 --- a/Libs/libMacGitverCore/Widgets/HeaderView.h +++ b/Libs/libMacGitverCore/Widgets/HeaderView.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_HEADER_VIEW_H -#define MGV_HEADER_VIEW_H +#pragma once #include "libMacGitverCore/MacGitverApi.hpp" @@ -40,6 +42,3 @@ public slots: private: QString mConfigName; }; - -#endif - diff --git a/Libs/libMacGitverCore/Widgets/LineEdit.cpp b/Libs/libMacGitverCore/Widgets/LineEdit.cpp index 3b6f9e32..e347cdb5 100644 --- a/Libs/libMacGitverCore/Widgets/LineEdit.cpp +++ b/Libs/libMacGitverCore/Widgets/LineEdit.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Widgets/LineEdit.h b/Libs/libMacGitverCore/Widgets/LineEdit.h index 72f0e753..9387344e 100644 --- a/Libs/libMacGitverCore/Widgets/LineEdit.h +++ b/Libs/libMacGitverCore/Widgets/LineEdit.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_LINE_EDIT_H -#define MGV_LINE_EDIT_H +#pragma once #include "libMacGitverCore/MacGitverApi.hpp" @@ -45,5 +47,3 @@ private slots: private: bool mMandatory; }; - -#endif diff --git a/Libs/libMacGitverCore/Widgets/RepoStateWidget.cpp b/Libs/libMacGitverCore/Widgets/RepoStateWidget.cpp index 04be8001..063f87a9 100644 --- a/Libs/libMacGitverCore/Widgets/RepoStateWidget.cpp +++ b/Libs/libMacGitverCore/Widgets/RepoStateWidget.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Widgets/RepoStateWidget.hpp b/Libs/libMacGitverCore/Widgets/RepoStateWidget.hpp index b3c1e4a9..2fa038c0 100644 --- a/Libs/libMacGitverCore/Widgets/RepoStateWidget.hpp +++ b/Libs/libMacGitverCore/Widgets/RepoStateWidget.hpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_REPO_STATE_WIDGET_HPP -#define MGV_REPO_STATE_WIDGET_HPP +#pragma once class QLabel; @@ -50,7 +52,3 @@ public slots: QLabel* txtState; QLabel* txtBranch; }; - -#endif - - diff --git a/Libs/libMacGitverCore/Widgets/SHA1Input.cpp b/Libs/libMacGitverCore/Widgets/SHA1Input.cpp index dd396b46..f40ae7f0 100644 --- a/Libs/libMacGitverCore/Widgets/SHA1Input.cpp +++ b/Libs/libMacGitverCore/Widgets/SHA1Input.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -21,7 +24,7 @@ SHA1Input::SHA1Input( QWidget* parent ) : LineEdit( parent ) { - QRegExp re( QLatin1String( "[0-9a-fA-F]{5,40}" ) ); + QRegExp re( QStringLiteral( "[0-9a-fA-F]{5,40}" ) ); setValidator( new QRegExpValidator( re, this ) ); } diff --git a/Libs/libMacGitverCore/Widgets/SHA1Input.h b/Libs/libMacGitverCore/Widgets/SHA1Input.h index a6417294..b685ce69 100644 --- a/Libs/libMacGitverCore/Widgets/SHA1Input.h +++ b/Libs/libMacGitverCore/Widgets/SHA1Input.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_SHA1_INPUT_H -#define MGV_SHA1_INPUT_H +#pragma once #include "libMacGitverCore/Widgets/LineEdit.h" @@ -36,7 +38,3 @@ class MGV_CORE_API SHA1Input : public LineEdit using QLineEdit::text; using QLineEdit::setText; }; - -#endif - - diff --git a/Libs/libMacGitverCore/Widgets/ShortCommitModel.cpp b/Libs/libMacGitverCore/Widgets/ShortCommitModel.cpp index 633cad10..a4cf0c8e 100644 --- a/Libs/libMacGitverCore/Widgets/ShortCommitModel.cpp +++ b/Libs/libMacGitverCore/Widgets/ShortCommitModel.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Widgets/ShortCommitModel.h b/Libs/libMacGitverCore/Widgets/ShortCommitModel.h index bcb7fc19..dfcfe628 100644 --- a/Libs/libMacGitverCore/Widgets/ShortCommitModel.h +++ b/Libs/libMacGitverCore/Widgets/ShortCommitModel.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_SHORT_COMMIT_MODEL_H -#define MGV_SHORT_COMMIT_MODEL_H +#pragma once #include "libMacGitverCore/MacGitverApi.hpp" @@ -46,5 +48,3 @@ class MGV_CORE_API ShortCommitModel : public QAbstractTableModel private: Git::CommitList mCommitList; }; - -#endif diff --git a/Libs/libMacGitverCore/Widgets/StringSelectorWidget.cpp b/Libs/libMacGitverCore/Widgets/StringSelectorWidget.cpp index ab2d7283..5d034556 100644 --- a/Libs/libMacGitverCore/Widgets/StringSelectorWidget.cpp +++ b/Libs/libMacGitverCore/Widgets/StringSelectorWidget.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Widgets/StringSelectorWidget.h b/Libs/libMacGitverCore/Widgets/StringSelectorWidget.h index a4b8aab9..70f124a1 100644 --- a/Libs/libMacGitverCore/Widgets/StringSelectorWidget.h +++ b/Libs/libMacGitverCore/Widgets/StringSelectorWidget.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_WIDGETS_STRING_SELECTOR_WIDGET_H -#define MGV_WIDGETS_STRING_SELECTOR_WIDGET_H +#pragma once #include #include @@ -94,5 +96,3 @@ private slots: Q_DECLARE_OPERATORS_FOR_FLAGS( StringSelectorWidget::Buttons ) -#endif - diff --git a/Libs/libMacGitverCore/Widgets/StringSelectorWidgetPrivate.h b/Libs/libMacGitverCore/Widgets/StringSelectorWidgetPrivate.h index f2f0b026..c17839de 100644 --- a/Libs/libMacGitverCore/Widgets/StringSelectorWidgetPrivate.h +++ b/Libs/libMacGitverCore/Widgets/StringSelectorWidgetPrivate.h @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_WIDGETS_STRING_SELECTOR_WIDGET_PRIVATE_H -#define MGV_WIDGETS_STRING_SELECTOR_WIDGET_PRIVATE_H +#pragma once #include #include @@ -79,5 +81,3 @@ class StringSelectorWidgetTree : public QTreeWidget public: QSize sizeHint() const; }; - -#endif diff --git a/Libs/libMacGitverCore/Widgets/TreeViewCtxMenu.cpp b/Libs/libMacGitverCore/Widgets/TreeViewCtxMenu.cpp index d31014b9..bec88fb3 100644 --- a/Libs/libMacGitverCore/Widgets/TreeViewCtxMenu.cpp +++ b/Libs/libMacGitverCore/Widgets/TreeViewCtxMenu.cpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. diff --git a/Libs/libMacGitverCore/Widgets/TreeViewCtxMenu.hpp b/Libs/libMacGitverCore/Widgets/TreeViewCtxMenu.hpp index 44f3ce53..12434d58 100644 --- a/Libs/libMacGitverCore/Widgets/TreeViewCtxMenu.hpp +++ b/Libs/libMacGitverCore/Widgets/TreeViewCtxMenu.hpp @@ -1,6 +1,9 @@ /* * MacGitver - * Copyright (C) 2012-2013 Sascha Cunz + * Copyright (C) 2012-2015 The MacGitver-Developers + * + * (C) Sascha Cunz + * (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. @@ -14,8 +17,7 @@ * */ -#ifndef MGV_CORE_TREE_VIEW_CTXMENU_HPP -#define MGV_CORE_TREE_VIEW_CTXMENU_HPP +#pragma once #include @@ -33,5 +35,3 @@ class MGV_CORE_API TreeViewCtxMenu : public QTreeView signals: void contextMenu( const QModelIndex& index, const QPoint& globalPos ); }; - -#endif diff --git a/Modules/GitConfig/GitConfigDialog.cpp b/Modules/GitConfig/GitConfigDialog.cpp index a691af25..70fcfebc 100644 --- a/Modules/GitConfig/GitConfigDialog.cpp +++ b/Modules/GitConfig/GitConfigDialog.cpp @@ -36,7 +36,7 @@ GitConfigDialog::GitConfigDialog( Git::Repository& repo ) if( mRepo.isValid() ) { - fnRepo = mRepo.path() + QLatin1String( "/config" ); + fnRepo = mRepo.path() + QStringLiteral( "/config" ); cfgRepository->setConfig( fnRepo ); cfgs << fnRepo; } diff --git a/Modules/History/HistoryDetails.cpp b/Modules/History/HistoryDetails.cpp index 1e775e2b..379edc0d 100644 --- a/Modules/History/HistoryDetails.cpp +++ b/Modules/History/HistoryDetails.cpp @@ -34,10 +34,10 @@ HistoryDetails::HistoryDetails( QWidget* parent ) void HistoryDetails::readConfig() { - QVariant vList = Config::self().get( "History/Details/List", QLatin1String( "#" ) ); + QVariant vList = Config::self().get( "History/Details/List", QStringLiteral( "#" ) ); QString sList = vList.toString(); - if( sList == QLatin1String( "#" ) ) + if( sList == QStringLiteral( "#" ) ) { mViewDetailRows << HHD_Subject << HHD_AuthorName << HHD_AuthorMail << HHD_AuthorDate << HHD_SHA1 << HHD_ChildrenList << HHD_ParentsList; @@ -52,7 +52,7 @@ void HistoryDetails::readConfig() } } - QFile fStyle( QLatin1String(":/Modules/History/commit-detail.css") ); + QFile fStyle( QStringLiteral(":/Modules/History/commit-detail.css") ); QString styleTempl = fStyle.open(QFile::ReadOnly) ? QString::fromUtf8( fStyle.readAll().constData() ) : QString(); mStyle = updateStyle( styleTempl ); @@ -64,10 +64,10 @@ QString HistoryDetails::updateStyle(const QString &templ) const { // TODO: this hash shall be provided by the "Config" mechanism ShellExpand::Macros macros; - macros[QLatin1String("MGV_VARIABLE_FONT")] = Config::defaultFontCSS(); - macros[QLatin1String("MGV_FIXED_FONT")] = Config::defaultFixedFontCSS(); - macros[QLatin1String("MGV_BGCOLOR")] = - Config::self().get(QLatin1String("mgv-bg")).toString(); + macros[QStringLiteral("MGV_VARIABLE_FONT")] = Config::defaultFontCSS(); + macros[QStringLiteral("MGV_FIXED_FONT")] = Config::defaultFixedFontCSS(); + macros[QStringLiteral("MGV_BGCOLOR")] = + Config::self().get(QStringLiteral("mgv-bg")).toString(); // replace constants in css (sample $MY_CONST) return ShellExpand(macros).expandText(templ); @@ -96,7 +96,7 @@ void HistoryDetails::setCommit( const Git::ObjectId& sha1 ) static inline QString mkRow( const QString& lbl, const QString& content, bool fixed = false ) { - QString s = QLatin1String( + QString s = QStringLiteral( "" "%1:" "%2" diff --git a/Modules/History/HistoryMode.cpp b/Modules/History/HistoryMode.cpp index 33d6a6cd..12f57d38 100644 --- a/Modules/History/HistoryMode.cpp +++ b/Modules/History/HistoryMode.cpp @@ -36,7 +36,7 @@ HistoryMode::HistoryMode(QObject *parent) } QString HistoryMode::createDefaultState() const { - QFile f(QLatin1String(":/Modes/HistoryMode.xml")); + QFile f(QStringLiteral(":/Modes/HistoryMode.xml")); if (!f.open(QFile::ReadOnly)) { return QString(); } diff --git a/Modules/History/HistoryView.cpp b/Modules/History/HistoryView.cpp index 2d6e9f87..cd656611 100644 --- a/Modules/History/HistoryView.cpp +++ b/Modules/History/HistoryView.cpp @@ -115,7 +115,7 @@ void HistoryView::currentCommitChanged(const Git::ObjectId& sha1) void HistoryView::configChanged( const QString& subPath, const QVariant& value ) { - if( subPath == QLatin1String( "SplitLayout" ) ) + if( subPath == QStringLiteral( "SplitLayout" ) ) { initSplitters(); } diff --git a/Modules/Logging/LoggingMode.cpp b/Modules/Logging/LoggingMode.cpp index 3e42d7f1..cae33c97 100644 --- a/Modules/Logging/LoggingMode.cpp +++ b/Modules/Logging/LoggingMode.cpp @@ -37,7 +37,7 @@ LoggingMode::LoggingMode(QObject *parent) } QString LoggingMode::createDefaultState() const { - QFile f(QLatin1String(":/Modes/LoggingMode.xml")); + QFile f(QStringLiteral(":/Modes/LoggingMode.xml")); if (!f.open(QFile::ReadOnly)) { return QString(); } diff --git a/Modules/Logging/LoggingView.cpp b/Modules/Logging/LoggingView.cpp index 3ac217a9..ae8af2e7 100644 --- a/Modules/Logging/LoggingView.cpp +++ b/Modules/Logging/LoggingView.cpp @@ -156,5 +156,5 @@ void LoggingView::calculatePrefix() .arg(Config::defaultFontCSS()) .arg(Config::defaultFixedFontCSS()); - htmlPostfix = QLatin1String(""); + htmlPostfix = QStringLiteral(""); } diff --git a/Modules/RepoManLogger/RepoManLoggerModule.cpp b/Modules/RepoManLogger/RepoManLoggerModule.cpp index 565b0263..7b8ec21b 100644 --- a/Modules/RepoManLogger/RepoManLoggerModule.cpp +++ b/Modules/RepoManLogger/RepoManLoggerModule.cpp @@ -81,7 +81,7 @@ void RepoManLoggerModule::setupTemplates() void RepoManLoggerModule::setupChannel() { - repoManChannel = Log::Channel::create(QLatin1String("RepoMan")); + repoManChannel = Log::Channel::create(QStringLiteral("RepoMan")); repoManChannel.setDisplayName(trUtf8("Repository Log")); repoManChannel.setDefaultTemplate(defTemplate); Log::Manager().addChannel(repoManChannel); diff --git a/Modules/Repository/CloneRepositoryDlg.cpp b/Modules/Repository/CloneRepositoryDlg.cpp index ed59a40e..f7bbcf13 100644 --- a/Modules/Repository/CloneRepositoryDlg.cpp +++ b/Modules/Repository/CloneRepositoryDlg.cpp @@ -116,7 +116,7 @@ void CloneRepositoryDlg::accept() mProgress->show(); mProgress->setCurrent( clone ); - if( repoName.endsWith( QLatin1String( ".git" ) ) ) + if( repoName.endsWith( QStringLiteral( ".git" ) ) ) repoName = repoName.left( repoName.length() - 4 ); if( repoName.lastIndexOf( QChar( L'/' ) ) != -1 ) diff --git a/Modules/Repository/ProgressDlg.cpp b/Modules/Repository/ProgressDlg.cpp index 832e0862..d6f594ea 100644 --- a/Modules/Repository/ProgressDlg.cpp +++ b/Modules/Repository/ProgressDlg.cpp @@ -131,7 +131,7 @@ void ProgressDlg::remoteMessage( const QString& msg ) output += QString( outputBuffer, outBufLen ); QString log = mBaseLog % QStringLiteral( "
" ) % - output.replace( QChar( L'\n' ), QLatin1String("
") ).simplified(); + output.replace( QChar( L'\n' ), QStringLiteral("
") ).simplified(); txtLog->setHtml( log ); } diff --git a/Modules/Repository/RepoInfoModel.cpp b/Modules/Repository/RepoInfoModel.cpp index cb7ac84c..bcbee721 100644 --- a/Modules/Repository/RepoInfoModel.cpp +++ b/Modules/Repository/RepoInfoModel.cpp @@ -86,15 +86,22 @@ QVariant RepoInfoModel::data( const QModelIndex& index, int role ) const return info->isActive(); case Qt::ToolTipRole: - return QLatin1String("" ) + - trUtf8( "
%1
" ).arg( info->displayName() ) + - QLatin1String("
") + - trUtf8( "
Branch: %1
" ).arg( info->branchDisplay() ) + - trUtf8( "" ) - ; + return trUtf8( + "" + "" + "" + "" + "" + "
%1
" + "
" + "
Branch: %2
" + "" + "") + .arg(info->displayName()) + .arg(info->branchDisplay()); } } diff --git a/Modules/Repository/RepositoryModule.cpp b/Modules/Repository/RepositoryModule.cpp index a77bd736..38a9558f 100644 --- a/Modules/Repository/RepositoryModule.cpp +++ b/Modules/Repository/RepositoryModule.cpp @@ -83,7 +83,7 @@ void RepositoryModule::onRepositoryOpen() #endif QString lastUsedDir = Config::self().get( "Repository/lastUsedDir", "#" ).toString(); - if( lastUsedDir != QLatin1String( "#" ) ) + if( lastUsedDir != QStringLiteral( "#" ) ) { fd->setDirectory( lastUsedDir ); } diff --git a/Modules/Submodules/SubmodulesView.cpp b/Modules/Submodules/SubmodulesView.cpp index e880cf2b..f0a6fcd5 100644 --- a/Modules/Submodules/SubmodulesView.cpp +++ b/Modules/Submodules/SubmodulesView.cpp @@ -82,7 +82,7 @@ void SubmodulesView::readSubmodules() } // TODO: use IconProvider - QIcon decoration; // ( IconProvider::self().icon(QLatin1String("subrepo")) ); + QIcon decoration; // ( IconProvider::self().icon(QStringLiteral("subrepo")) ); foreach( Git::Submodule module, submodules ) { diff --git a/Modules/Welcome/WelcomeView.cpp b/Modules/Welcome/WelcomeView.cpp index 3cda86fe..732d91d9 100644 --- a/Modules/Welcome/WelcomeView.cpp +++ b/Modules/Welcome/WelcomeView.cpp @@ -30,7 +30,7 @@ WelcomeView::WelcomeView() mBrowser->page()->setLinkDelegationPolicy( QWebPage::DelegateExternalLinks ); connect( mBrowser, SIGNAL(linkClicked(QUrl)), this, SLOT(onLinkClicked(const QUrl&)) ); - mBrowser->load( QUrl( QLatin1String("qrc:/ModWelcome/Welcome.html") ) ); + mBrowser->load( QUrl( QStringLiteral("qrc:/ModWelcome/Welcome.html") ) ); setWidget( mBrowser ); } diff --git a/Modules/WorkingTree/IndexTreeItemView.cpp b/Modules/WorkingTree/IndexTreeItemView.cpp index 48f4b341..bee8dd99 100644 --- a/Modules/WorkingTree/IndexTreeItemView.cpp +++ b/Modules/WorkingTree/IndexTreeItemView.cpp @@ -38,7 +38,7 @@ IndexTreeItemView::IndexTreeItemView(QWidget *parent) #endif setHeader( mHeader ); - mHeader->setConfigName( QLatin1String( "Indextree/Columns" ) ); + mHeader->setConfigName( QStringLiteral( "Indextree/Columns" ) ); StageViewCtxMenu::setupActions( this ); diff --git a/Modules/WorkingTree/IndexWidget.cpp b/Modules/WorkingTree/IndexWidget.cpp index 5129fde9..4d95bc5e 100644 --- a/Modules/WorkingTree/IndexWidget.cpp +++ b/Modules/WorkingTree/IndexWidget.cpp @@ -96,7 +96,7 @@ void IndexWidget::updateWtFilterView(const WorkingTreeFilterModel * const wtFilt void IndexWidget::setupFilters() { WorkingTreeFilterModel *wtFilter = new WorkingTreeFilterModel; - QVariant v = Config::self().get( QLatin1String("Worktree/Filters"), + QVariant v = Config::self().get( QStringLiteral("Worktree/Filters"), int( ALL_FILE_STATUS_FILTERS ) ); wtFilter->setSourceModel( mStatusModel ); wtFilter->setFilter( Git::StatusFlags( v.toInt() ) ); @@ -162,7 +162,7 @@ void IndexWidget::setWtFilter(bool enabled, Git::Status flag) { Git::StatusFlags f = wtfModel->filter(); wtfModel->setFilter( enabled ? f |= flag : f &= ~flag ); - Config::self().set( QLatin1String( "Worktree/Filters" ), + Config::self().set( QStringLiteral( "Worktree/Filters" ), int( wtfModel->filter() ) ); } diff --git a/Modules/WorkingTree/WorkingTreeItemView.cpp b/Modules/WorkingTree/WorkingTreeItemView.cpp index baf49d3c..1e5a28d2 100644 --- a/Modules/WorkingTree/WorkingTreeItemView.cpp +++ b/Modules/WorkingTree/WorkingTreeItemView.cpp @@ -39,7 +39,7 @@ WorkingTreeItemView::WorkingTreeItemView(QWidget *parent) #endif setHeader( mHeader ); - mHeader->setConfigName( QLatin1String( "Worktree/Columns" ) ); + mHeader->setConfigName( QStringLiteral( "Worktree/Columns" ) ); WorkingTreeCtxMenu::setupActions( this ); diff --git a/testMacGitverCore/Infra/Fixture.cpp b/testMacGitverCore/Infra/Fixture.cpp index c330b6dd..c5372281 100644 --- a/testMacGitverCore/Infra/Fixture.cpp +++ b/testMacGitverCore/Infra/Fixture.cpp @@ -98,10 +98,10 @@ bool copyDir(const QString& src, const QString& dest) QString Fixture::prepareRepo(const char* name) { - QString sourceDir = dataDir() % QChar(L'/') % QLatin1String(name); - QString destDir = TempDirProvider::get() % QChar(L'/') % QLatin1String(name); + QString sourceDir = dataDir() % QChar(L'/') % QString::fromUtf8(name); + QString destDir = TempDirProvider::get() % QChar(L'/') % QString::fromUtf8(name); - QDir(TempDirProvider::get()).mkpath(QLatin1String(name)); + QDir(TempDirProvider::get()).mkpath(QString::fromUtf8(name)); copyDir(sourceDir, destDir); diff --git a/testMacGitverCore/Infra/TempRepo.cpp b/testMacGitverCore/Infra/TempRepo.cpp index 3b767ca0..544d51ac 100644 --- a/testMacGitverCore/Infra/TempRepo.cpp +++ b/testMacGitverCore/Infra/TempRepo.cpp @@ -33,7 +33,7 @@ TempRepo::TempRepo(Fixture* fixture, const char* name) TempRepo::~TempRepo() { - QDir(mTempRepoDir).rmpath(QLatin1String(".")); + QDir(mTempRepoDir).rmpath(QStringLiteral(".")); } TempRepoOpener::TempRepoOpener(Fixture* fixture, const char* name) diff --git a/testMacGitverCore/Test_SHMParser.cpp b/testMacGitverCore/Test_SHMParser.cpp index 5180b763..b3294442 100644 --- a/testMacGitverCore/Test_SHMParser.cpp +++ b/testMacGitverCore/Test_SHMParser.cpp @@ -5,9 +5,9 @@ TEST(SHMParser, SimpleAssignVariables) { ShellExpand::Macros macros; - macros[QLatin1String("VAR_TEST1_")] = QLatin1String("TEST {1}"); - macros[QLatin1String("VAR_TEST_2")] = QLatin1String("TEST (2)"); - macros[QLatin1String("VAR_TEST_3")] = QLatin1String("TEST (3)"); + macros[QStringLiteral("VAR_TEST1_")] = QStringLiteral("TEST {1}"); + macros[QStringLiteral("VAR_TEST_2")] = QStringLiteral("TEST (2)"); + macros[QStringLiteral("VAR_TEST_3")] = QStringLiteral("TEST (3)"); ShellExpand se(macros); QString source = QString::fromUtf8("_Testing 3 vars: $VAR_TEST1_, $VAR_TEST_2\n; $VAR_TEST_3!"); @@ -26,26 +26,26 @@ TEST(SHMParser, SimpleAssignMacro) ShellExpand::Macros m = se.macros(); ASSERT_EQ(1, m.count()); - ASSERT_TRUE(m.contains(QLatin1String("Macro"))); - EXPECT_STREQ("Value", qPrintable(m[QLatin1String("Macro")])); + ASSERT_TRUE(m.contains(QStringLiteral("Macro"))); + EXPECT_STREQ("Value", qPrintable(m[QStringLiteral("Macro")])); } TEST(SHMParser, AddMacroTest) { ShellExpand::Macros macros; - macros[QLatin1String("VAR_TEST_1")] = QLatin1String("TEST 1"); + macros[QStringLiteral("VAR_TEST_1")] = QStringLiteral("TEST 1"); ShellExpand se(macros); ASSERT_FALSE(se.overwriteMacroDeclarations()); - se.addMacro(QLatin1String("VAR_TEST_2"), QLatin1String("TEST 2")); - se.addMacro(QLatin1String("VAR_TEST_2"), QLatin1String("TEST 3")); + se.addMacro(QStringLiteral("VAR_TEST_2"), QStringLiteral("TEST 2")); + se.addMacro(QStringLiteral("VAR_TEST_2"), QStringLiteral("TEST 3")); ShellExpand::Macros m = se.macros(); ASSERT_EQ(2, m.count()); - ASSERT_TRUE(m.contains(QLatin1String("VAR_TEST_2"))); - EXPECT_STREQ("TEST 2", qPrintable(m[QLatin1String("VAR_TEST_2")])); + ASSERT_TRUE(m.contains(QStringLiteral("VAR_TEST_2"))); + EXPECT_STREQ("TEST 2", qPrintable(m[QStringLiteral("VAR_TEST_2")])); } TEST(SHMParser, RecursiveAssignMacro_Test) @@ -58,6 +58,6 @@ TEST(SHMParser, RecursiveAssignMacro_Test) ShellExpand::Macros m = se.macros(); ASSERT_EQ(2, m.count()); - EXPECT_STREQ("Recurse", qPrintable(m[QLatin1String("MacroInner")])); - EXPECT_STREQ("Recurse", qPrintable(m[QLatin1String("MacroOuter")])); + EXPECT_STREQ("Recurse", qPrintable(m[QStringLiteral("MacroInner")])); + EXPECT_STREQ("Recurse", qPrintable(m[QStringLiteral("MacroOuter")])); }