summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-14 21:37:51 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-14 21:37:51 +0000
commite0ac4ab32fc98879aa68dafbc1a07b8b5afcc17d (patch)
tree96ba71e999d67d73248708bd4f4eda7c245cdfde
parent23bfbfff2de55c72029349cc312adac29cf09809 (diff)
downloaddigikam-e0ac4ab32fc98879aa68dafbc1a07b8b5afcc17d.tar.gz
digikam-e0ac4ab32fc98879aa68dafbc1a07b8b5afcc17d.zip
Convert accidental instances of STQL to the proper SQL
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/digikam@1247182 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--digikam/digikam/albumdb.cpp2
-rw-r--r--digikam/digikam/albumdb_sqlite2.cpp2
-rw-r--r--digikam/digikam/albumdb_sqlite2.h6
-rw-r--r--digikam/digikam/upgradedb_sqlite2tosqlite3.h6
-rw-r--r--digikam/kioslave/sqlitedb.cpp4
-rw-r--r--digikam/kioslave/sqlitedb.h6
6 files changed, 13 insertions, 13 deletions
diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp
index 153eaa6..ddcbdc7 100644
--- a/digikam/digikam/albumdb.cpp
+++ b/digikam/digikam/albumdb.cpp
@@ -666,7 +666,7 @@ bool AlbumDB::execSql(const TQString& sql, TQStringList* const values,
if ( !d->dataBase )
{
- DWarning() << k_funcinfo << "STQLite pointer == NULL"
+ DWarning() << k_funcinfo << "SQLite pointer == NULL"
<< endl;
return false;
}
diff --git a/digikam/digikam/albumdb_sqlite2.cpp b/digikam/digikam/albumdb_sqlite2.cpp
index 0361a0b..35bb993 100644
--- a/digikam/digikam/albumdb_sqlite2.cpp
+++ b/digikam/digikam/albumdb_sqlite2.cpp
@@ -92,7 +92,7 @@ bool AlbumDB_Sqlite2::execSql(const TQString& sql, TQStringList* const values,
DDebug() << "SQL-query: " << sql << endl;
if ( !m_db ) {
- DWarning() << k_funcinfo << "STQLite pointer == NULL"
+ DWarning() << k_funcinfo << "SQLite pointer == NULL"
<< endl;
return false;
}
diff --git a/digikam/digikam/albumdb_sqlite2.h b/digikam/digikam/albumdb_sqlite2.h
index a53cfea..339289b 100644
--- a/digikam/digikam/albumdb_sqlite2.h
+++ b/digikam/digikam/albumdb_sqlite2.h
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef ALBUMDB_STQLITE2_H
-#define ALBUMDB_STQLITE2_H
+#ifndef ALBUMDB_SQLITE2_H
+#define ALBUMDB_SQLITE2_H
// TQt includes.
@@ -82,4 +82,4 @@ private:
} // namespace Digikam
-#endif /* ALBUMDB_STQLITE2_H */
+#endif /* ALBUMDB_SQLITE2_H */
diff --git a/digikam/digikam/upgradedb_sqlite2tosqlite3.h b/digikam/digikam/upgradedb_sqlite2tosqlite3.h
index a699c75..8d94fa7 100644
--- a/digikam/digikam/upgradedb_sqlite2tosqlite3.h
+++ b/digikam/digikam/upgradedb_sqlite2tosqlite3.h
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef UPGRADEDB_STQLITE2TOSTQLITE3_H
-#define UPGRADEDB_STQLITE2TOSTQLITE3_H
+#ifndef UPGRADEDB_SQLITE2TOSQLITE3_H
+#define UPGRADEDB_SQLITE2TOSQLITE3_H
#include "digikam_export.h"
@@ -35,4 +35,4 @@ extern bool DIGIKAM_EXPORT upgradeDB_Sqlite2ToSqlite3(const TQString& libraryPat
} // namespace Digikam
-#endif /* UPGRADEDB_STQLITE2TOSTQLITE3_H */
+#endif /* UPGRADEDB_SQLITE2TOSQLITE3_H */
diff --git a/digikam/kioslave/sqlitedb.cpp b/digikam/kioslave/sqlitedb.cpp
index c81a2ac..47e36bf 100644
--- a/digikam/kioslave/sqlitedb.cpp
+++ b/digikam/kioslave/sqlitedb.cpp
@@ -94,11 +94,11 @@ bool SqliteDB::execSql(const TQString& sql, TQStringList* const values,
if ( !m_db )
{
- kdWarning() << k_funcinfo << "STQLite pointer == NULL"
+ kdWarning() << k_funcinfo << "SQLite pointer == NULL"
<< endl;
if (errMsg)
{
- *errMsg = TQString::tqfromLatin1("STQLite database not open");
+ *errMsg = TQString::tqfromLatin1("SQLite database not open");
}
return false;
}
diff --git a/digikam/kioslave/sqlitedb.h b/digikam/kioslave/sqlitedb.h
index f41a7ed..a3b793f 100644
--- a/digikam/kioslave/sqlitedb.h
+++ b/digikam/kioslave/sqlitedb.h
@@ -20,8 +20,8 @@
* GNU General Public License for more details.
* ============================================================ */
-#ifndef STQLITEDB_H
-#define STQLITEDB_H
+#ifndef SQLITEDB_H
+#define SQLITEDB_H
// TQt includes.
@@ -55,4 +55,4 @@ private:
extern TQString escapeString(const TQString& str);
-#endif /* STQLITEDB_H */
+#endif /* SQLITEDB_H */