diff options
author | Kozoriz <kozorizandriy@gmail.com> | 2016-04-26 12:41:54 +0300 |
---|---|---|
committer | Kozoriz <kozorizandriy@gmail.com> | 2016-04-26 15:50:21 +0300 |
commit | 4ecdb2a83871784f34430ed09d5ef6a2c0855506 (patch) | |
tree | dc36b449e5d32ac3e493e16865cf9d88d9991817 /src/components/qt_hmi/References/Work/bananasnacks | |
parent | cf58bb97d09c536dce3b492d1517da0b837bc8eb (diff) | |
download | sdl_core-4ecdb2a83871784f34430ed09d5ef6a2c0855506.tar.gz |
Format all code in project
Formated all code in appMain, components, plugins to correct coding-style
Used clang-format-3.6
Used 2 commands :
find src/appMain/ -name "*.h" -o -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
find src/components/ -name "*.h" -o -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
find src/plugins/ -name "*.h" -o -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
Diffstat (limited to 'src/components/qt_hmi/References/Work/bananasnacks')
3 files changed, 50 insertions, 57 deletions
diff --git a/src/components/qt_hmi/References/Work/bananasnacks/main.cpp b/src/components/qt_hmi/References/Work/bananasnacks/main.cpp index faa3f175be..bb40110e13 100644 --- a/src/components/qt_hmi/References/Work/bananasnacks/main.cpp +++ b/src/components/qt_hmi/References/Work/bananasnacks/main.cpp @@ -2,16 +2,15 @@ #include <QQmlContext> #include "qtquick2applicationviewer.h" -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); +int main(int argc, char* argv[]) { + QGuiApplication app(argc, argv); - QtQuick2ApplicationViewer viewer; + QtQuick2ApplicationViewer viewer; - viewer.addImportPath(QStringLiteral("plugins")); + viewer.addImportPath(QStringLiteral("plugins")); - viewer.setMainQmlFile(QStringLiteral("qml/Bananas/main.qml")); - viewer.showExpanded(); + viewer.setMainQmlFile(QStringLiteral("qml/Bananas/main.qml")); + viewer.showExpanded(); - return app.exec(); + return app.exec(); } diff --git a/src/components/qt_hmi/References/Work/bananasnacks/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/src/components/qt_hmi/References/Work/bananasnacks/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 547602d83c..8fcc4a6d38 100644 --- a/src/components/qt_hmi/References/Work/bananasnacks/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/src/components/qt_hmi/References/Work/bananasnacks/qtquick2applicationviewer/qtquick2applicationviewer.cpp @@ -1,7 +1,8 @@ // checksum 0x56a9 version 0x80001 /* This file was generated by the Qt Quick 2 Application wizard of Qt Creator. - QtQuick2ApplicationViewer is a convenience class containing mobile device specific + QtQuick2ApplicationViewer is a convenience class containing mobile device + specific code such as screen orientation handling. Also QML paths and debugging are handled here. It is recommended not to modify this file, since newer versions of Qt Creator @@ -14,57 +15,50 @@ #include <QtCore/QDir> #include <QtQml/QQmlEngine> -class QtQuick2ApplicationViewerPrivate -{ - QString mainQmlFile; - friend class QtQuick2ApplicationViewer; - static QString adjustPath(const QString &path); +class QtQuick2ApplicationViewerPrivate { + QString mainQmlFile; + friend class QtQuick2ApplicationViewer; + static QString adjustPath(const QString& path); }; -QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path) -{ +QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString& path) { #if defined(Q_OS_MAC) - if (!QDir::isAbsolutePath(path)) - return QString::fromLatin1("%1/../Resources/%2") - .arg(QCoreApplication::applicationDirPath(), path); + if (!QDir::isAbsolutePath(path)) + return QString::fromLatin1("%1/../Resources/%2") + .arg(QCoreApplication::applicationDirPath(), path); #elif defined(Q_OS_UNIX) - const QString pathInInstallDir = - QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path); - if (QFileInfo(pathInInstallDir).exists()) - return pathInInstallDir; + const QString pathInInstallDir = + QString::fromLatin1("%1/../%2") + .arg(QCoreApplication::applicationDirPath(), path); + if (QFileInfo(pathInInstallDir).exists()) + return pathInInstallDir; #endif - return path; + return path; } -QtQuick2ApplicationViewer::QtQuick2ApplicationViewer(QWindow *parent) - : QQuickView(parent) - , d(new QtQuick2ApplicationViewerPrivate()) -{ - connect(engine(), SIGNAL(quit()), SLOT(close())); - setResizeMode(QQuickView::SizeRootObjectToView); +QtQuick2ApplicationViewer::QtQuick2ApplicationViewer(QWindow* parent) + : QQuickView(parent), d(new QtQuick2ApplicationViewerPrivate()) { + connect(engine(), SIGNAL(quit()), SLOT(close())); + setResizeMode(QQuickView::SizeRootObjectToView); } -QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer() -{ - delete d; +QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer() { + delete d; } -void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file) -{ - d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file); - setSource(QUrl::fromLocalFile(d->mainQmlFile)); +void QtQuick2ApplicationViewer::setMainQmlFile(const QString& file) { + d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file); + setSource(QUrl::fromLocalFile(d->mainQmlFile)); } -void QtQuick2ApplicationViewer::addImportPath(const QString &path) -{ - engine()->addImportPath(QtQuick2ApplicationViewerPrivate::adjustPath(path)); +void QtQuick2ApplicationViewer::addImportPath(const QString& path) { + engine()->addImportPath(QtQuick2ApplicationViewerPrivate::adjustPath(path)); } -void QtQuick2ApplicationViewer::showExpanded() -{ +void QtQuick2ApplicationViewer::showExpanded() { #if defined(Q_WS_SIMULATOR) - showFullScreen(); + showFullScreen(); #else - show(); + show(); #endif } diff --git a/src/components/qt_hmi/References/Work/bananasnacks/qtquick2applicationviewer/qtquick2applicationviewer.h b/src/components/qt_hmi/References/Work/bananasnacks/qtquick2applicationviewer/qtquick2applicationviewer.h index bd6c50f54f..42287e8d79 100644 --- a/src/components/qt_hmi/References/Work/bananasnacks/qtquick2applicationviewer/qtquick2applicationviewer.h +++ b/src/components/qt_hmi/References/Work/bananasnacks/qtquick2applicationviewer/qtquick2applicationviewer.h @@ -1,7 +1,8 @@ // checksum 0xfde6 version 0x80001 /* This file was generated by the Qt Quick 2 Application wizard of Qt Creator. - QtQuick2ApplicationViewer is a convenience class containing mobile device specific + QtQuick2ApplicationViewer is a convenience class containing mobile device + specific code such as screen orientation handling. Also QML paths and debugging are handled here. It is recommended not to modify this file, since newer versions of Qt Creator @@ -13,21 +14,20 @@ #include <QtQuick/QQuickView> -class QtQuick2ApplicationViewer : public QQuickView -{ - Q_OBJECT +class QtQuick2ApplicationViewer : public QQuickView { + Q_OBJECT -public: - explicit QtQuick2ApplicationViewer(QWindow *parent = 0); - virtual ~QtQuick2ApplicationViewer(); + public: + explicit QtQuick2ApplicationViewer(QWindow* parent = 0); + virtual ~QtQuick2ApplicationViewer(); - void setMainQmlFile(const QString &file); - void addImportPath(const QString &path); + void setMainQmlFile(const QString& file); + void addImportPath(const QString& path); - void showExpanded(); + void showExpanded(); -private: - class QtQuick2ApplicationViewerPrivate *d; + private: + class QtQuick2ApplicationViewerPrivate* d; }; -#endif // QTQUICK2APPLICATIONVIEWER_H +#endif // QTQUICK2APPLICATIONVIEWER_H |