diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-03-17 00:42:38 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-03-17 00:57:16 +0100 |
commit | 9344a79233882ac278b3812b91b6edf874ef5d16 (patch) | |
tree | e5bd324104a9d8dcf1839de8a880845f8739a37a /src/dal | |
parent | 0e24b15a386d45f43cea76c1b8ad744728a3190e (diff) | |
download | manaserv-9344a79233882ac278b3812b91b6edf874ef5d16.tar.gz manaserv-9344a79233882ac278b3812b91b6edf874ef5d16.tar.xz manaserv-9344a79233882ac278b3812b91b6edf874ef5d16.zip |
Micro-optimizations related to std::string
* Rely on the fact that a std::string is empty by default
* Use std::string::empty() rather than comparing to ""
* Construct with std::string() rather than from ""
Reviewed-by: Bertram
Diffstat (limited to 'src/dal')
-rw-r--r-- | src/dal/dalexcept.h | 6 | ||||
-rw-r--r-- | src/dal/dataprovider.cpp | 2 | ||||
-rw-r--r-- | src/dal/pqdataprovider.cpp | 4 | ||||
-rw-r--r-- | src/dal/sqlitedataprovider.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/dal/dalexcept.h b/src/dal/dalexcept.h index bf20282..377c8ee 100644 --- a/src/dal/dalexcept.h +++ b/src/dal/dalexcept.h @@ -75,7 +75,7 @@ class DbConnectionFailure: public DbException */ DbConnectionFailure() throw() - : DbException("") + : DbException(std::string()) {} @@ -102,7 +102,7 @@ class DbDisconnectionFailure: public DbException */ DbDisconnectionFailure() throw() - : DbException("") + : DbException(std::string()) {} /** @@ -128,7 +128,7 @@ class DbSqlQueryExecFailure: public DbException */ DbSqlQueryExecFailure() throw() - : DbException("") + : DbException(std::string()) {} /** diff --git a/src/dal/dataprovider.cpp b/src/dal/dataprovider.cpp index a88e205..6c8c167 100644 --- a/src/dal/dataprovider.cpp +++ b/src/dal/dataprovider.cpp @@ -83,7 +83,7 @@ bool DataProvider::isConnected() const std::string DataProvider::getDbName() const { if (!isConnected()) - return ""; + return std::string(); return mDbName; } diff --git a/src/dal/pqdataprovider.cpp b/src/dal/pqdataprovider.cpp index 1ba62f2..5895912 100644 --- a/src/dal/pqdataprovider.cpp +++ b/src/dal/pqdataprovider.cpp @@ -55,9 +55,9 @@ void PqDataProvider::connect(const std::string& dbName, { // Create string to pass to PQconnectdb std::string connStr = "dbname = " + dbName + " "; // database name - if (userName != "") + if (!userName.empty()) connStr += "user = " + userName + " "; // username - if (password != "") + if (!password.empty()) connStr += "password = " + password; // password // Connect to database diff --git a/src/dal/sqlitedataprovider.cpp b/src/dal/sqlitedataprovider.cpp index 74fa072..2e005d9 100644 --- a/src/dal/sqlitedataprovider.cpp +++ b/src/dal/sqlitedataprovider.cpp @@ -370,7 +370,7 @@ const RecordSet &SqLiteDataProvider::processSql() { fieldNames.push_back(sqlite3_column_name(mStmt, col)); const unsigned char *txt = sqlite3_column_text(mStmt, col); - r.push_back(txt ? (char*)txt : ""); + r.push_back(txt ? (char*)txt : std::string()); } // ensure we set column headers before adding a row |