Browse Source

Added compatibility for qDebug and DataPosition

DataPosition now compatible with qDebug() <<
Felix 4 years ago
parent
commit
6e9a2c9406
4 changed files with 16 additions and 3 deletions
  1. 1 1
      main.cpp
  2. 1 1
      src/database/adatabase.cpp
  3. 12 0
      src/database/declarations.h
  4. 2 1
      src/gui/widgets/debugwidget.cpp

+ 1 - 1
main.cpp

@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     //Theming
     int selectedtheme = ASettings::getSettings().value("main/theme").toInt();
     QDir::setCurrent("/themes");
-    switch (2) {
+    switch (selectedtheme) {
     case 1:{
         DEB "main :: Loading light theme";
         QFile file(":light.qss");

+ 1 - 1
src/database/adatabase.cpp

@@ -133,7 +133,7 @@ bool ADatabase::remove(AEntry entry)
 
     if (query.lastError().type() == QSqlError::NoError)
     {
-        DEB "Entry " << entry.getPosition().tableName << entry.getPosition().rowId << " removed.";
+        DEB "Entry " << entry.getPosition() << " removed.";
         emit dataBaseUpdated();
         lastError = QString();
         return true;

+ 12 - 0
src/database/declarations.h

@@ -2,6 +2,7 @@
 #define DECLARATIONS_H
 
 #include <QtCore>
+#include "src/testing/adebug.h"
 
 /*!
  * \brief An alias for QString
@@ -57,6 +58,17 @@ struct DataPosition {
 
     DataPosition(const DataPosition& other) = default;
     DataPosition& operator=(const DataPosition& other) = default;
+
+    // Compatibility with qDebug
+    QString debug() const
+    {
+        DEB "Table: " + tableName + "RowId: " + QString::number(rowId);
+        return QString();
+    }
+    operator QString() const
+    {
+        return debug();    //overload for compatibility with qDebug()
+    }
 };
 
 // [F]:

+ 2 - 1
src/gui/widgets/debugwidget.cpp

@@ -1,5 +1,6 @@
 #include "debugwidget.h"
 #include "ui_debugwidget.h"
+#include "src/astandardpaths.h"
 
 DebugWidget::DebugWidget(QWidget *parent) :
     QWidget(parent),
@@ -168,7 +169,7 @@ void DebugWidget::on_importCsvPushButton_clicked()
 
 void DebugWidget::on_debugPushButton_clicked()
 {
-
+    DEB AStandardPaths::getPaths()[QStandardPaths::AppDataLocation];
 }
 
 /* //Comparing two functions template