Advertisement
Guest User

Untitled

a guest
Jun 17th, 2018
369
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.09 KB | None | 0 0
  1. diff --git a/plugins/sql_history/storage/history-sql-storage.cpp b/plugins/sql_history/storage/history-sql-storage.cpp
  2. index 6c6c199..97547e3 100644
  3. --- a/plugins/sql_history/storage/history-sql-storage.cpp
  4. +++ b/plugins/sql_history/storage/history-sql-storage.cpp
  5. @@ -192,7 +192,7 @@ void HistorySqlStorage::init()
  6. this, SLOT(initializerProgressMessage(QString,QString)));
  7. connect(initializer, SIGNAL(progressFinished(bool,QString,QString)),
  8. this, SLOT(initializerProgressFinished(bool,QString,QString)));
  9. - connect(initializer, SIGNAL(databaseReady(bool)), this, SLOT(databaseReady(bool)));
  10. + connect(initializer, SIGNAL(databaseReady(bool,QString)), this, SLOT(databaseReady(bool,QString)));
  11.  
  12. InitializerThread->start();
  13.  
  14. @@ -234,10 +234,14 @@ void HistorySqlStorage::initializerProgressFinished(bool ok, const QString &icon
  15. ImportProgressWindow->progressFinished(ok, iconName, message);
  16. }
  17.  
  18. -void HistorySqlStorage::databaseReady(bool ok)
  19. +void HistorySqlStorage::databaseReady(bool ok, const QString &historyFilePath)
  20. {
  21. if (ok)
  22. - Database = QSqlDatabase::database("kadu-history", true);
  23. + {
  24. + Database = QSqlDatabase::addDatabase("QSQLITE", "kadu-history");
  25. + Database.setDatabaseName(historyFilePath);
  26. + Database.open();
  27. + }
  28.  
  29. if (!Database.isOpen() || Database.isOpenError())
  30. {
  31. diff --git a/plugins/sql_history/storage/history-sql-storage.h b/plugins/sql_history/storage/history-sql-storage.h
  32. index 609ac2e..201324c 100644
  33. --- a/plugins/sql_history/storage/history-sql-storage.h
  34. +++ b/plugins/sql_history/storage/history-sql-storage.h
  35. @@ -146,7 +146,7 @@ private slots:
  36. void initializerProgressMessage(const QString &iconName, const QString &message);
  37. void initializerProgressFinished(bool ok, const QString &iconName, const QString &message);
  38.  
  39. - void databaseReady(bool ok);
  40. + void databaseReady(bool ok, const QString &historyFilePath);
  41.  
  42. public:
  43. Q_INVOKABLE explicit HistorySqlStorage(QObject *parent = nullptr);
  44. diff --git a/plugins/sql_history/storage/sql-initializer.cpp b/plugins/sql_history/storage/sql-initializer.cpp
  45. index 5c437ce..7ca5954 100644
  46. --- a/plugins/sql_history/storage/sql-initializer.cpp
  47. +++ b/plugins/sql_history/storage/sql-initializer.cpp
  48. @@ -71,7 +71,8 @@ void SqlInitializer::initialize()
  49. bool ok = Database.isOpen() && !Database.isOpenError();
  50. Database.close();
  51.  
  52. - emit databaseReady(ok);
  53. + QString historyFilePath = m_pathsProvider->profilePath() + QStringLiteral(HISTORY_FILE_CURRENT);
  54. + emit databaseReady(ok,historyFilePath);
  55.  
  56. deleteLater();
  57. }
  58. diff --git a/plugins/sql_history/storage/sql-initializer.h b/plugins/sql_history/storage/sql-initializer.h
  59. index 1bc1911..f952143 100644
  60. --- a/plugins/sql_history/storage/sql-initializer.h
  61. +++ b/plugins/sql_history/storage/sql-initializer.h
  62. @@ -62,7 +62,7 @@ public slots:
  63. void initialize();
  64.  
  65. signals:
  66. - void databaseReady(bool ok);
  67. + void databaseReady(bool ok, const QString &historyFilePath);
  68.  
  69. void progressMessage(const QString &iconName, const QString &message);
  70. void progressFinished(bool ok, const QString &iconName, const QString &message);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement