summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--amarok/src/amarok.h2
-rw-r--r--amarok/src/collectionbrowser.cpp24
-rw-r--r--amarok/src/collectionbrowser.h2
-rw-r--r--amarok/src/database_refactor/dbenginebase.cpp2
-rw-r--r--amarok/src/database_refactor/dbenginebase.h2
-rw-r--r--amarok/src/threadmanager.cpp2
6 files changed, 17 insertions, 17 deletions
diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h
index aa48d1ac..af7c37ee 100644
--- a/amarok/src/amarok.h
+++ b/amarok/src/amarok.h
@@ -176,7 +176,7 @@ namespace Amarok
/**
* Returns internal code for database type, DbConnection::sqlite, DbConnection::mysql, or DbConnection::postgresql
- * @param type either "STQLite", "MySQL", or "Postgresql".
+ * @param type either "SQLite", "MySQL", or "Postgresql".
*/
int databaseTypeCode( const TQString type ); //defined in configdialog.cpp
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index b2fb94f8..b2721e40 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -871,7 +871,7 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT
if ( dynamic_cast<CollectionItem*>( item ) )
{
- itemText = static_cast<CollectionItem*>( item )->getSTQLText( 0 );
+ itemText = static_cast<CollectionItem*>( item )->getSQLText( 0 );
}
else
{
@@ -940,7 +940,7 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT
case 1:
tmptext = dynamic_cast<CollectionItem*>( item->parent() ) ?
- static_cast<CollectionItem*>( item->parent() )->getSTQLText( 0 ) :
+ static_cast<CollectionItem*>( item->parent() )->getSQLText( 0 ) :
item->parent()->text( 0 );
isUnknown = tmptext.isEmpty();
@@ -1015,7 +1015,7 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT
case 2:
tmptext = dynamic_cast<CollectionItem*> ( item->parent()->parent() ) ?
- static_cast<CollectionItem*>( item->parent()->parent() )->getSTQLText( 0 ) :
+ static_cast<CollectionItem*>( item->parent()->parent() )->getSQLText( 0 ) :
item->parent()->parent()->text( 0 );
isUnknown = tmptext.isEmpty();
@@ -1042,7 +1042,7 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT
}
tmptext = dynamic_cast<CollectionItem*>( item->parent() ) ?
- static_cast<CollectionItem*>( item->parent() )->getSTQLText( 0 ) :
+ static_cast<CollectionItem*>( item->parent() )->getSQLText( 0 ) :
item->parent()->text( 0 );
isUnknown = tmptext.isEmpty();
@@ -2175,7 +2175,7 @@ CollectionView::getTrueItemText( int cat, TQListViewItem* item ) const
if ( dynamic_cast<CollectionItem*>( item ) )
{
CollectionItem* collectItem = static_cast<CollectionItem*>( item );
- trueItemText = collectItem->getSTQLText( 0 );
+ trueItemText = collectItem->getSQLText( 0 );
if ( cat == IdVisYearAlbum && !collectItem->isUnknown() )
trueItemText = trueItemText.right( trueItemText.length() - trueItemText.find( i18n( " - " ) ) - i18n( " - " ).length() );
}
@@ -2389,7 +2389,7 @@ CollectionView::listSelected()
qb.addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL );
- tmptext = static_cast<CollectionItem*>( item )->getSTQLText( 0 );
+ tmptext = static_cast<CollectionItem*>( item )->getSQLText( 0 );
unknownText = tmptext.isEmpty();
if ( !sampler )
@@ -2470,7 +2470,7 @@ CollectionView::listSelected()
if ( q_cat1 == IdArtist )
qb.setOptions( QueryBuilder::optNoCompilations );
- tmptext = static_cast<CollectionItem*>( item )->getSTQLText( 0 );
+ tmptext = static_cast<CollectionItem*>( item )->getSQLText( 0 );
unknownText = tmptext.isEmpty();
if( VisYearAlbum == 1 )
@@ -2489,7 +2489,7 @@ CollectionView::listSelected()
qb.setOptions( QueryBuilder::optOnlyCompilations );
- tmptext = static_cast<CollectionItem*>( child )->getSTQLText( 0 );
+ tmptext = static_cast<CollectionItem*>( child )->getSQLText( 0 );
unknownText = tmptext.isEmpty();
if( VisYearAlbum == 2 )
@@ -2574,7 +2574,7 @@ CollectionView::listSelected()
if ( q_cat1 == IdArtist )
qb.setOptions( QueryBuilder::optNoCompilations );
- tmptext = static_cast<CollectionItem*>( item )->getSTQLText( 0 );
+ tmptext = static_cast<CollectionItem*>( item )->getSQLText( 0 );
unknownText = tmptext.isEmpty();
if( VisYearAlbum == 1 )
@@ -2592,7 +2592,7 @@ CollectionView::listSelected()
else
qb.setOptions( QueryBuilder::optOnlyCompilations );
- tmptext = static_cast<CollectionItem*>( child )->getSTQLText( 0 );
+ tmptext = static_cast<CollectionItem*>( child )->getSQLText( 0 );
unknownText = tmptext.isEmpty();
if( VisYearAlbum == 2 )
@@ -2607,7 +2607,7 @@ CollectionView::listSelected()
qb.addMatch( q_cat2, tmptext, false, true );
- tmptext = static_cast<CollectionItem*>( grandChild )->getSTQLText( 0 );
+ tmptext = static_cast<CollectionItem*>( grandChild )->getSQLText( 0 );
unknownText = tmptext.isEmpty();
if( VisYearAlbum == 3 )
@@ -3021,7 +3021,7 @@ CollectionView::incrementDepth( bool rerender /*= true*/ )
}
else
- m_ipodFilters[m_currentDepth] << item->getSTQLText( 0 );
+ m_ipodFilters[m_currentDepth] << item->getSQLText( 0 );
// Save the selection
m_ipodSelected[m_currentDepth] << item->text( 0 );
diff --git a/amarok/src/collectionbrowser.h b/amarok/src/collectionbrowser.h
index c8cc0a86..2f1c28a4 100644
--- a/amarok/src/collectionbrowser.h
+++ b/amarok/src/collectionbrowser.h
@@ -161,7 +161,7 @@ class CollectionItem : public KListViewItem {
virtual void sortChildItems ( int column, bool ascending ); //reimplemented
- inline TQString getSTQLText( int column )
+ inline TQString getSQLText( int column )
{
return ( !column && m_isUnknown ) ? "" : text( column );
}
diff --git a/amarok/src/database_refactor/dbenginebase.cpp b/amarok/src/database_refactor/dbenginebase.cpp
index bca3a0c2..12900a26 100644
--- a/amarok/src/database_refactor/dbenginebase.cpp
+++ b/amarok/src/database_refactor/dbenginebase.cpp
@@ -415,7 +415,7 @@ QueryBuilder::setLimit( int startPos, int length )
void
-QueryBuilder::initSTQLDrag()
+QueryBuilder::initSQLDrag()
{
clear();
addReturnValue( QueryBuilder::tabAlbum, QueryBuilder::valName );
diff --git a/amarok/src/database_refactor/dbenginebase.h b/amarok/src/database_refactor/dbenginebase.h
index b4600849..9458d6ce 100644
--- a/amarok/src/database_refactor/dbenginebase.h
+++ b/amarok/src/database_refactor/dbenginebase.h
@@ -101,7 +101,7 @@ class QueryBuilder
void groupBy( int table, int value );
void setLimit( int startPos, int length );
- void initSTQLDrag();
+ void initSQLDrag();
void buildQuery();
TQString getQuery();
TQString query() { buildQuery(); return m_query; };
diff --git a/amarok/src/threadmanager.cpp b/amarok/src/threadmanager.cpp
index 6b13a647..96d01c6e 100644
--- a/amarok/src/threadmanager.cpp
+++ b/amarok/src/threadmanager.cpp
@@ -290,7 +290,7 @@ ThreadManager::Thread::run()
DEBUG_BLOCK
- //keep this first, before anything that uses the database, or STQLite may error out
+ //keep this first, before anything that uses the database, or SQLite may error out
if ( AmarokConfig::databaseEngine().toInt() == DbConnection::sqlite )
CollectionDB::instance()->releasePreviousConnection( this );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 14:03:40 +0000