[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam] /: polish
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2015-11-24 22:08:59
Message-ID: E1a1Llj-0002Xi-O2 () scm ! kde ! org
[Download RAW message or body]
Git commit 361afe39e61804d4462f5e3029e22e9d6fc49dce by Gilles Caulier.
Committed on 24/11/2015 at 22:08.
Pushed by cgilles into branch 'master'.
polish
M +4 -6 libs/database/engine/dbengineparameters.cpp
M +27 -20 libs/database/engine/dbengineparameters.h
M +5 -5 libs/database/utils/dbsettingswidget.cpp
M +2 -2 utilities/setup/setupdatabase.cpp
http://commits.kde.org/digikam/361afe39e61804d4462f5e3029e22e9d6fc49dce
diff --git a/libs/database/engine/dbengineparameters.cpp \
b/libs/database/engine/dbengineparameters.cpp index cf8355d..3bae6b4 100644
--- a/libs/database/engine/dbengineparameters.cpp
+++ b/libs/database/engine/dbengineparameters.cpp
@@ -85,8 +85,8 @@ DbEngineParameters::DbEngineParameters(const QString& _type,
const QString& _databaseNameCore,
const QString& _connectOptions,
const QString& _hostName,
- int _port,
- bool _internalServer,
+ int _port,
+ bool _internalServer,
const QString& _userName,
const QString& _password,
const QString& _databaseNameThumbnails,
@@ -581,10 +581,8 @@ DbEngineParameters DbEngineParameters::defaultParameters(const \
QString databaseT
const QString miscDir = internalServerPrivatePath() + \
QLatin1String("db_misc"); QString connectOptions = config.connectOptions;
- connectOptions.replace(QLatin1String("$$DBMISCPATH$$"),
- (databaseType == QLatin1String("QMYSQL")) ? miscDir
- : QString()
- );
+ connectOptions.replace(QLatin1String("$$DBMISCPATH$$"), (databaseType == \
QLatin1String("QMYSQL")) + \
? miscDir : QString()); parameters.connectOptions = connectOptions;
qCDebug(DIGIKAM_DBENGINE_LOG) << "ConnectOptions "<< parameters.connectOptions;
diff --git a/libs/database/engine/dbengineparameters.h \
b/libs/database/engine/dbengineparameters.h index d16f4ed..0e95acd 100644
--- a/libs/database/engine/dbengineparameters.h
+++ b/libs/database/engine/dbengineparameters.h
@@ -53,21 +53,22 @@ class DIGIKAM_EXPORT DbEngineParameters
public:
- DbEngineParameters(const QString& type,
- const QString& databaseNameCore,
- const QString& connectOptions = QString(),
- const QString& hostName = QString(),
- int port = -1,
- bool internalServer = false,
- const QString& userName = QString(),
- const QString& password = QString(),
- const QString& databaseNameThumbnails = QString(),
- const QString& databaseNameFace = QString()
+ DbEngineParameters(const QString& _type,
+ const QString& _databaseNameCore,
+ const QString& _connectOptions = QString(),
+ const QString& _hostName = QString(),
+ int _port = -1,
+ bool _internalServer = false,
+ const QString& _userName = QString(),
+ const QString& _password = QString(),
+ const QString& _databaseNameThumbnails = QString(),
+ const QString& _databaseNameFace = QString()
);
DbEngineParameters();
- /** QUrl helpers.
+ /**
+ * QUrl helpers.
*/
explicit DbEngineParameters(const QUrl& url);
void insertInUrl(QUrl& url) const;
@@ -76,8 +77,9 @@ public:
bool operator==(const DbEngineParameters& other) const;
bool operator!=(const DbEngineParameters& other) const;
- /** Performs basic checks that the parameters are not empty and have the \
information
- * required for the databaseType.
+ /**
+ * Performs basic checks that the parameters are not empty and have the \
information + * required for the databaseType.
*/
bool isValid() const;
@@ -98,7 +100,8 @@ public:
*/
QByteArray hash() const;
- /** Return a set of default parameters for the given type. For Mysql, it return \
internal server configuration. + /**
+ * Return a set of default parameters for the given type. For Mysql, it return \
internal server configuration.
*/
static DbEngineParameters defaultParameters(const QString databaseType);
@@ -114,6 +117,7 @@ public:
/**
* NOTE: In case of SQLite, the database name typically is a file.
* For non-SQLite, this simply sets the database name.
+ * For Mysql, this simply sets the database name.
*/
QString getCoreDatabaseNameOrDir() const;
@@ -133,11 +137,13 @@ public:
static QString thumbnailDatabaseDirectorySQLite(const QString& path);
static QString faceDatabaseDirectorySQLite(const QString& path);
- /** Replaces databaseName with databaseNameThumbnails.
+ /**
+ * Replaces databaseName with databaseNameThumbnails.
*/
DbEngineParameters thumbnailParameters() const;
- /** Replaces databaseName with databaseNameFace.
+ /**
+ * Replaces databaseName with databaseNameFace.
*/
DbEngineParameters faceParameters() const;
@@ -146,13 +152,14 @@ public:
/**
* Convenience methods to create a DbEngineParameters object for an
- * SQLITE 3 database specified by the local file path.
+ * SQLITE database specified by the local file path.
*/
static DbEngineParameters parametersForSQLite(const QString& databaseFile);
static DbEngineParameters parametersForSQLiteDefaultFile(const QString& \
directory);
- /** Return the hidden path from home directory to store private
- * data used by internal Mysql server.
+ /**
+ * Return the hidden path from home directory to store private
+ * data used by internal Mysql server.
*/
static QString internalServerPrivatePath();
@@ -168,7 +175,7 @@ public:
QString password;
QString databaseNameThumbnails;
- QString databaseNameFace;
+ QString databaseNameFace;
};
DIGIKAM_EXPORT QDebug operator<<(QDebug dbg, const DbEngineParameters& t);
diff --git a/libs/database/utils/dbsettingswidget.cpp \
b/libs/database/utils/dbsettingswidget.cpp index 624a505..6fad2d3 100644
--- a/libs/database/utils/dbsettingswidget.cpp
+++ b/libs/database/utils/dbsettingswidget.cpp
@@ -98,12 +98,12 @@ void DatabaseSettingsWidget::setupMainArea()
const int spacing = \
QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing);
- QGroupBox* const dbConfigBox = new QGroupBox(i18n("Database Configuration"), \
this);
- QVBoxLayout* const vlay = new QVBoxLayout(dbConfigBox);
+ QGroupBox* const dbConfigBox = new QGroupBox(i18n("Database Configuration"), \
this); + QVBoxLayout* const vlay = new QVBoxLayout(dbConfigBox);
- DHBox* const typeHbox = new DHBox();
- QLabel* const databaseTypeLabel = new QLabel(typeHbox);
- d->dbType = new QComboBox(typeHbox);
+ DHBox* const typeHbox = new DHBox();
+ QLabel* const databaseTypeLabel = new QLabel(typeHbox);
+ d->dbType = new QComboBox(typeHbox);
databaseTypeLabel->setText(i18n("Type:"));
// --------------------------------------------------------
diff --git a/utilities/setup/setupdatabase.cpp b/utilities/setup/setupdatabase.cpp
index 55933d0..72b348c 100644
--- a/utilities/setup/setupdatabase.cpp
+++ b/utilities/setup/setupdatabase.cpp
@@ -76,8 +76,8 @@ public:
}
DatabaseSettingsWidget* databaseWidget;
- QGroupBox* updateBox;
- QPushButton* hashesButton;
+ QGroupBox* updateBox;
+ QPushButton* hashesButton;
};
SetupDatabase::SetupDatabase(QWidget* const parent)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic