summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-27 02:13:42 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-27 02:13:42 -0600
commit520c05ef06ce203ad32470730f68402bc7719157 (patch)
tree8d0bb18bbbecb4c837e232848905e5819db84b81 /src/sql
parentb82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff)
downloadtqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz
tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip
Automated update from qt3
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/qsqldatabase.cpp4
-rw-r--r--src/sql/qsqlmanager_p.cpp28
2 files changed, 16 insertions, 16 deletions
diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp
index ebe65d1ba..582219b49 100644
--- a/src/sql/qsqldatabase.cpp
+++ b/src/sql/qsqldatabase.cpp
@@ -211,12 +211,12 @@ TQSqlDatabaseManager* TQSqlDatabaseManager::instance()
{
static TQGuardedPtr<TQSqlDatabaseManager> sqlConnection = 0;
if ( !sqlConnection ) {
- if( qApp == 0 ){
+ if( tqApp == 0 ){
qFatal( "TQSqlDatabaseManager: A TQApplication object has to be "
"instantiated in order to use the SQL module." );
return 0;
}
- sqlConnection = new TQSqlDatabaseManager( qApp, "database manager" );
+ sqlConnection = new TQSqlDatabaseManager( tqApp, "database manager" );
}
return (TQSqlDatabaseManager*)sqlConnection;
}
diff --git a/src/sql/qsqlmanager_p.cpp b/src/sql/qsqlmanager_p.cpp
index 0ed88cf8c..c7c3ec3c5 100644
--- a/src/sql/qsqlmanager_p.cpp
+++ b/src/sql/qsqlmanager_p.cpp
@@ -869,10 +869,10 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m )
if ( m == TQSql::Delete ) {
#ifndef QT_NO_MESSAGEBOX
ans = TQMessageBox::information( parent,
- qApp->translate( "TQSql", "Delete" ),
- qApp->translate( "TQSql", "Delete this record?" ),
- qApp->translate( "TQSql", "Yes" ),
- qApp->translate( "TQSql", "No" ),
+ tqApp->translate( "TQSql", "Delete" ),
+ tqApp->translate( "TQSql", "Delete this record?" ),
+ tqApp->translate( "TQSql", "Yes" ),
+ tqApp->translate( "TQSql", "No" ),
TQString::null, 0, 1 );
#else
ans = TQSql::No;
@@ -880,16 +880,16 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m )
} else if ( m != TQSql::None ) {
TQString caption;
if ( m == TQSql::Insert ) {
- caption = qApp->translate( "TQSql", "Insert" );
+ caption = tqApp->translate( "TQSql", "Insert" );
} else { // TQSql::Update
- caption = qApp->translate( "TQSql", "Update" );
+ caption = tqApp->translate( "TQSql", "Update" );
}
#ifndef QT_NO_MESSAGEBOX
ans = TQMessageBox::information( parent, caption,
- qApp->translate( "TQSql", "Save edits?" ),
- qApp->translate( "TQSql", "Yes" ),
- qApp->translate( "TQSql", "No" ),
- qApp->translate( "TQSql", "Cancel" ),
+ tqApp->translate( "TQSql", "Save edits?" ),
+ tqApp->translate( "TQSql", "Yes" ),
+ tqApp->translate( "TQSql", "No" ),
+ tqApp->translate( "TQSql", "Cancel" ),
0, 2 );
#else
ans = TQSql::No;
@@ -921,10 +921,10 @@ TQSql::Confirm TQDataManager::confirmCancel( TQWidget* parent, TQSql::Op )
{
#ifndef QT_NO_MESSAGEBOX
switch ( TQMessageBox::information( parent,
- qApp->translate( "TQSql", "Confirm" ),
- qApp->translate( "TQSql", "Cancel your edits?" ),
- qApp->translate( "TQSql", "Yes" ),
- qApp->translate( "TQSql", "No" ),
+ tqApp->translate( "TQSql", "Confirm" ),
+ tqApp->translate( "TQSql", "Cancel your edits?" ),
+ tqApp->translate( "TQSql", "Yes" ),
+ tqApp->translate( "TQSql", "No" ),
TQString::null, 0, 1 ) ) {
case 0:
return TQSql::Yes;