fix style, add astylerc

diff --git a/UserSheets.pro b/UserSheets.pro
index 8e50682f3f86ea4bcef3c622017e0a045659c444..e3dd443edd5302907a523a09c8dc70e66d4acb95 100644 (file)
--- a/UserSheets.pro
+++ b/UserSheets.pro
@@ -33,3 +33,5 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 HEADERS += \
     database.h \
     controller.h
+
+DISTFILES += style.astylrc

diff --git a/controller.cpp b/controller.cpp
index 446b74d520bd8ac102eb26df7272c8d900cfd735..7fb9dc13f02a3357fbe5278447ae355c10481169 100644 (file)
--- a/controller.cpp
+++ b/controller.cpp
@@ -2,53 +2,54 @@
 #include <QDebug>
 #include <QQuickWindow>
 
-Controller::Controller(DataBase* d, QObject *parent) :
-  QObject(parent),
+Controller::Controller (DataBase* d, QObject* parent) :
+  QObject (parent),
   db{d}
 {
   engine = new QQmlApplicationEngine();
-  this->engine->load(QUrl(QLatin1String("qrc:/main.qml")));
+  this->engine->load (QUrl (QLatin1String ("qrc:/main.qml") ) );
   //connect qml Signals to controller
   QList<QObject*> roots = engine->rootObjects();
   QObject* qmlRoot = roots.first();
 
-  QObject::connect(qmlRoot,SIGNAL(openAddHuman()),
-                   this, SLOT(openAddHuman()));
+  QObject::connect (qmlRoot, SIGNAL (openAddHuman() ),
+                    this, SLOT (openAddHuman() ) );
 
-  QObject::connect(qmlRoot, SIGNAL(openAddService()),
-                   this, SLOT(openAddService()));
+  QObject::connect (qmlRoot, SIGNAL (openAddService() ),
+                    this, SLOT (openAddService() ) );
 
 }
 
 
 void Controller::openAddHuman()
 {
-  QQmlComponent component(engine, QUrl(QStringLiteral("qrc:/addhuman.qml")), QQmlComponent::PreferSynchronous);
+  QQmlComponent component (engine, QUrl (QStringLiteral ("qrc:/addhuman.qml") ), QQmlComponent::PreferSynchronous,
+                           engine->rootObjects().first() );
 
-  if (component.isReady()) {
+  if (component.isReady() ) {
     QObject* dialog = component.create();
-    QQmlEngine::setObjectOwnership(dialog, QQmlEngine::CppOwnership);
-    dialog->setParent(engine->rootObjects().first());
-    QObject::connect(dialog, SIGNAL(addHuman(QVariant, QVariant, QVariant)),
-                     db, SLOT(addHuman(QVariant, QVariant, QVariant)));
+    QQmlEngine::setObjectOwnership (dialog, QQmlEngine::CppOwnership);
+    QObject::connect (dialog, SIGNAL (addHuman (QVariant, QVariant, QVariant) ),
+                      db, SLOT (addHuman (QVariant, QVariant, QVariant) ) );
 
   } else {
     qDebug() << "Dialog not loaded";
   }
+
 }
 
 void Controller::openAddService()
 {
-  QQmlComponent component(engine, QUrl(QStringLiteral("qrc:/addservice.qml")), QQmlComponent::PreferSynchronous);
+  QQmlComponent component (engine, QUrl (QStringLiteral ("qrc:/addservice.qml") ), QQmlComponent::PreferSynchronous,
+                           engine->rootObjects().first() );
 
-  if (component.isReady()) {
+  if (component.isReady() ) {
     QObject* dialog = component.create();
-    QQmlEngine::setObjectOwnership(dialog, QQmlEngine::CppOwnership);
-    dialog->setParent(engine->rootObjects().first());
-    QObject::connect(dialog, SIGNAL(addService(QVariant, QVariant, QVariant)),
-                     db, SLOT(addService(QVariant, QVariant, QVariant)));
+    QQmlEngine::setObjectOwnership (dialog, QQmlEngine::CppOwnership);
+    QObject::connect (dialog, SIGNAL (addService (QVariant, QVariant, QVariant) ),
+                      db, SLOT (addService (QVariant, QVariant, QVariant) ) );
   } else {
-    qDebug()<<"Dialog not loaded";
+    qDebug() << "Dialog not loaded";
   }
 }
 

diff --git a/controller.h b/controller.h
index 029b5a0c9c9fce7044394e224a87a575d87ead3a..7ccf519a850b6ff2266163ee2312b1e2b40aecd1 100644 (file)
--- a/controller.h
+++ b/controller.h
@@ -11,7 +11,7 @@ class Controller : public QObject
 {
   Q_OBJECT
 public:
-  explicit Controller(DataBase* db, QObject *parent = 0);
+  explicit Controller (DataBase* db, QObject* parent = 0);
   virtual ~Controller();
 
 signals:

diff --git a/database.cpp b/database.cpp
index 6047d837676c9afe3586b4bebcf8dc0e6311c763..51162c571a1f5768468a0ac19dfa5222795e40b8 100644 (file)
--- a/database.cpp
+++ b/database.cpp
@@ -3,14 +3,14 @@
 #include <QDebug>
 #include <QDate>
 
-DataBase::DataBase(QObject *parent) : QObject(parent)
+DataBase::DataBase (QObject* parent) : QObject (parent)
 {
-   db = QSqlDatabase::addDatabase("QSQLITE");
-   db.setDatabaseName("usersheets.db");
-   if (!db.open()) {
-     //do stuff
-   }
-   qDebug() << initDB();
+  db = QSqlDatabase::addDatabase ("QSQLITE");
+  db.setDatabaseName ("usersheets.db");
+  if (!db.open() ) {
+    //do stuff
+  }
+  qDebug() << initDB();
 
 }
 
@@ -19,40 +19,40 @@ DataBase::~DataBase()
 
 }
 
-void DataBase::addHuman(const QVariant& name, const QVariant& firstname,
-                            const QVariant& birthday)
+void DataBase::addHuman (const QVariant& name, const QVariant& firstname,
+                         const QVariant& birthday)
 {
-  qDebug()<<"addHuman slot called with: "<<name<<", "<<firstname<<", "<< birthday;
+  qDebug() << "addHuman slot called with: " << name << ", " << firstname << ", " << birthday;
   QSqlQuery q;
-  if (!q.prepare(this->sqlAddHuman)) qDebug() << "error while preparing: " << q.lastError();
-  q.addBindValue(name.toString());
-  q.addBindValue(firstname.toString());
-  q.addBindValue(birthday.toDate());
-  if (!q.exec())qDebug()<<"error: "<< q.lastError();
+  if (!q.prepare (this->sqlAddHuman) ) qDebug() << "error while preparing: " << q.lastError();
+  q.addBindValue (name.toString() );
+  q.addBindValue (firstname.toString() );
+  q.addBindValue (birthday.toDate() );
+  if (!q.exec() ) qDebug() << "error: " << q.lastError();
 
 }
 
-void DataBase::addService(const QVariant& name, const QVariant& url,
-                              const QVariant& description)
+void DataBase::addService (const QVariant& name, const QVariant& url,
+                           const QVariant& description)
 {
-  qDebug()<<"addService slot called with: "<<name<<", "<<url<<", "<< description;
+  qDebug() << "addService slot called with: " << name << ", " << url << ", " << description;
   QSqlQuery q;
-  if (!q.prepare(this->sqlAddService)) qDebug() << "error while preparing: " << q.lastError();
-  q.addBindValue(name.toString());
-  q.addBindValue(url.toUrl());
-  q.addBindValue(description.toString());
-  if (!q.exec())qDebug()<<"error: "<< q.lastError();
+  if (!q.prepare (this->sqlAddService) ) qDebug() << "error while preparing: " << q.lastError();
+  q.addBindValue (name.toString() );
+  q.addBindValue (url.toUrl() );
+  q.addBindValue (description.toString() );
+  if (!q.exec() ) qDebug() << "error: " << q.lastError();
 }
 
-void DataBase::addUser(const QVariant& humanID, const QVariant& serviceID,
-                           const QString& username, const QString& password)
+void DataBase::addUser (const QVariant& humanID, const QVariant& serviceID,
+                        const QString& username, const QString& password)
 {
   QSqlQuery q;
-  q.prepare(this->sqlAddUser);
-  q.addBindValue(humanID);
-  q.addBindValue(serviceID);
-  q.addBindValue(username);
-  q.addBindValue(password);
+  q.prepare (this->sqlAddUser);
+  q.addBindValue (humanID);
+  q.addBindValue (serviceID);
+  q.addBindValue (username);
+  q.addBindValue (password);
   q.exec();
 }
 
@@ -60,15 +60,15 @@ QSqlError DataBase::initDB()
 {
   QStringList tables = db.tables();
   QSqlQuery q;
-  if (!tables.contains("human", Qt::CaseSensitivity::CaseInsensitive))
-  { if (!q.exec(this->sqlCreateHumanTable)) return q.lastError();}
-  else qDebug() << "table human already created";
-  if (!tables.contains("service", Qt::CaseSensitivity::CaseInsensitive))
-  { if (!q.exec(this->sqlCreateServiceTable)) return q.lastError();}
-  else qDebug() << "table service already created";
-  if (!tables.contains("user", Qt::CaseSensitivity::CaseInsensitive))
-  { if (!q.exec(this->sqlCreateUserTable)) return q.lastError();}
-  else qDebug() << "table user already created";
+  if (!tables.contains ("human", Qt::CaseSensitivity::CaseInsensitive) ) {
+    if (!q.exec (this->sqlCreateHumanTable) ) return q.lastError();
+  } else qDebug() << "table human already created";
+  if (!tables.contains ("service", Qt::CaseSensitivity::CaseInsensitive) ) {
+    if (!q.exec (this->sqlCreateServiceTable) ) return q.lastError();
+  } else qDebug() << "table service already created";
+  if (!tables.contains ("user", Qt::CaseSensitivity::CaseInsensitive) ) {
+    if (!q.exec (this->sqlCreateUserTable) ) return q.lastError();
+  } else qDebug() << "table user already created";
 
   return QSqlError();
 }

diff --git a/database.h b/database.h
index 6f7d604a251683bdc6034e39364cddfae0467b33..dc272d04652d09203f01927cf398db92031b61c9 100644 (file)
--- a/database.h
+++ b/database.h
@@ -11,27 +11,27 @@ class DataBase : public QObject
 {
   Q_OBJECT
 public:
-  explicit DataBase(QObject *parent = 0);
+  explicit DataBase (QObject* parent = 0);
   virtual ~DataBase();
 
 signals:
 
 public slots:
-  void addHuman(const QVariant& name, const QVariant& firstname,
-                    const QVariant& birthday);
+  void addHuman (const QVariant& name, const QVariant& firstname,
+                 const QVariant& birthday);
 
-  void addService(const QVariant& name, const QVariant& url,
-                      const QVariant& description);
+  void addService (const QVariant& name, const QVariant& url,
+                   const QVariant& description);
 
-  void addUser(const QVariant& humanID, const QVariant& serviceID,
-                   const QString& username, const QString& password);
+  void addUser (const QVariant& humanID, const QVariant& serviceID,
+                const QString& username, const QString& password);
 
 
 private:
   QSqlError initDB();
 
   QSqlDatabase db;
-  const QLatin1String sqlCreateHumanTable = QLatin1String(
+  const QLatin1String sqlCreateHumanTable = QLatin1String (
         "create table human("
         "id integer primary key autoincrement,"
         "name varchar not null,"
@@ -39,7 +39,7 @@ private:
         "birthday date"
         ")");
 
-  const QLatin1String sqlCreateServiceTable = QLatin1String(
+  const QLatin1String sqlCreateServiceTable = QLatin1String (
         "create table service("
         "id integer primary key autoincrement,"
         "name varchar not null,"
@@ -47,7 +47,7 @@ private:
         "description varchar"
         ")");
 
-  const QLatin1String sqlCreateUserTable = QLatin1String(
+  const QLatin1String sqlCreateUserTable = QLatin1String (
         "create table user("
         "id integer primary key autoincrement,"
         "humanid integer not null,"
@@ -58,29 +58,29 @@ private:
         "foreign key(serviceid) references service(id)"
         ")");
 
-  const QLatin1String sqlAddHuman = QLatin1String(
-      "insert or ignore into "
-      "human "
-      "(name, firstname, birthday)"
-      " values "
-      "(?,?,?)"
-      );
+  const QLatin1String sqlAddHuman = QLatin1String (
+                                      "insert or ignore into "
+                                      "human "
+                                      "(name, firstname, birthday)"
+                                      " values "
+                                      "(?,?,?)"
+                                    );
 
-  const QLatin1String sqlAddService = QLatin1String(
-      "insert or ignore into "
-      "service "
-      "(name, url, description)"
-      " values "
-      "(?,?,?)"
-      );
+  const QLatin1String sqlAddService = QLatin1String (
+                                        "insert or ignore into "
+                                        "service "
+                                        "(name, url, description)"
+                                        " values "
+                                        "(?,?,?)"
+                                      );
 
-  const QLatin1String sqlAddUser = QLatin1String(
-      "insert or ignore into "
-      "user "
-      "(humanid, serviceid, username, password)"
-      " values "
-      "(?,?,?,?)"
-      );
+  const QLatin1String sqlAddUser = QLatin1String (
+                                     "insert or ignore into "
+                                     "user "
+                                     "(humanid, serviceid, username, password)"
+                                     " values "
+                                     "(?,?,?,?)"
+                                   );
 };
 
 #endif // DATABASE_H

diff --git a/main.cpp b/main.cpp
index 536243b9435e7bb9c1ce5323da7b56a7e89758eb..ef1cb52803ac825e54e37b5b02ac5a9d794a8680 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -5,13 +5,13 @@
 #include <QList>
 #include <QVariant>
 
-int main(int argc, char *argv[])
+int main (int argc, char* argv[])
 {
 //  QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-  QApplication app(argc, argv);
+  QApplication app (argc, argv);
 
   DataBase db;
-  Controller c(&db);
+  Controller c (&db);
 
   return app.exec();
 }

diff --git a/style.astylerc b/style.astylerc
new file mode 100644 (file)
index 0000000..5706c31
--- /dev/null
+++ b/style.astylerc
@@ -0,0 +1,12 @@
+--style=kr #mozilla
+#-s2 -p -d -H -k1 -c -xy -xC120 -xL
+indent=spaces=2
+pad-oper
+pad-paren-out
+pad-header
+align-pointer=type
+convert-tabs
+#close-templates
+max-code-length=120
+#indent-continuation=2
+#pad-comma