diff options
| author | Darrell Anderson <[email protected]> | 2012-04-13 01:59:40 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-04-13 01:59:40 -0500 |
| commit | a3bc52ff9b9c38aebdd9b48d2ad9cdd0ce45b8ed (patch) | |
| tree | ce518baf6f8229faa86a2b5a58bcc4b5e6c28460 | |
| parent | 00324698960819812e8663d54a06ee9f3a1cfd2c (diff) | |
| download | amarok-a3bc52ff9b9c38aebdd9b48d2ad9cdd0ce45b8ed.tar.gz amarok-a3bc52ff9b9c38aebdd9b48d2ad9cdd0ce45b8ed.zip | |
Fix inadvertent "TQ" changes.
35 files changed, 289 insertions, 289 deletions
diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp index 9bea26d4..09b1a8d0 100644 --- a/amarok/src/actionclasses.cpp +++ b/amarok/src/actionclasses.cpp @@ -122,7 +122,7 @@ Menu::Menu() insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n( "C&over Manager" ), ID_SHOW_COVER_MANAGER ); safePlug( ac, "queue_manager", this ); insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n( "&Visualizations" ), ID_SHOW_VIS_SELECTOR ); - insertItem( SmallIconSet( Amarok::icon( "equalizer" ) ), i18n( "E&qualizer" ), kapp, TQT_SLOT( slotConfigEqualizer() ), 0, ID_CONFIGURE_ETQUALIZER ); + insertItem( SmallIconSet( Amarok::icon( "equalizer" ) ), i18n( "E&qualizer" ), kapp, TQT_SLOT( slotConfigEqualizer() ), 0, ID_CONFIGURE_EQUALIZER ); safePlug( ac, "script_manager", this ); safePlug( ac, "statistics", this ); @@ -182,7 +182,7 @@ Menu::helpMenu( TQWidget *parent ) //STATIC void Menu::slotAboutToShow() { - setItemEnabled( ID_CONFIGURE_ETQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) ); + setItemEnabled( ID_CONFIGURE_EQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) ); setItemEnabled( ID_CONF_DECODER, EngineController::hasEngineProperty( "HasConfigure" ) ); } @@ -608,7 +608,7 @@ StopMenu::StopMenu() insertTitle( i18n( "Stop" ) ); insertItem( i18n("Now"), NOW ); insertItem( i18n("After Current Track"), AFTER_TRACK ); - insertItem( i18n("After Queue"), AFTER_TQUEUE ); + insertItem( i18n("After Queue"), AFTER_QUEUE ); connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); @@ -631,8 +631,8 @@ StopMenu::slotAboutToShow() setItemEnabled( AFTER_TRACK, EngineController::engine()->loaded() ); setItemChecked( AFTER_TRACK, pl->stopAfterMode() == Playlist::StopAfterCurrent ); - setItemEnabled( AFTER_TQUEUE, pl->nextTracks().count() ); - setItemChecked( AFTER_TQUEUE, pl->stopAfterMode() == Playlist::StopAfterQueue ); + setItemEnabled( AFTER_QUEUE, pl->nextTracks().count() ); + setItemChecked( AFTER_QUEUE, pl->stopAfterMode() == Playlist::StopAfterQueue ); } void @@ -653,7 +653,7 @@ StopMenu::slotActivated( int index ) ? Playlist::DoNotStop : Playlist::StopAfterCurrent ); break; - case AFTER_TQUEUE: + case AFTER_QUEUE: pl->setStopAfterMode( mode == Playlist::StopAfterQueue ? Playlist::DoNotStop : Playlist::StopAfterQueue ); diff --git a/amarok/src/actionclasses.h b/amarok/src/actionclasses.h index 02ebdd97..bb024da4 100644 --- a/amarok/src/actionclasses.h +++ b/amarok/src/actionclasses.h @@ -33,7 +33,7 @@ namespace Amarok ID_CONF_DECODER, ID_SHOW_VIS_SELECTOR, ID_SHOW_COVER_MANAGER, - ID_CONFIGURE_ETQUALIZER, + ID_CONFIGURE_EQUALIZER, ID_RESCAN_COLLECTION }; @@ -190,7 +190,7 @@ namespace Amarok enum MenuIds { NOW, AFTER_TRACK, - AFTER_TQUEUE + AFTER_QUEUE }; static KPopupMenu *instance(); diff --git a/amarok/src/analyzers/glanalyzer2.cpp b/amarok/src/analyzers/glanalyzer2.cpp index ae6c5b2c..1ea36fdd 100644 --- a/amarok/src/analyzers/glanalyzer2.cpp +++ b/amarok/src/analyzers/glanalyzer2.cpp @@ -232,7 +232,7 @@ void GLAnalyzer2::paintGL() glLoadIdentity(); // glRotatef( -frame.rotDegrees, 0,0,1 ); - glBegin( GL_TQUADS ); + glBegin( GL_QUADS ); // Particle * particle = particleList.first(); // for (; particle; particle = particleList.next()) { diff --git a/amarok/src/analyzers/glanalyzer3.cpp b/amarok/src/analyzers/glanalyzer3.cpp index bd16f689..2681fdcd 100644 --- a/amarok/src/analyzers/glanalyzer3.cpp +++ b/amarok/src/analyzers/glanalyzer3.cpp @@ -347,7 +347,7 @@ void GLAnalyzer3::drawDot3s( float x, float y, float z, float size ) pYm = y - sizeY, pYM = y + sizeY; // Draw the Dot - glBegin( GL_TQUADS ); + glBegin( GL_QUADS ); glTexCoord2f( 0, 0 ); // Bottom Left glVertex3f( pXm, pYm, z ); glTexCoord2f( 0, 1 ); // Top Left @@ -370,7 +370,7 @@ void GLAnalyzer3::drawDot3s( float x, float y, float z, float size ) // Draw the top shadow currentColor[3] = topSide * topSide * alpha; glColor4fv( currentColor ); - glBegin( GL_TQUADS ); + glBegin( GL_QUADS ); glTexCoord2f( 0, 0 ); // Bottom Left glVertex3f( pXm, 1, pZm ); glTexCoord2f( 0, 1 ); // Top Left @@ -383,7 +383,7 @@ void GLAnalyzer3::drawDot3s( float x, float y, float z, float size ) // Draw the bottom shadow currentColor[3] = bottomSide * bottomSide * alpha; glColor4fv( currentColor ); - glBegin( GL_TQUADS ); + glBegin( GL_QUADS ); glTexCoord2f( 0, 0 ); // Bottom Left glVertex3f( pXm, -1, pZm ); glTexCoord2f( 0, 1 ); // Top Left diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index 68f5c537..607af54c 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/amarok/src/collectionbrowser.cpp @@ -1416,7 +1416,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // cat = catArr[m_currentDepth]; } - enum Actions { APPEND, TQUEUE, MAKE, SAVE, MEDIA_DEVICE, BURN_ARTIST, + enum Actions { APPEND, QUEUE, MAKE, SAVE, MEDIA_DEVICE, BURN_ARTIST, BURN_COMPOSER, BURN_ALBUM, BURN_CD, FETCH, INFO, COMPILATION_SET, COMPILATION_UNSET, ORGANIZE, DELETE, TRASH, FILE_MENU }; @@ -1428,7 +1428,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), MAKE ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), selection.count() == 1 ? i18n( "&Queue Track" ) - : i18n( "&Queue Tracks" ), TQUEUE ); + : i18n( "&Queue Tracks" ), QUEUE ); if( selection.count() > 1 || item->isExpandable() ) menu.insertItem( SmallIconSet( Amarok::icon( "save" ) ), i18n( "&Save as Playlist..." ), SAVE ); @@ -1504,7 +1504,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // case SAVE: playlistFromURLs( selection ); break; - case TQUEUE: + case QUEUE: Playlist::instance()->insertMedia( selection, Playlist::Queue ); break; case MEDIA_DEVICE: diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp index 251fe92a..eb363e3d 100644 --- a/amarok/src/collectiondb.cpp +++ b/amarok/src/collectiondb.cpp @@ -664,7 +664,7 @@ CollectionDB::createTables( const bool temporary ) query( TQString( "CREATE %1 TABLE uniqueid%2 (" "url " + exactTextColumnType() + "," "deviceid INTEGER," - "uniqueid " + exactTextColumnType(32) + " UNITQUE," + "uniqueid " + exactTextColumnType(32) + " UNIQUE," "dir " + exactTextColumnType() + ");" ) .arg( temporary ? "TEMPORARY" : "" ) .arg( temporary ? "_temp" : "" ) ); @@ -698,9 +698,9 @@ CollectionDB::createTables( const bool temporary ) } else { - query( "CREATE UNITQUE INDEX url_tagtemp ON tags_temp( url, deviceid );" ); - query( "CREATE UNITQUE INDEX embed_urltemp ON embed_temp( url, deviceid );" ); - query( "CREATE UNITQUE INDEX dir_temp_dir ON directories_temp( dir, deviceid );" ); + query( "CREATE UNIQUE INDEX url_tagtemp ON tags_temp( url, deviceid );" ); + query( "CREATE UNIQUE INDEX embed_urltemp ON embed_temp( url, deviceid );" ); + query( "CREATE UNIQUE INDEX dir_temp_dir ON directories_temp( dir, deviceid );" ); query( "CREATE INDEX album_tagtemp ON tags_temp( album );" ); query( "CREATE INDEX artist_tagtemp ON tags_temp( artist );" ); query( "CREATE INDEX sampler_tagtemp ON tags_temp( sampler );" ); @@ -716,7 +716,7 @@ CollectionDB::createIndices() //tables which are not created in that function. debug() << "Creating indices, ignore errors about already existing indices" << endl; - query( "CREATE UNITQUE INDEX url_tag ON tags( url, deviceid );" ); + query( "CREATE UNIQUE INDEX url_tag ON tags( url, deviceid );" ); query( "CREATE INDEX album_tag ON tags( album );" ); query( "CREATE INDEX artist_tag ON tags( artist );" ); query( "CREATE INDEX composer_tag ON tags( composer );" ); @@ -729,10 +729,10 @@ CollectionDB::createIndices() query( "CREATE INDEX images_url ON images( path, deviceid );" ); - query( "CREATE UNITQUE INDEX embed_url ON embed( url, deviceid );" ); + query( "CREATE UNIQUE INDEX embed_url ON embed( url, deviceid );" ); query( "CREATE INDEX embed_hash ON embed( hash );" ); - query( "CREATE UNITQUE INDEX directories_dir ON directories( dir, deviceid );" ); + query( "CREATE UNIQUE INDEX directories_dir ON directories( dir, deviceid );" ); query( "CREATE INDEX uniqueid_uniqueid ON uniqueid( uniqueid );"); query( "CREATE INDEX uniqueid_url ON uniqueid( url, deviceid );"); @@ -764,16 +764,16 @@ CollectionDB::createPermanentIndices() //already exist, but these can be ignored debug() << "Creating permanent indices, ignore errors about already existing indices" << endl; - query( "CREATE UNITQUE INDEX lyrics_url ON lyrics( url, deviceid );" ); + query( "CREATE UNIQUE INDEX lyrics_url ON lyrics( url, deviceid );" ); query( "CREATE INDEX lyrics_uniqueid ON lyrics( uniqueid );" ); query( "CREATE INDEX playlist_playlists ON playlists( playlist );" ); query( "CREATE INDEX url_playlists ON playlists( url );" ); - query( "CREATE UNITQUE INDEX labels_name ON labels( name, type );" ); - query( "CREATE INDEX tags_labels_uniqueid ON tags_labels( uniqueid );" ); //m:n relationship, DO NOT MAKE UNITQUE! - query( "CREATE INDEX tags_labels_url ON tags_labels( url, deviceid );" ); //m:n relationship, DO NOT MAKE UNITQUE! - query( "CREATE INDEX tags_labels_labelid ON tags_labels( labelid );" ); //m:n relationship, DO NOT MAKE UNITQUE! + query( "CREATE UNIQUE INDEX labels_name ON labels( name, type );" ); + query( "CREATE INDEX tags_labels_uniqueid ON tags_labels( uniqueid );" ); //m:n relationship, DO NOT MAKE UNIQUE! + query( "CREATE INDEX tags_labels_url ON tags_labels( url, deviceid );" ); //m:n relationship, DO NOT MAKE UNIQUE! + query( "CREATE INDEX tags_labels_labelid ON tags_labels( labelid );" ); //m:n relationship, DO NOT MAKE UNIQUE! - query( "CREATE UNITQUE INDEX url_stats ON statistics( deviceid, url );" ); + query( "CREATE UNIQUE INDEX url_stats ON statistics( deviceid, url );" ); query( "CREATE INDEX percentage_stats ON statistics( percentage );" ); query( "CREATE INDEX rating_stats ON statistics( rating );" ); query( "CREATE INDEX playcounter_stats ON statistics( playcounter );" ); @@ -961,7 +961,7 @@ CollectionDB::createStatsTable() "percentage FLOAT," "rating INTEGER DEFAULT 0," "playcounter INTEGER," - "uniqueid " + exactTextColumnType(32) + " UNITQUE," + "uniqueid " + exactTextColumnType(32) + " UNIQUE," "deleted BOOL DEFAULT " + boolF() + "," "PRIMARY KEY(url, deviceid) );" ) ); @@ -973,13 +973,13 @@ CollectionDB::createStatsTableV8() { // create music statistics database - old form, for upgrade code. query( TQString( "CREATE TABLE statistics (" - "url " + textColumnType() + " UNITQUE," + "url " + textColumnType() + " UNIQUE," "createdate INTEGER," "accessdate INTEGER," "percentage FLOAT," "rating INTEGER DEFAULT 0," "playcounter INTEGER," - "uniqueid " + textColumnType(8) + " UNITQUE," + "uniqueid " + textColumnType(8) + " UNIQUE," "deleted BOOL DEFAULT " + boolF() + ");" ) ); query( "CREATE INDEX url_stats ON statistics( url );" ); @@ -1002,7 +1002,7 @@ CollectionDB::createStatsTableV10( bool temp ) "percentage FLOAT," "rating INTEGER DEFAULT 0," "playcounter INTEGER," - "uniqueid " + exactTextColumnType(32) + " UNITQUE," + "uniqueid " + exactTextColumnType(32) + " UNIQUE," "deleted BOOL DEFAULT " + boolF() + "," "PRIMARY KEY(url, deviceid) );" ).arg( temp ? "TEMPORARY" : "" ) @@ -1010,7 +1010,7 @@ CollectionDB::createStatsTableV10( bool temp ) if ( !temp ) { - query( "CREATE UNITQUE INDEX url_stats ON statistics( deviceid, url );" ); + query( "CREATE UNIQUE INDEX url_stats ON statistics( deviceid, url );" ); query( "CREATE INDEX percentage_stats ON statistics( percentage );" ); query( "CREATE INDEX rating_stats ON statistics( rating );" ); query( "CREATE INDEX playcounter_stats ON statistics( playcounter );" ); @@ -1074,7 +1074,7 @@ CollectionDB::createPersistentTables() query( TQString( "CREATE TABLE tags_labels (" "deviceid INTEGER," "url " + exactTextColumnType() + ", " - "uniqueid " + exactTextColumnType(32) + ", " //m:n relationship, DO NOT MAKE UNITQUE! + "uniqueid " + exactTextColumnType(32) + ", " //m:n relationship, DO NOT MAKE UNIQUE! "labelid INTEGER REFERENCES labels( id ) ON DELETE CASCADE );" ) ); } @@ -1135,7 +1135,7 @@ CollectionDB::createPersistentTablesV14( bool temp ) if ( !temp ) { - query( "CREATE UNITQUE INDEX lyrics_url ON lyrics( url, deviceid );" ); + query( "CREATE UNIQUE INDEX lyrics_url ON lyrics( url, deviceid );" ); query( "CREATE INDEX playlist_playlists ON playlists( playlist );" ); query( "CREATE INDEX url_playlists ON playlists( url );" ); } @@ -1163,7 +1163,7 @@ CollectionDB::createPodcastTables() // create podcast channels table query( TQString( "CREATE TABLE podcastchannels (" - "url " + exactTextColumnType() + " UNITQUE," + "url " + exactTextColumnType() + " UNIQUE," "title " + textColumnType() + "," "weblink " + exactTextColumnType() + "," "image " + exactTextColumnType() + "," @@ -1177,7 +1177,7 @@ CollectionDB::createPodcastTables() // create podcast episodes table query( TQString( "CREATE TABLE podcastepisodes (" "id INTEGER PRIMARY KEY %1, " - "url " + exactTextColumnType() + " UNITQUE," + "url " + exactTextColumnType() + " UNIQUE," "localurl " + exactTextColumnType() + "," "parent " + exactTextColumnType() + "," "guid " + exactTextColumnType() + "," @@ -1230,7 +1230,7 @@ CollectionDB::createPodcastTablesV2( bool temp ) // create podcast channels table query( TQString( "CREATE %1 TABLE podcastchannels%2 (" - "url " + exactTextColumnType() + " UNITQUE," + "url " + exactTextColumnType() + " UNIQUE," "title " + textColumnType() + "," "weblink " + exactTextColumnType() + "," "image " + exactTextColumnType() + "," @@ -1244,7 +1244,7 @@ CollectionDB::createPodcastTablesV2( bool temp ) // create podcast episodes table query( TQString( "CREATE %2 TABLE podcastepisodes%3 (" "id INTEGER PRIMARY KEY %1, " - "url " + exactTextColumnType() + " UNITQUE," + "url " + exactTextColumnType() + " UNIQUE," "localurl " + exactTextColumnType() + "," "parent " + exactTextColumnType() + "," "guid " + exactTextColumnType() + "," @@ -5494,7 +5494,7 @@ CollectionDB::updateStatsTables() if( prev < 8 ) //Versions 6, 7 and 8 all were all attempts to add columns for ATF. his code should do it all. { query( TQString( "CREATE TABLE statistics_fix (" - "url " + textColumnType() + " UNITQUE," + "url " + textColumnType() + " UNIQUE," "createdate INTEGER," "accessdate INTEGER," "percentage FLOAT," @@ -5687,12 +5687,12 @@ CollectionDB::updatePersistentTables() query( TQString( "CREATE TABLE tags_labels (" "deviceid INTEGER," "url " + exactTextColumnType() + ", " - "uniqueid " + exactTextColumnType(32) + ", " //m:n relationship, DO NOT MAKE UNITQUE! + "uniqueid " + exactTextColumnType(32) + ", " //m:n relationship, DO NOT MAKE UNIQUE! "labelid INTEGER REFERENCES labels( id ) ON DELETE CASCADE );" ) ); - query( "CREATE UNITQUE INDEX labels_name ON labels( name, type );" ); - query( "CREATE INDEX tags_labels_uniqueid ON tags_labels( uniqueid );" ); //m:n relationship, DO NOT MAKE UNITQUE! - query( "CREATE INDEX tags_labels_url ON tags_labels( url, deviceid );" ); //m:n relationship, DO NOT MAKE UNITQUE! + query( "CREATE UNIQUE INDEX labels_name ON labels( name, type );" ); + query( "CREATE INDEX tags_labels_uniqueid ON tags_labels( uniqueid );" ); //m:n relationship, DO NOT MAKE UNIQUE! + query( "CREATE INDEX tags_labels_url ON tags_labels( url, deviceid );" ); //m:n relationship, DO NOT MAKE UNIQUE! } if ( PersistentVersion.toInt() < 18 ) { @@ -5701,7 +5701,7 @@ CollectionDB::updatePersistentTables() } if ( PersistentVersion.toInt() < 19 ) { - query( "CREATE INDEX tags_labels_labelid ON tags_labels( labelid );" ); //m:n relationship, DO NOT MAKE UNITQUE! + query( "CREATE INDEX tags_labels_labelid ON tags_labels( labelid );" ); //m:n relationship, DO NOT MAKE UNIQUE! } //Up to date. Keep this number \/ in sync! if ( PersistentVersion.toInt() > 19 || PersistentVersion.toInt() < 0 ) @@ -6427,7 +6427,7 @@ TQStringList MySqlConnection::query( const TQString& statement, bool suppressDeb if ( mysql_field_count( m_db ) != 0 ) { if ( !suppressDebug ) - debug() << "MYSQL TQUERY FAILED: " << mysql_error( m_db ) << "\n" << "FAILED TQUERY: " << statement << "\n"; + debug() << "MYSQL QUERY FAILED: " << mysql_error( m_db ) << "\n" << "FAILED QUERY: " << statement << "\n"; values = TQStringList(); } } @@ -6436,7 +6436,7 @@ TQStringList MySqlConnection::query( const TQString& statement, bool suppressDeb else { if ( !suppressDebug ) - debug() << "MYSQL TQUERY FAILED: " << mysql_error( m_db ) << "\n" << "FAILED TQUERY: " << statement << "\n"; + debug() << "MYSQL QUERY FAILED: " << mysql_error( m_db ) << "\n" << "FAILED QUERY: " << statement << "\n"; values = TQStringList(); } @@ -6526,7 +6526,7 @@ TQStringList PostgresqlConnection::query( const TQString& statement, bool suppre if (result == NULL) { if ( !suppressDebug ) - debug() << "POSTGRESQL TQUERY FAILED: " << PQerrorMessage( m_db ) << "\n" << "FAILED TQUERY: " << statement << "\n"; + debug() << "POSTGRESQL QUERY FAILED: " << PQerrorMessage( m_db ) << "\n" << "FAILED QUERY: " << statement << "\n"; return values; } @@ -6534,7 +6534,7 @@ TQStringList PostgresqlConnection::query( const TQString& statement, bool suppre if ((status != PGRES_COMMAND_OK) && (status != PGRES_TUPLES_OK)) { if ( !suppressDebug ) - debug() << "POSTGRESQL TQUERY FAILED: " << PQerrorMessage( m_db ) << "\n" << "FAILED TQUERY: " << statement << "\n"; + debug() << "POSTGRESQL QUERY FAILED: " << PQerrorMessage( m_db ) << "\n" << "FAILED QUERY: " << statement << "\n"; PQclear(result); return values; } diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp index 980a3dda..e7d88378 100644 --- a/amarok/src/database_refactor/collectiondb.cpp +++ b/amarok/src/database_refactor/collectiondb.cpp @@ -340,7 +340,7 @@ CollectionDB::createTables( DbConnection *conn ) // create directory statistics table query( TQString( "CREATE %1 TABLE directories%2 (" - "dir " + textColumnType() + " UNITQUE," + "dir " + textColumnType() + " UNIQUE," "changedate INTEGER );" ) .arg( conn ? "TEMPORARY" : "" ) .arg( conn ? "_temp" : "" ), conn ); @@ -455,7 +455,7 @@ CollectionDB::createStatsTable() // create music statistics database query( TQString( "CREATE TABLE statistics (" - "url " + textColumnType() + " UNITQUE," + "url " + textColumnType() + " UNIQUE," "createdate INTEGER," "accessdate INTEGER," "percentage FLOAT," diff --git a/amarok/src/engine/helix/helix-sp/gain.cpp b/amarok/src/engine/helix/helix-sp/gain.cpp index ff75b801..c219955b 100644 --- a/amarok/src/engine/helix/helix-sp/gain.cpp +++ b/amarok/src/engine/helix/helix-sp/gain.cpp @@ -18,7 +18,7 @@ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TQUIET + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET * ENJOYMENT OR NON-INFRINGEMENT. * * Technology Compatibility Kit Test Suite(s) Location: diff --git a/amarok/src/engine/helix/helix-sp/gain.h b/amarok/src/engine/helix/helix-sp/gain.h index 8b7902b8..d120a134 100644 --- a/amarok/src/engine/helix/helix-sp/gain.h +++ b/amarok/src/engine/helix/helix-sp/gain.h @@ -18,7 +18,7 @@ * and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY * KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS * ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TQUIET + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET * ENJOYMENT OR NON-INFRINGEMENT. * * Technology Compatibility Kit Test Suite(s) Location: diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h index 73c006ea..dd841fe2 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h @@ -332,7 +332,7 @@ do { \ } while (0) \ -#define RETQUIRE_REPORT(targ,file,line) HXAssertFailedLine(targ,file,line) +#define REQUIRE_REPORT(targ,file,line) HXAssertFailedLine(targ,file,line) @@ -525,7 +525,7 @@ int safe_int_func_call(LONG32 f); #define HX_ASSERT_VALID_READ_PTR(pOb) ((void)0) #define HXOutputDebugString(f) ((void)0) -#define RETQUIRE_REPORT(targ,file,line) ((int)0) +#define REQUIRE_REPORT(targ,file,line) ((int)0) #if defined (_MACINTOSH) // this is the proper release version of HX_VERIFY that preserves the syntactic @@ -574,104 +574,104 @@ class LogInfo ///////////////////////////////////////////////////////////////////////////// -// CHECK/RETQUIRE MACROS +// CHECK/REQUIRE MACROS // // These macros are always valid (debug and release builds) // // // -// RETQUIRE and RETQUIRE_ACTION _always_ emit code for the goto if the statement is false +// REQUIRE and REQUIRE_ACTION _always_ emit code for the goto if the statement is false // -// RETQUIRE_REPORT only generates code in Debug builds +// REQUIRE_REPORT only generates code in Debug builds // // The do {} while (0) construct ensures this is legal wherever a statement is legal // #define CHECK(stmt) HX_ASSERT(stmt) -#define RETQUIRE_VOID_RETURN(stmt) \ - do { if ((stmt) == 0) { if (RETQUIRE_REPORT(#stmt,__FILE__,__LINE__)) HXDebugBreak(); return; } } while (0) -#define RETQUIRE_RETURN(stmt,returned) \ - do { if ((stmt) == 0) { if (RETQUIRE_REPORT(#stmt,__FILE__,__LINE__)) HXDebugBreak(); return (returned); } } while (0) -#define RETQUIRE_VOID_RETURN_TQUIET(stmt) \ +#define REQUIRE_VOID_RETURN(stmt) \ + do { if ((stmt) == 0) { if (REQUIRE_REPORT(#stmt,__FILE__,__LINE__)) HXDebugBreak(); return; } } while (0) +#define REQUIRE_RETURN(stmt,returned) \ + do { if ((stmt) == 0) { if (REQUIRE_REPORT(#stmt,__FILE__,__LINE__)) HXDebugBreak(); return (returned); } } while (0) +#define REQUIRE_VOID_RETURN_QUIET(stmt) \ do { if ((stmt) == 0) { return; } } while (0) -#define RETQUIRE_RETURN_TQUIET(stmt,returned) \ +#define REQUIRE_RETURN_QUIET(stmt,returned) \ do { if ((stmt) == 0) { return (returned); } } while (0) -#define RETQUIRE(stmt,target) \ - do { if ((stmt) == 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) -#define RETQUIRE_ACTION(stmt,target,action) \ - do { if ((stmt) == 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) -#define RETQUIRE_TQUIET(stmt,target) \ +#define REQUIRE(stmt,target) \ + do { if ((stmt) == 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) +#define REQUIRE_ACTION(stmt,target,action) \ + do { if ((stmt) == 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) +#define REQUIRE_QUIET(stmt,target) \ do { if ((stmt) == 0) goto target; } while (0) -#define RETQUIRE_ACTION_TQUIET(stmt,target,action) \ +#define REQUIRE_ACTION_QUIET(stmt,target,action) \ do { if ((stmt) == 0) {{action;} goto target;} } while (0) -#define PRE_RETQUIRE_RETURN(stmt,returned) \ - RETQUIRE_RETURN(stmt,returned) -#define PRE_RETQUIRE_VOID_RETURN(stmt) \ - RETQUIRE_VOID_RETURN(stmt) -#define POST_RETQUIRE_RETURN(stmt,returned) \ - RETQUIRE_RETURN(stmt,returned) -#define POST_RETQUIRE_VOID_RETURN(stmt) \ - RETQUIRE_VOID_RETURN(stmt) - -#define RETQUIRE_SUCCESS_RETURN_TQUIET(expr) \ +#define PRE_REQUIRE_RETURN(stmt,returned) \ + REQUIRE_RETURN(stmt,returned) +#define PRE_REQUIRE_VOID_RETURN(stmt) \ + REQUIRE_VOID_RETURN(stmt) +#define POST_REQUIRE_RETURN(stmt,returned) \ + REQUIRE_RETURN(stmt,returned) +#define POST_REQUIRE_VOID_RETURN(stmt) \ + REQUIRE_VOID_RETURN(stmt) + +#define REQUIRE_SUCCESS_RETURN_QUIET(expr) \ do { register HX_RESULT const res = expr; if (FAILED (res)) return res; } while (0) -#define RETQUIRE_SUCCESS_RETURN(expr) \ - do { register HX_RESULT const res = expr; if (FAILED (res)) { RETQUIRE_REPORT("False condition, Aborting...",__FILE__,__LINE__); return res; } } while (0) +#define REQUIRE_SUCCESS_RETURN(expr) \ + do { register HX_RESULT const res = expr; if (FAILED (res)) { REQUIRE_REPORT("False condition, Aborting...",__FILE__,__LINE__); return res; } } while (0) // -// RETQUIRE_SUCCESS reports the error if an expected result failed +// REQUIRE_SUCCESS reports the error if an expected result failed // Ideally, this should report the status value as well // #define CHECK_SUCCESS(stat) HX_ASSERT(((unsigned long)(stat)>>31) == 0) -#define RETQUIRE_SUCCESS(stat,target) \ - do { if (((unsigned long)(stat)>>31) != 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) -#define RETQUIRE_SUCCESS_ACTION(stat,target,action) \ - do { if (((unsigned long)(stat)>>31) != 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) -#define RETQUIRE_SUCCESS_TQUIET(stat,target) \ +#define REQUIRE_SUCCESS(stat,target) \ + do { if (((unsigned long)(stat)>>31) != 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) +#define REQUIRE_SUCCESS_ACTION(stat,target,action) \ + do { if (((unsigned long)(stat)>>31) != 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) +#define REQUIRE_SUCCESS_QUIET(stat,target) \ do { if (((unsigned long)(stat)>>31) != 0) goto target; } while (0) -#define RETQUIRE_SUCCESS_ACTION_TQUIET(stat,target,action) \ +#define REQUIRE_SUCCESS_ACTION_QUIET(stat,target,action) \ do { if (((unsigned long)(stat)>>31) != 0) {{action;} goto target;} } while (0) // -// RETQUIRE_NOERR reports the error if the error value is non-zero +// REQUIRE_NOERR reports the error if the error value is non-zero // Ideally, this should report the error value as well // #define CHECK_NOERR(err) HX_ASSERT((err) == 0) -#define RETQUIRE_NOERR_RETURN(err,returned) \ - do { if ((err) != 0) { RETQUIRE_REPORT("Toolbox error, Aborting...",__FILE__,__LINE__); return (returned); } } while (0) -#define RETQUIRE_NOERR(err,target) \ - do { if ((err) != 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) -#define RETQUIRE_NOERR_ACTION(err,target,action) \ - do { if ((err) != 0) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) -#define RETQUIRE_NOERR_TQUIET(err,target) \ +#define REQUIRE_NOERR_RETURN(err,returned) \ + do { if ((err) != 0) { REQUIRE_REPORT("Toolbox error, Aborting...",__FILE__,__LINE__); return (returned); } } while (0) +#define REQUIRE_NOERR(err,target) \ + do { if ((err) != 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) +#define REQUIRE_NOERR_ACTION(err,target,action) \ + do { if ((err) != 0) { REQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) +#define REQUIRE_NOERR_QUIET(err,target) \ do { if ((err) != 0) goto target; } while (0) -#define RETQUIRE_NOERR_ACTION_TQUIET(err,target,action) \ +#define REQUIRE_NOERR_ACTION_QUIET(err,target,action) \ do { if ((err) != 0) {{action;} goto target;} } while (0) // -// RETQUIRE_NONNULL reports the error if the ptr value is null +// REQUIRE_NONNULL reports the error if the ptr value is null // Ideally, this should report the error value as well // #define CHECK_NONNULL(ptr) HX_ASSERT((ptr) != 0L) #define CHECK_NULL(ptr) HX_ASSERT((ptr) == 0L) -#define RETQUIRE_NONNULL_VOID_RETURN(ptr) \ - do { if ((ptr) == 0L) { RETQUIRE_REPORT(#ptr" is nil, Aborting...",__FILE__,__LINE__); return; } } while (0) -#define RETQUIRE_NONNULL_RETURN(ptr,returned) \ - do { if ((ptr) == 0L) { RETQUIRE_REPORT(#ptr" is nil, Aborting...",__FILE__,__LINE__); return (returned); } } while (0) -#define RETQUIRE_NONNULL(ptr,target) \ - do { if ((ptr) == 0L) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) -#define RETQUIRE_NONNULL_ACTION(ptr,target,action) \ - do { if ((ptr) == 0L) { RETQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) -#define RETQUIRE_NONNULL_TQUIET(ptr,target) \ +#define REQUIRE_NONNULL_VOID_RETURN(ptr) \ + do { if ((ptr) == 0L) { REQUIRE_REPORT(#ptr" is nil, Aborting...",__FILE__,__LINE__); return; } } while (0) +#define REQUIRE_NONNULL_RETURN(ptr,returned) \ + do { if ((ptr) == 0L) { REQUIRE_REPORT(#ptr" is nil, Aborting...",__FILE__,__LINE__); return (returned); } } while (0) +#define REQUIRE_NONNULL(ptr,target) \ + do { if ((ptr) == 0L) { REQUIRE_REPORT(#target,__FILE__,__LINE__); goto target; } } while (0) +#define REQUIRE_NONNULL_ACTION(ptr,target,action) \ + do { if ((ptr) == 0L) { REQUIRE_REPORT(#target,__FILE__,__LINE__); {{action;} goto target;} } } while (0) +#define REQUIRE_NONNULL_QUIET(ptr,target) \ do { if ((ptr) == 0L) goto target; } while (0) -#define RETQUIRE_NONNULL_ACTION_TQUIET(ptr,target,action) \ +#define REQUIRE_NONNULL_ACTION_QUIET(ptr,target,action) \ do { if ((ptr) == 0L) {{action;} goto target;} } while (0) // lower case versions make source code more readable @@ -690,38 +690,38 @@ class LogInfo #define check(stmt) CHECK(stmt) -#define require_void_return(stmt) RETQUIRE_VOID_RETURN(stmt) -#define require_return_void(stmt) RETQUIRE_VOID_RETURN(stmt) -#define require_return(stmt,returned) RETQUIRE_RETURN(stmt,returned) -#define require(stmt,target) RETQUIRE(stmt,target) -#define require_action(stmt,target,action) RETQUIRE_ACTION(stmt,target,action) -#define require_quiet(stmt,target) RETQUIRE_TQUIET(stmt,target) -#define require_action_quiet(stmt,target,action) RETQUIRE_ACTION_TQUIET(stmt,target,action) +#define require_void_return(stmt) REQUIRE_VOID_RETURN(stmt) +#define require_return_void(stmt) REQUIRE_VOID_RETURN(stmt) +#define require_return(stmt,returned) REQUIRE_RETURN(stmt,returned) +#define require(stmt,target) REQUIRE(stmt,target) +#define require_action(stmt,target,action) REQUIRE_ACTION(stmt,target,action) +#define require_quiet(stmt,target) REQUIRE_QUIET(stmt,target) +#define require_action_quiet(stmt,target,action) REQUIRE_ACTION_QUIET(stmt,target,action) #define check_success(stat) CHECK_SUCCESS(stat) -#define require_success(stat,target) RETQUIRE_SUCCESS(stat,target) -#define require_success_action(stat,target,action) RETQUIRE_SUCCESS_ACTION(stat,target,action) -#define require_success_quiet(stat,target) RETQUIRE_SUCCESS_TQUIET(stat,target) -#define require_success_action_quiet(stat,target,action) RETQUIRE_SUCCESS_ACTION_TQUIET(stat,target,action) +#define require_success(stat,target) REQUIRE_SUCCESS(stat,target) +#define require_success_action(stat,target,action) REQUIRE_SUCCESS_ACTION(stat,target,action) +#define require_success_quiet(stat,target) REQUIRE_SUCCESS_QUIET(stat,target) +#define require_success_action_quiet(stat,target,action) REQUIRE_SUCCESS_ACTION_QUIET(stat,target,action) #define check_noerr(err) CHECK_NOERR(err) -#define require_noerr_return(err,returned) RETQUIRE_NOERR_RETURN(err,returned) -#define require_noerr(err,target) RETQUIRE_NOERR(err,target) -#define require_noerr_action(err,target,action) RETQUIRE_NOERR_ACTION(err,target,action) -#define require_noerr_quiet(err,target) RETQUIRE_NOERR_TQUIET(err,target) -#define require_noerr_action_quiet(err,target,action) RETQUIRE_NOERR_ACTION_TQUIET(err,target,action) +#define require_noerr_return(err,returned) REQUIRE_NOERR_RETURN(err,returned) +#define require_noerr(err,target) REQUIRE_NOERR(err,target) +#define require_noerr_action(err,target,action) REQUIRE_NOERR_ACTION(err,target,action) +#define require_noerr_quiet(err,target) REQUIRE_NOERR_QUIET(err,target) +#define require_noerr_action_quiet(err,target,action) REQUIRE_NOERR_ACTION_QUIET(err,target,action) #define check_nonnull(ptr) CHECK_NONNULL(ptr) #define check_null(ptr) CHECK_NULL(ptr) -#define require_nonnull_void_return(ptr) RETQUIRE_NONNULL_VOID_RETURN(ptr) -#define require_nonnull_return(ptr,returned) RETQUIRE_NONNULL_RETURN(ptr,returned) -#define require_nonnull(ptr,target) RETQUIRE_NONNULL(ptr,target) -#define require_nonnull_action(ptr,target,action) RETQUIRE_NONNULL_ACTION(ptr,target,action) -#define require_nonnull_quiet(ptr,target) RETQUIRE_NONNULL_TQUIET(ptr,target) -#define require_nonnull_action_quiet(ptr,target,action) RETQUIRE_NONNULL_ACTION_TQUIET(ptr,target,action) +#define require_nonnull_void_return(ptr) REQUIRE_NONNULL_VOID_RETURN(ptr) +#define require_nonnull_return(ptr,returned) REQUIRE_NONNULL_RETURN(ptr,returned) +#define require_nonnull(ptr,target) REQUIRE_NONNULL(ptr,target) +#define require_nonnull_action(ptr,target,action) REQUIRE_NONNULL_ACTION(ptr,target,action) +#define require_nonnull_quiet(ptr,target) REQUIRE_NONNULL_QUIET(ptr,target) +#define require_nonnull_action_quiet(ptr,target,action) REQUIRE_NONNULL_ACTION_QUIET(ptr,target,action) #endif // !_HXASSERT_H_ diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h index 40fa0094..28136ffe 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h @@ -87,7 +87,7 @@ typedef _INTERFACE IHXPostDataHandler IHXPostDataHandler; * Purpose: * Flags for file response Advise method */ -#define HX_FILERESPONSEADVISE_RETQUIREFULLREAD 1 +#define HX_FILERESPONSEADVISE_REQUIREFULLREAD 1 #if defined(_UNIX) || defined(_WINDOWS) diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h index e9ce4dcc..d0cfd085 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h @@ -319,7 +319,7 @@ typedef LONG32 HX_RESULT; #define HXR_RMT_INVALID_ENDTIME MAKE_HX_RESULT(1,SS_RMT,2) // 800403c2 #define HXR_RMT_MISSING_INPUT_FILE MAKE_HX_RESULT(1,SS_RMT,3) // 800403c3 #define HXR_RMT_MISSING_OUTPUT_FILE MAKE_HX_RESULT(1,SS_RMT,4) // 800403c4 -#define HXR_RMT_INPUT_ETQUALS_OUTPUT_FILE MAKE_HX_RESULT(1,SS_RMT,5) // 800403c5 +#define HXR_RMT_INPUT_EQUALS_OUTPUT_FILE MAKE_HX_RESULT(1,SS_RMT,5) // 800403c5 #define HXR_RMT_UNSUPPORTED_AUDIO_VERSION MAKE_HX_RESULT(1,SS_RMT,6) // 800403c6 #define HXR_RMT_DIFFERENT_AUDIO MAKE_HX_RESULT(1,SS_RMT,7) // 800403c7 #define HXR_RMT_DIFFERENT_VIDEO MAKE_HX_RESULT(1,SS_RMT,8) // 800403c8 @@ -463,11 +463,11 @@ typedef LONG32 HX_RESULT; #define HXR_SE_MAX_FAILED_AUTHENTICATIONS MAKE_HX_RESULT(1, SS_SAM, 33) // 80041921 #define HXR_SE_AUTH_ACCESS_DENIED MAKE_HX_RESULT(1, SS_SAM, 34) // 80041922 #define HXR_SE_AUTH_UUID_READ_ONLY MAKE_HX_RESULT(1, SS_SAM, 35) // 80041923 -#define HXR_SE_AUTH_UUID_NOT_UNITQUE MAKE_HX_RESULT(1, SS_SAM, 36) // 80041924 +#define HXR_SE_AUTH_UUID_NOT_UNIQUE MAKE_HX_RESULT(1, SS_SAM, 36) // 80041924 #define HXR_SE_AUTH_NO_SUCH_USER MAKE_HX_RESULT(1, SS_SAM, 37) // 80041925 #define HXR_SE_AUTH_REGISTRATION_SUCCEEDED MAKE_HX_RESULT(1, SS_SAM, 38) // 80041926 #define HXR_SE_AUTH_REGISTRATION_FAILED MAKE_HX_RESULT(1, SS_SAM, 39) // 80041927 -#define HXR_SE_AUTH_REGISTRATION_GUID_RETQUIRED MAKE_HX_RESULT(1, SS_SAM, 40) // 80041928 +#define HXR_SE_AUTH_REGISTRATION_GUID_REQUIRED MAKE_HX_RESULT(1, SS_SAM, 40) // 80041928 #define HXR_SE_AUTH_UNREGISTERED_PLAYER MAKE_HX_RESULT(1, SS_SAM, 41) // 80041929 #define HXR_SE_AUTH_TIME_EXPIRED MAKE_HX_RESULT(1, SS_SAM, 42) // 8004192a #define HXR_SE_AUTH_NO_TIME_LEFT MAKE_HX_RESULT(1, SS_SAM, 43) // 8004192b diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h index e9f95e5c..42cb8bb1 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h @@ -113,7 +113,7 @@ typedef TBool BOOL; #endif -#define ARE_BOOLS_ETQUAL(a,b) (((a) && (b)) || (!(a) && !(b))) +#define ARE_BOOLS_EQUAL(a,b) (((a) && (b)) || (!(a) && !(b))) #ifndef HX_BITFIELD typedef unsigned char HX_BITFIELD; diff --git a/amarok/src/engine/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp index f515f5ec..91ccffcc 100644 --- a/amarok/src/engine/mas/masengine.cpp +++ b/amarok/src/engine/mas/masengine.cpp @@ -44,8 +44,8 @@ what : interface to the Media Application Server (MAS) //#define DB_CUTOFF -40.0 #define BUFFER_TIME_MS 300 #define POSTOUT_TIME_MS 100 -//#define TQUERY_MIX_VOLUME 0 -//#define TQUERY_MIX_EPSILON 5 +//#define QUERY_MIX_VOLUME 0 +//#define QUERY_MIX_EPSILON 5 diff --git a/amarok/src/equalizergraph.h b/amarok/src/equalizergraph.h index fbbf1e48..3a156f98 100644 --- a/amarok/src/equalizergraph.h +++ b/amarok/src/equalizergraph.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef AMAROK_ETQUALIZERGRAPH_H -#define AMAROK_ETQUALIZERGRAPH_H +#ifndef AMAROK_EQUALIZERGRAPH_H +#define AMAROK_EQUALIZERGRAPH_H #include <tqwidget.h> //baseclass @@ -47,4 +47,4 @@ class EqualizerGraph : public TQWidget }; -#endif /*AMAROK_ETQUALIZERGRAPH_H*/ +#endif /*AMAROK_EQUALIZERGRAPH_H*/ diff --git a/amarok/src/equalizerpresetmanager.h b/amarok/src/equalizerpresetmanager.h index 4822f11d..776c62a1 100644 --- a/amarok/src/equalizerpresetmanager.h +++ b/amarok/src/equalizerpresetmanager.h @@ -17,8 +17,8 @@ * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef AMAROK_ETQUALIZERPRESETMANAGER_H -#define AMAROK_ETQUALIZERPRESETMANAGER_H +#ifndef AMAROK_EQUALIZERPRESETMANAGER_H +#define AMAROK_EQUALIZERPRESETMANAGER_H #include "equalizersetup.h" @@ -57,4 +57,4 @@ class EqualizerPresetManager : public KDialogBase }; -#endif /* AMAROK_ETQUALIZERPRESETMANAGER_H */ +#endif /* AMAROK_EQUALIZERPRESETMANAGER_H */ diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp index f20b67ae..4e83421e 100644 --- a/amarok/src/equalizersetup.cpp +++ b/amarok/src/equalizersetup.cpp @@ -213,7 +213,7 @@ EqualizerSetup::setPreset( TQString name ) } ///////////////////////////////////////////////////////////////////////////////////// -// ETQUALIZER PRESETS +// EQUALIZER PRESETS ///////////////////////////////////////////////////////////////////////////////////// TQString diff --git a/amarok/src/equalizersetup.h b/amarok/src/equalizersetup.h index fa6c7ae2..25602c32 100644 --- a/amarok/src/equalizersetup.h +++ b/amarok/src/equalizersetup.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef AMAROK_ETQUALIZERSETUP_H -#define AMAROK_ETQUALIZERSETUP_H +#ifndef AMAROK_EQUALIZERSETUP_H +#define AMAROK_EQUALIZERSETUP_H #include <tqptrlist.h> //stack alloc #include <kdialogbase.h> @@ -75,4 +75,4 @@ class EqualizerSetup : public KDialogBase TQMap< TQString, TQValueList<int> > m_presets; }; -#endif /*AMAROK_ETQUALIZERSETUP_H*/ +#endif /*AMAROK_EQUALIZERSETUP_H*/ diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h index 6574d827..e071bb0e 100644 --- a/amarok/src/konquisidebar/universalamarok.h +++ b/amarok/src/konquisidebar/universalamarok.h @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef KONTQUERORSIDEBAR_H -#define KONTQUERORSIDEBAR_H +#ifndef KONQUERORSIDEBAR_H +#define KONQUERORSIDEBAR_H #include <khtml_part.h> #include <konqsidebarplugin.h> diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp index b9774718..da56aba1 100644 --- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp +++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp @@ -56,7 +56,7 @@ MagnatuneArtistInfoBox::displayAlbumInfo( MagnatuneAlbum *album ) const MagnatuneArtist artist = MagnatuneDatabaseHandler::instance()->getArtistById( album->getArtistId() ); const TQString artistName = artist.getName(); - TQString infoHtml = "<HTML><HEAD><META HTTP-ETQUIV=\"Content-Type\" " + TQString infoHtml = "<HTML><HEAD><META HTTP-EQUIV=\"Content-Type\" " "CONTENT=\"text/html; charset=iso-8859-1\"></HEAD><BODY>"; infoHtml += "<div align=\"center\"><strong>"; @@ -133,7 +133,7 @@ MagnatuneArtistInfoBox::extractArtistInfo( TQString artistPage ) } - TQString infoHtml = "<HTML><HEAD><META HTTP-ETQUIV=\"Content-Type\" " + TQString infoHtml = "<HTML><HEAD><META HTTP-EQUIV=\"Content-Type\" " "CONTENT=\"text/html; charset=iso-8859-1\"></HEAD><BODY>"; infoHtml += trimmedHtml; diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp index df78bf80..9971ad8f 100644 --- a/amarok/src/mediadevice/daap/daapclient.cpp +++ b/amarok/src/mediadevice/daap/daapclient.cpp @@ -227,7 +227,7 @@ DaapClient::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) { DEBUG_BLOCK - enum Actions { APPEND, LOAD, TQUEUE, INFO, CONNECT, REMOVE, DOWNLOAD }; + enum Actions { APPEND, LOAD, QUEUE, INFO, CONNECT, REMOVE, DOWNLOAD }; MediaItem *item = dynamic_cast<MediaItem *>(qitem); ServerItem* sitem = dynamic_cast<ServerItem *>(qitem); @@ -258,7 +258,7 @@ DaapClient::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) urls = m_view->nodeBuildDragList( 0 ); menu.insertItem( SmallIconSet( Amarok::icon( "playlist" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), TQUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), QUEUE ); menu.insertSeparator(); menu.insertItem( SmallIconSet( Amarok::icon( "playlist" ) ), i18n( "&Copy Files to Collection..." ), DOWNLOAD ); @@ -286,7 +286,7 @@ DaapClient::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) case APPEND: Playlist::instance()->insertMedia( urls, Playlist::Append ); break; - case TQUEUE: + case QUEUE: Playlist::instance()->insertMedia( urls, Playlist::Queue ); break; case INFO: diff --git a/amarok/src/mediadevice/daap/daapserver.cpp b/amarok/src/mediadevice/daap/daapserver.cpp index 1c987c8e..de52a2ad 100644 --- a/amarok/src/mediadevice/daap/daapserver.cpp +++ b/amarok/src/mediadevice/daap/daapserver.cpp @@ -52,7 +52,7 @@ DaapServer::~DaapServer() void DaapServer::readSql() { - static const TQCString sqlPrefix = "SQL TQUERY: "; + static const TQCString sqlPrefix = "SQL QUERY: "; static const TQCString serverStartPrefix = "SERVER STARTING: "; TQString line; while( m_server->readln( line ) != -1 ) diff --git a/amarok/src/mediadevice/daap/mongrel/http11/ext_help.h b/amarok/src/mediadevice/daap/mongrel/http11/ext_help.h index 387a3049..8b4d754c 100644 --- a/amarok/src/mediadevice/daap/mongrel/http11/ext_help.h +++ b/amarok/src/mediadevice/daap/mongrel/http11/ext_help.h @@ -3,7 +3,7 @@ #define RAISE_NOT_NULL(T) if(T == NULL) rb_raise(rb_eArgError, "NULL found for " # T " when shouldn't be."); #define DATA_GET(from,type,name) Data_Get_Struct(from,type,name); RAISE_NOT_NULL(name); -#define RETQUIRE_TYPE(V, T) if(TYPE(V) != T) rb_raise(rb_eTypeError, "Wrong argument type for " # V " required " # T); +#define REQUIRE_TYPE(V, T) if(TYPE(V) != T) rb_raise(rb_eTypeError, "Wrong argument type for " # V " required " # T); #ifdef DEBUG #define TRACE() fprintf(stderr, "> %s:%d:%s\n", __FILE__, __LINE__, __FUNCTION__) diff --git a/amarok/src/mediadevice/daap/mongrel/http11/http11.c b/amarok/src/mediadevice/daap/mongrel/http11/http11.c index ad1d5126..a3ad1d5f 100644 --- a/amarok/src/mediadevice/daap/mongrel/http11/http11.c +++ b/amarok/src/mediadevice/daap/mongrel/http11/http11.c @@ -56,7 +56,7 @@ DEF_MAX_LENGTH(FIELD_NAME, 256); DEF_MAX_LENGTH(FIELD_VALUE, 80 * 1024); DEF_MAX_LENGTH(REQUEST_URI, 1024 * 12); DEF_MAX_LENGTH(REQUEST_PATH, 1024); -DEF_MAX_LENGTH(TQUERY_STRING, (1024 * 10)); +DEF_MAX_LENGTH(QUERY_STRING, (1024 * 10)); DEF_MAX_LENGTH(HEADER, (1024 * (80 + 32))); @@ -121,7 +121,7 @@ void query_string(void *data, const char *at, size_t length) VALUE req = (VALUE)data; VALUE val = Qnil; - VALIDATE_MAX_LENGTH(length, TQUERY_STRING); + VALIDATE_MAX_LENGTH(length, QUERY_STRING); val = rb_str_new(at, length); rb_hash_aset(req, global_query_string, val); diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp index 04c7f018..b0745c00 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.cpp +++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp @@ -929,7 +929,7 @@ GenericMediaDevice::foundMountPoint( const TQString & mountPoint, unsigned long void GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) { - enum Actions { APPEND, LOAD, TQUEUE, + enum Actions { APPEND, LOAD, QUEUE, DOWNLOAD, BURN_DATACD, BURN_AUDIOCD, DIRECTORY, RENAME, @@ -941,7 +941,7 @@ GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int KPopupMenu menu( m_view ); menu.insertItem( SmallIconSet( Amarok::icon( "playlist" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "1downarrow" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), TQUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), QUEUE ); menu.insertSeparator(); menu.insertItem( SmallIconSet( Amarok::icon( "collection" ) ), i18n( "&Copy Files to Collection..." ), DOWNLOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "cdrom_unmount" ) ), i18n( "Burn to CD as Data" ), BURN_DATACD ); @@ -966,7 +966,7 @@ GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int case APPEND: Playlist::instance()->insertMedia( getSelectedItems(), Playlist::Append ); break; - case TQUEUE: + case QUEUE: Playlist::instance()->insertMedia( getSelectedItems(), Playlist::Queue ); break; case DOWNLOAD: diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index b68e819c..d5d63480 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp @@ -2233,7 +2233,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) KURL::List urls = m_view->nodeBuildDragList( 0 ); KPopupMenu menu( m_view ); - enum Actions { CREATE_PLAYLIST, APPEND, LOAD, TQUEUE, + enum Actions { CREATE_PLAYLIST, APPEND, LOAD, QUEUE, COPY_TO_COLLECTION, BURN_ARTIST, BURN_ALBUM, BURN_DATACD, BURN_AUDIOCD, RENAME, SUBSCRIBE, @@ -2253,7 +2253,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) { menu.insertItem( SmallIconSet( Amarok::icon( "playlist" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), TQUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), QUEUE ); } menu.insertSeparator(); @@ -2372,7 +2372,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) case APPEND: Playlist::instance()->insertMedia( urls, Playlist::Append ); break; - case TQUEUE: + case QUEUE: Playlist::instance()->insertMedia( urls, Playlist::Queue ); break; case COPY_TO_COLLECTION: diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index 4455fdca..310f14cf 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -875,11 +875,11 @@ void PlaylistEntry::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Id { LOAD, APPEND, TQUEUE, RENAME, DELETE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC }; + enum Id { LOAD, APPEND, QUEUE, RENAME, DELETE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), TQUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), QUEUE ); if( MediaBrowser::isAvailable() ) { @@ -906,7 +906,7 @@ void PlaylistEntry::showContextMenu( const TQPoint &position ) case APPEND: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Append ); break; - case TQUEUE: + case QUEUE: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Queue ); break; case RENAME: @@ -1082,11 +1082,11 @@ void PlaylistTrackItem::slotDoubleClicked() void PlaylistTrackItem::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Actions { LOAD, APPEND, TQUEUE, BURN, REMOVE, INFO }; + enum Actions { LOAD, APPEND, QUEUE, BURN, REMOVE, INFO }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), TQUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), QUEUE ); menu.insertSeparator(); @@ -1105,7 +1105,7 @@ void PlaylistTrackItem::showContextMenu( const TQPoint &position ) case APPEND: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Append ); break; - case TQUEUE: + case QUEUE: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Queue ); break; case BURN: @@ -1291,11 +1291,11 @@ void StreamEntry::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Actions { LOAD, APPEND, TQUEUE, EDIT, REMOVE }; + enum Actions { LOAD, APPEND, QUEUE, EDIT, REMOVE }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), TQUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), QUEUE ); menu.insertSeparator(); // Forbid editing non removable items @@ -1316,7 +1316,7 @@ StreamEntry::showContextMenu( const TQPoint &position ) case APPEND: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Append ); break; - case TQUEUE: + case QUEUE: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Queue ); break; case EDIT: @@ -2299,11 +2299,11 @@ PodcastChannel::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Actions { LOAD, APPEND, TQUEUE, DELETE, RESCAN, LISTENED, NEW, CONFIG }; + enum Actions { LOAD, APPEND, QUEUE, DELETE, RESCAN, LISTENED, NEW, CONFIG }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), TQUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), QUEUE ); menu.insertSeparator(); menu.insertItem( SmallIconSet( Amarok::icon( "remove" ) ), i18n( "&Delete" ), DELETE ); menu.insertItem( SmallIconSet( Amarok::icon( "refresh" ) ), i18n( "&Check for Updates" ), RESCAN ); @@ -2323,7 +2323,7 @@ PodcastChannel::showContextMenu( const TQPoint &position ) PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Append ); break; - case TQUEUE: + case QUEUE: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Queue ); break; @@ -2826,10 +2826,10 @@ PodcastEpisode::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Actions { LOAD, APPEND, TQUEUE, GET, ASSOCIATE, DELETE, MEDIA_DEVICE, LISTENED, NEW, OPEN_WITH /* has to be last */ }; + enum Actions { LOAD, APPEND, QUEUE, GET, ASSOCIATE, DELETE, MEDIA_DEVICE, LISTENED, NEW, OPEN_WITH /* has to be last */ }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), TQUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), QUEUE ); int accuracy = 0; KMimeType::Ptr mimetype; @@ -2891,7 +2891,7 @@ PodcastEpisode::showContextMenu( const TQPoint &position ) PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Append ); break; - case TQUEUE: + case QUEUE: PlaylistBrowser::instance()->addSelectedToPlaylist( Playlist::Queue ); break; @@ -3394,11 +3394,11 @@ void SmartPlaylist::showContextMenu( const TQPoint &position ) { KPopupMenu menu( listView() ); - enum Actions { LOAD, ADD, TQUEUE, EDIT, REMOVE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC }; + enum Actions { LOAD, ADD, QUEUE, EDIT, REMOVE, MEDIADEVICE_COPY, MEDIADEVICE_SYNC }; menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "&Load" ), LOAD ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), ADD ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), TQUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Tracks" ), QUEUE ); if( MediaBrowser::isAvailable() ) { menu.insertSeparator(); @@ -3426,7 +3426,7 @@ void SmartPlaylist::showContextMenu( const TQPoint &position ) case ADD: Playlist::instance()->insertMediaSql( query(), Playlist::Append ); break; - case TQUEUE: + case QUEUE: Playlist::instance()->insertMediaSql( query(), Playlist::Queue ); break; case EDIT: diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp index bc5f9503..f551d04c 100644 --- a/amarok/src/playlistwindow.cpp +++ b/amarok/src/playlistwindow.cpp @@ -368,7 +368,7 @@ void PlaylistWindow::init() m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "covermanager" ) ), i18n("&Cover Manager"), Amarok::Menu::ID_SHOW_COVER_MANAGER ); actionCollection()->action("queue_manager")->plug( m_toolsMenu ); m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "visualizations" ) ), i18n("&Visualizations"), Amarok::Menu::ID_SHOW_VIS_SELECTOR ); - m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_ETQUALIZER ); + m_toolsMenu->insertItem( SmallIconSet( Amarok::icon( "equalizer") ), i18n("&Equalizer"), TQT_TQOBJECT(kapp), TQT_SLOT( slotConfigEqualizer() ), 0, Amarok::Menu::ID_CONFIGURE_EQUALIZER ); actionCollection()->action("script_manager")->plug( m_toolsMenu ); actionCollection()->action("statistics")->plug( m_toolsMenu ); m_toolsMenu->insertSeparator(); @@ -1093,7 +1093,7 @@ void PlaylistWindow::actionsMenuAboutToShow() //SLOT void PlaylistWindow::toolsMenuAboutToShow() //SLOT { - m_toolsMenu->setItemEnabled( Amarok::Menu::ID_CONFIGURE_ETQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) ); + m_toolsMenu->setItemEnabled( Amarok::Menu::ID_CONFIGURE_EQUALIZER, EngineController::hasEngineProperty( "HasEqualizer" ) ); m_toolsMenu->setItemEnabled( Amarok::Menu::ID_RESCAN_COLLECTION, !ThreadManager::instance()->isJobPending( "CollectionScanner" ) ); } diff --git a/amarok/src/queuemanager.h b/amarok/src/queuemanager.h index a0640ff1..06c51fc5 100644 --- a/amarok/src/queuemanager.h +++ b/amarok/src/queuemanager.h @@ -11,8 +11,8 @@ * * ***************************************************************************/ -#ifndef AMAROK_TQUEUEMANAGER_H -#define AMAROK_TQUEUEMANAGER_H +#ifndef AMAROK_QUEUEMANAGER_H +#define AMAROK_QUEUEMANAGER_H #include "playlistitem.h" @@ -105,4 +105,4 @@ class QueueManager : public KDialogBase static QueueManager *s_instance; }; -#endif /* AMAROK_TQUEUEMANAGER_H */ +#endif /* AMAROK_QUEUEMANAGER_H */ diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.h b/amarok/src/scripts/graphequalizer/equalizercanvasview.h index 34bd9117..50e0dec1 100644 --- a/amarok/src/scripts/graphequalizer/equalizercanvasview.h +++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.h @@ -4,8 +4,8 @@ */ -#ifndef _ETQUALIZERCANVASVIEW_H_ -#define _ETQUALIZERCANVASVIEW_H_ +#ifndef _EQUALIZERCANVASVIEW_H_ +#define _EQUALIZERCANVASVIEW_H_ #ifdef HAVE_CONFIG_H #include <config.h> @@ -81,4 +81,4 @@ private: EqualizerCanvasView* m_canvasView; }; -#endif // _ETQUALIZERCANVASVIEW_H_ +#endif // _EQUALIZERCANVASVIEW_H_ diff --git a/amarok/src/scripts/graphequalizer/equalizerdialog.h b/amarok/src/scripts/graphequalizer/equalizerdialog.h index fc195043..d804e41b 100644 --- a/amarok/src/scripts/graphequalizer/equalizerdialog.h +++ b/amarok/src/scripts/graphequalizer/equalizerdialog.h @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef ETQUALIZERDIALOG_H -#define ETQUALIZERDIALOG_H +#ifndef EQUALIZERDIALOG_H +#define EQUALIZERDIALOG_H #include <tqdialog.h> diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c index 2b1d3e04..5748a5f6 100644 --- a/amarok/src/sqlite/sqlite3.c +++ b/amarok/src/sqlite/sqlite3.c @@ -3121,7 +3121,7 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*); /************** Begin file parse.h *******************************************/ #define TK_SEMI 1 #define TK_EXPLAIN 2 -#define TK_TQUERY 3 +#define TK_QUERY 3 #define TK_PLAN 4 #define TK_BEGIN 5 #define TK_TRANSACTION 6 @@ -3212,7 +3212,7 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*); #define TK_DEFAULT 91 #define TK_NULL 92 #define TK_PRIMARY 93 -#define TK_UNITQUE 94 +#define TK_UNIQUE 94 #define TK_CHECK 95 #define TK_REFERENCES 96 #define TK_AUTOINCR 97 @@ -3314,16 +3314,16 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*); /* ** If the following macro is set to 1, then NULL values are considered ** distinct when determining whether or not two entries are the same -** in a UNITQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, +** in a UNIQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, ** OCELOT, and Firebird all work. The SQL92 spec explicitly says this ** is the way things are suppose to work. ** ** If the following macro is set to 0, the NULLs are indistinct for -** a UNITQUE index. In this mode, you can only have a single NULL entry -** for a column declared UNITQUE. This is the way Informix and SQL Server +** a UNIQUE index. In this mode, you can only have a single NULL entry +** for a column declared UNIQUE. This is the way Informix and SQL Server ** work. */ -#define NULL_DISTINCT_FOR_UNITQUE 1 +#define NULL_DISTINCT_FOR_UNIQUE 1 /* ** The "file format" number is an integer that is incremented whenever @@ -3952,7 +3952,7 @@ typedef struct PgHdr DbPage; /* ** Valid values for the second argument to sqlite3PagerLockingMode(). */ -#define PAGER_LOCKINGMODE_TQUERY -1 +#define PAGER_LOCKINGMODE_QUERY -1 #define PAGER_LOCKINGMODE_NORMAL 0 #define PAGER_LOCKINGMODE_EXCLUSIVE 1 @@ -5176,7 +5176,7 @@ struct FKey { ** occurs. IGNORE means that the particular row that caused the constraint ** error is not inserted or updated. Processing continues and no error ** is returned. REPLACE means that preexisting database rows that caused -** a UNITQUE constraint violation are removed so that the new insert or +** a UNIQUE constraint violation are removed so that the new insert or ** update can proceed. Processing continues and no error is reported. ** ** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys. @@ -5255,7 +5255,7 @@ struct Index { Table *pTable; /* The SQL table being indexed */ int tnum; /* Page containing root of this index in database file */ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ - u8 autoIndex; /* True if is automatically created (ex: by UNITQUE) */ + u8 autoIndex; /* True if is automatically created (ex: by UNIQUE) */ char *zColAff; /* String defining the affinity of each column */ Index *pNext; /* The next index associated with the same table */ Schema *pSchema; /* Schema containing this index */ @@ -22280,8 +22280,8 @@ SQLITE_PRIVATE void *sqlite3PagerGetExtra(DbPage *pPg){ /* ** Get/set the locking-mode for this pager. Parameter eMode must be one -** of PAGER_LOCKINGMODE_TQUERY, PAGER_LOCKINGMODE_NORMAL or -** PAGER_LOCKINGMODE_EXCLUSIVE. If the parameter is not _TQUERY, then +** of PAGER_LOCKINGMODE_QUERY, PAGER_LOCKINGMODE_NORMAL or +** PAGER_LOCKINGMODE_EXCLUSIVE. If the parameter is not _QUERY, then ** the locking-mode is set to the value specified. ** ** The returned value is either PAGER_LOCKINGMODE_NORMAL or @@ -22289,10 +22289,10 @@ SQLITE_PRIVATE void *sqlite3PagerGetExtra(DbPage *pPg){ ** locking-mode. */ SQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *pPager, int eMode){ - assert( eMode==PAGER_LOCKINGMODE_TQUERY + assert( eMode==PAGER_LOCKINGMODE_QUERY || eMode==PAGER_LOCKINGMODE_NORMAL || eMode==PAGER_LOCKINGMODE_EXCLUSIVE ); - assert( PAGER_LOCKINGMODE_TQUERY<0 ); + assert( PAGER_LOCKINGMODE_QUERY<0 ); assert( PAGER_LOCKINGMODE_NORMAL>=0 && PAGER_LOCKINGMODE_EXCLUSIVE>=0 ); if( eMode>=0 && !pPager->tempFile ){ pPager->exclusiveMode = eMode; @@ -22753,7 +22753,7 @@ struct BtCursor { ** because the table is empty or because BtreeCursorFirst() has not been ** called. ** -** CURSOR_RETQUIRESEEK: +** CURSOR_REQUIRESEEK: ** The table that this cursor was opened on still exists, but has been ** modified since the cursor was last used. The cursor position is saved ** in variables BtCursor.pKey and BtCursor.nKey. When a cursor is in @@ -22762,7 +22762,7 @@ struct BtCursor { */ #define CURSOR_INVALID 0 #define CURSOR_VALID 1 -#define CURSOR_RETQUIRESEEK 2 +#define CURSOR_REQUIRESEEK 2 /* ** The TRACE macro will print high-level status information about the @@ -23136,7 +23136,7 @@ static void invalidateAllOverflowCache(BtShared *pBt){ /* ** Save the current cursor position in the variables BtCursor.nKey -** and BtCursor.pKey. The cursor's state is set to CURSOR_RETQUIRESEEK. +** and BtCursor.pKey. The cursor's state is set to CURSOR_REQUIRESEEK. */ static int saveCursorPosition(BtCursor *pCur){ int rc; @@ -23170,7 +23170,7 @@ static int saveCursorPosition(BtCursor *pCur){ if( rc==SQLITE_OK ){ releasePage(pCur->pPage); pCur->pPage = 0; - pCur->eState = CURSOR_RETQUIRESEEK; + pCur->eState = CURSOR_REQUIRESEEK; } invalidateOverflowCache(pCur); @@ -23218,7 +23218,7 @@ static void clearCursorPosition(BtCursor *pCur){ */ SQLITE_PRIVATE int sqlite3BtreeRestoreOrClearCursorPosition(BtCursor *pCur){ int rc; - assert( pCur->eState==CURSOR_RETQUIRESEEK ); + assert( pCur->eState==CURSOR_REQUIRESEEK ); #ifndef SQLITE_OMIT_INCRBLOB if( pCur->isIncrblobHandle ){ return SQLITE_ABORT; @@ -23235,7 +23235,7 @@ SQLITE_PRIVATE int sqlite3BtreeRestoreOrClearCursorPosition(BtCursor *pCur){ } #define restoreOrClearCursorPosition(p) \ - (p->eState==CURSOR_RETQUIRESEEK ? \ + (p->eState==CURSOR_REQUIRESEEK ? \ sqlite3BtreeRestoreOrClearCursorPosition(p) : \ SQLITE_OK) @@ -25952,7 +25952,7 @@ static int moveToRoot(BtCursor *pCur){ int rc = SQLITE_OK; BtShared *pBt = pCur->pBtree->pBt; - if( pCur->eState==CURSOR_RETQUIRESEEK ){ + if( pCur->eState==CURSOR_REQUIRESEEK ){ clearCursorPosition(pCur); } pRoot = pCur->pPage; @@ -26214,7 +26214,7 @@ SQLITE_PRIVATE int sqlite3BtreeMoveto( ** the first entry. TRUE is also returned if the table is empty. */ SQLITE_PRIVATE int sqlite3BtreeEof(BtCursor *pCur){ - /* TODO: What if the cursor is in CURSOR_RETQUIRESEEK but all table entries + /* TODO: What if the cursor is in CURSOR_REQUIRESEEK but all table entries ** have been deleted? This API will need to change to return an error code ** as well as the boolean result value. */ @@ -27107,7 +27107,7 @@ static void assemblePage( /* Forward reference */ static int balance(MemPage*, int); -#ifndef SQLITE_OMIT_TQUICKBALANCE +#ifndef SQLITE_OMIT_QUICKBALANCE /* ** This version of balance() handles the common special case where ** a new entry is being inserted on the extreme right-end of the @@ -27196,7 +27196,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){ releasePage(pNew); return balance(pParent, 0); } -#endif /* SQLITE_OMIT_TQUICKBALANCE */ +#endif /* SQLITE_OMIT_QUICKBALANCE */ /* ** This routine redistributes Cells on pPage and up to NN*2 siblings @@ -27274,7 +27274,7 @@ static int balance_nonroot(MemPage *pPage){ } TRACE(("BALANCE: begin page %d child of %d\n", pPage->pgno, pParent->pgno)); -#ifndef SQLITE_OMIT_TQUICKBALANCE +#ifndef SQLITE_OMIT_QUICKBALANCE /* ** A special case: If a new entry has just been inserted into a ** table (that is, a btree with integer keys and all data at the leaves) @@ -28133,7 +28133,7 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur){ } /* Restore the current cursor position (a no-op if the cursor is not in - ** CURSOR_RETQUIRESEEK state) and save the positions of any other cursors + ** CURSOR_REQUIRESEEK state) and save the positions of any other cursors ** open on the same table. Then call sqlite3PagerWrite() on the page ** that the entry will be deleted from. */ @@ -28626,7 +28626,7 @@ SQLITE_PRIVATE int sqlite3BtreeUpdateMeta(Btree *p, int idx, u32 iMeta){ ** is currently pointing to. */ SQLITE_PRIVATE int sqlite3BtreeFlags(BtCursor *pCur){ - /* TODO: What about CURSOR_RETQUIRESEEK state? Probably need to call + /* TODO: What about CURSOR_REQUIRESEEK state? Probably need to call ** restoreOrClearCursorPosition() here. */ MemPage *pPage = pCur->pPage; @@ -29246,7 +29246,7 @@ SQLITE_PRIVATE int sqlite3BtreeLockTable(Btree *p, int iTab, u8 isWriteLock){ SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){ assert(pCsr->isIncrblobHandle); - if( pCsr->eState==CURSOR_RETQUIRESEEK ){ + if( pCsr->eState==CURSOR_REQUIRESEEK ){ return SQLITE_ABORT; } @@ -35357,7 +35357,7 @@ case OP_BitNot: { /* same as TK_BITNOT, no-push */ */ /* ** The magic Explain opcode are only inserted when explain==2 (which -** is to say when the EXPLAIN TQUERY PLAN syntax is used.) +** is to say when the EXPLAIN QUERY PLAN syntax is used.) ** This opcode records information from the optimizer. It is the ** the same as a no-op. This opcodesnever appears in a real VM program. */ @@ -36698,7 +36698,7 @@ case OP_IsUnique: { /* no-push */ } /* The final varint of the key is different from R. Push it onto - ** the stack. (The record number of an entry that violates a UNITQUE + ** the stack. (The record number of an entry that violates a UNIQUE ** constraint.) */ pTos++; @@ -39594,7 +39594,7 @@ SQLITE_PRIVATE ExprList *sqlite3ExprListDup(ExprList *p){ ** called with a NULL argument. */ #if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER) \ - || !defined(SQLITE_OMIT_SUBTQUERY) + || !defined(SQLITE_OMIT_SUBQUERY) SQLITE_PRIVATE SrcList *sqlite3SrcListDup(SrcList *p){ SrcList *pNew; int i; @@ -39909,7 +39909,7 @@ static int exprNodeIsConstant(void *pArg, Expr *pExpr){ case TK_DOT: case TK_AGG_FUNCTION: case TK_AGG_COLUMN: -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY case TK_SELECT: case TK_EXISTS: #endif @@ -40446,7 +40446,7 @@ static int nameResolverStep(void *pArg, Expr *pExpr){ */ return is_agg; } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY case TK_SELECT: case TK_EXISTS: #endif @@ -40555,7 +40555,7 @@ struct QueryCoder { ** The pExpr parameter describes the expression that contains the IN ** operator or subquery. */ -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY SQLITE_PRIVATE void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){ int testAddr = 0; /* One-time test address */ Vdbe *v = sqlite3GetVdbe(pParse); @@ -40702,7 +40702,7 @@ SQLITE_PRIVATE void sqlite3CodeSubselect(Parse *pParse, Expr *pExpr){ return; } -#endif /* SQLITE_OMIT_SUBTQUERY */ +#endif /* SQLITE_OMIT_SUBQUERY */ /* ** Generate an instruction that will put the integer describe by @@ -40997,7 +40997,7 @@ SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ stackChng = 1-nExpr; break; } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY case TK_EXISTS: case TK_SELECT: { if( pExpr->iColumn==0 ){ @@ -41888,7 +41888,7 @@ static void reloadTableSchema(Parse *pParse, Table *pTab, const char *zName){ #ifndef SQLITE_OMIT_TRIGGER /* Now, if the table is not stored in the temp database, reload any temp - ** triggers. Don't use IN(...) in case SQLITE_OMIT_SUBTQUERY is defined. + ** triggers. Don't use IN(...) in case SQLITE_OMIT_SUBQUERY is defined. */ if( (zWhere=whereTempTriggers(pParse, pTab))!=0 ){ sqlite3VdbeOp3(v, OP_ParseSchema, 1, 0, zWhere, P3_DYNAMIC); @@ -42099,7 +42099,7 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ pDflt = 0; } - /* Check that the new column is not specified as PRIMARY KEY or UNITQUE. + /* Check that the new column is not specified as PRIMARY KEY or UNIQUE. ** If there is a NOT NULL constraint, then the default value for the ** column must not be NULL. */ @@ -42108,7 +42108,7 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){ return; } if( pNew->pIndex ){ - sqlite3ErrorMsg(pParse, "Cannot add a UNITQUE column"); + sqlite3ErrorMsg(pParse, "Cannot add a UNIQUE column"); return; } if( pCol->notNull && !pDflt ){ @@ -44233,7 +44233,7 @@ SQLITE_PRIVATE void sqlite3StartTable( /* Begin generating the code that will insert the table record into ** the SQLITE_MASTER table. Note in particular that we must go ahead ** and allocate the record number for the table entry now. Before any - ** PRIMARY KEY or UNITQUE keywords are parsed. Those keywords will cause + ** PRIMARY KEY or UNIQUE keywords are parsed. Those keywords will cause ** indices to be created and the table record must come before the ** indices. Hence, the record number for the table must be allocated ** now. @@ -45636,7 +45636,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){ ** Create a new index for an SQL table. pName1.pName2 is the name of the index ** and pTblList is the name of the table that is to be indexed. Both will ** be NULL for a primary key or an index that is created to satisfy a -** UNITQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable +** UNIQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable ** as the table to be indexed. pParse->pNewTable is a table that is ** currently being constructed by a CREATE TABLE statement. ** @@ -45747,7 +45747,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex( ** index, then we will continue to process this index. ** ** If pName==0 it means that we are - ** dealing with a primary key or UNITQUE constraint. We have to invent our + ** dealing with a primary key or UNIQUE constraint. We have to invent our ** own name. */ if( pName ){ @@ -45902,12 +45902,12 @@ SQLITE_PRIVATE void sqlite3CreateIndex( if( pTab==pParse->pNewTable ){ /* This routine has been called to create an automatic index as a - ** result of a PRIMARY KEY or UNITQUE clause on a column definition, or - ** a PRIMARY KEY or UNITQUE clause following the column definitions. + ** result of a PRIMARY KEY or UNIQUE clause on a column definition, or + ** a PRIMARY KEY or UNIQUE clause following the column definitions. ** i.e. one of: ** ** CREATE TABLE t(x PRIMARY KEY, y); - ** CREATE TABLE t(x, y, UNITQUE(x, y)); + ** CREATE TABLE t(x, y, UNIQUE(x, y)); ** ** Either way, check to see if the table already has such an index. If ** so, don't bother creating this one. This only applies to @@ -45979,7 +45979,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex( ** we don't want to recreate it. ** ** If pTblName==0 it means this index is generated as a primary key - ** or UNITQUE constraint of a CREATE TABLE statement. Since the table + ** or UNIQUE constraint of a CREATE TABLE statement. Since the table ** has just been created, it contains no data and the index initialization ** step can be skipped. */ @@ -46004,11 +46004,11 @@ SQLITE_PRIVATE void sqlite3CreateIndex( if( pStart && pEnd ){ /* A named index with an explicit CREATE INDEX statement */ zStmt = sqlite3MPrintf("CREATE%s INDEX %.*s", - onError==OE_None ? "" : " UNITQUE", + onError==OE_None ? "" : " UNIQUE", pEnd->z - pName->z + 1, pName->z); }else{ - /* An automatic index created by a PRIMARY KEY or UNITQUE constraint */ + /* An automatic index created by a PRIMARY KEY or UNIQUE constraint */ /* zStmt = sqlite3MPrintf(""); */ zStmt = 0; } @@ -46146,7 +46146,7 @@ SQLITE_PRIVATE void sqlite3DropIndex(Parse *pParse, SrcList *pName, int ifExists goto exit_drop_index; } if( pIndex->autoIndex ){ - sqlite3ErrorMsg(pParse, "index associated with UNITQUE " + sqlite3ErrorMsg(pParse, "index associated with UNIQUE " "or PRIMARY KEY constraint cannot be dropped", 0); goto exit_drop_index; } @@ -48522,7 +48522,7 @@ static const char hexdigits[] = { ** change. This function may disappear. Do not write code that depends ** on this function. ** -** Implementation of the TQUOTE() function. This function takes a single +** Implementation of the QUOTE() function. This function takes a single ** argument. If the argument is numeric, the return value is the same as ** the argument. If the argument is NULL, the return value is the string ** "NULL". Otherwise, the argument is enclosed in single quotes with @@ -50269,7 +50269,7 @@ insert_cleanup: ** aIdxUsed!=0 and aIdxUsed[i]!=0. ** ** This routine also generates code to check constraints. NOT NULL, -** CHECK, and UNITQUE constraints are all checked. If a constraint fails, +** CHECK, and UNIQUE constraints are all checked. If a constraint fails, ** then the appropriate action is performed. There are five possible ** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE. ** @@ -50297,7 +50297,7 @@ insert_cleanup: ** value for that column. If the default value ** is NULL, the action is the same as ABORT. ** -** UNITQUE REPLACE The other row that conflicts with the row +** UNIQUE REPLACE The other row that conflicts with the row ** being inserted is removed. ** ** CHECK REPLACE Illegal. The results in an exception. @@ -50467,7 +50467,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( } } - /* Test all UNITQUE constraints by creating entries for each UNITQUE + /* Test all UNIQUE constraints by creating entries for each UNIQUE ** index and making sure that duplicate entries do not already exist. ** Add the new records to the indices as we go. */ @@ -50491,7 +50491,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( /* Find out what action to take in case there is an indexing conflict */ onError = pIdx->onError; - if( onError==OE_None ) continue; /* pIdx is not a UNITQUE index */ + if( onError==OE_None ) continue; /* pIdx is not a UNIQUE index */ if( overrideError!=OE_Default ){ onError = overrideError; }else if( onError==OE_Default ){ @@ -50556,7 +50556,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks( break; } } -#if NULL_DISTINCT_FOR_UNITQUE +#if NULL_DISTINCT_FOR_UNIQUE sqlite3VdbeJumpHere(v, jumpInst1); #endif sqlite3VdbeJumpHere(v, jumpInst2); @@ -50772,7 +50772,7 @@ static int xferOptimization( Vdbe *v; /* The VDBE we are building */ KeyInfo *pKey; /* Key information for an index */ int counterMem; /* Memory register used by AUTOINC */ - int destHasUniqueIdx = 0; /* True if pDest has a UNITQUE index */ + int destHasUniqueIdx = 0; /* True if pDest has a UNIQUE index */ if( pSelect==0 ){ return 0; /* Must be of the form INSERT INTO ... SELECT ... */ @@ -50908,7 +50908,7 @@ static int xferOptimization( ** we have to disallow the transfer optimization because the ** the rowids might change which will mess up indexing. ** - ** Or if the destination has a UNITQUE index and is not empty, + ** Or if the destination has a UNIQUE index and is not empty, ** we also disallow the transfer optimization because we cannot ** insure that all entries in the union of DEST and SRC will be ** unique. @@ -51919,7 +51919,7 @@ static int getLockingMode(const char *z){ if( 0==sqlite3StrICmp(z, "exclusive") ) return PAGER_LOCKINGMODE_EXCLUSIVE; if( 0==sqlite3StrICmp(z, "normal") ) return PAGER_LOCKINGMODE_NORMAL; } - return PAGER_LOCKINGMODE_TQUERY; + return PAGER_LOCKINGMODE_QUERY; } #ifndef SQLITE_OMIT_AUTOVACUUM @@ -52224,7 +52224,7 @@ SQLITE_PRIVATE void sqlite3Pragma( const char *zRet = "normal"; int eMode = getLockingMode(zRight); - if( pId2->n==0 && eMode==PAGER_LOCKINGMODE_TQUERY ){ + if( pId2->n==0 && eMode==PAGER_LOCKINGMODE_QUERY ){ /* Simple "PRAGMA locking_mode;" statement. This is a query for ** the current default locking mode (which may be different to ** the locking-mode of the main database). @@ -53117,7 +53117,7 @@ SQLITE_PRIVATE int sqlite3InitCallback(void *pInit, int argc, char **argv, char } }else{ /* If the SQL column is blank it means this is an index that - ** was created to be the PRIMARY KEY or to fulfill a UNITQUE + ** was created to be the PRIMARY KEY or to fulfill a UNIQUE ** constraint for a CREATE TABLE. The index should have already ** been created when we processed the CREATE TABLE. All we have ** to do here is record the root page number for that index. @@ -54301,7 +54301,7 @@ static int selectInnerLoop( break; } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY /* If we are creating a set for an "expr IN (SELECT ...)" construct, ** then there should be a single item on the stack. Write this ** item into the set table with bogus data. @@ -54352,7 +54352,7 @@ static int selectInnerLoop( } break; } -#endif /* #ifndef SQLITE_OMIT_SUBTQUERY */ +#endif /* #ifndef SQLITE_OMIT_SUBQUERY */ /* Send the data to the callback function or to a subroutine. In the ** case of a subroutine, the subroutine itself is responsible for @@ -54477,7 +54477,7 @@ static void generateSortTail( sqlite3VdbeAddOp(v, OP_Insert, iParm, OPFLAG_APPEND); break; } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY case SRT_Set: { assert( nColumn==1 ); sqlite3VdbeAddOp(v, OP_NotNull, -1, sqlite3VdbeCurrentAddr(v)+3); @@ -54638,7 +54638,7 @@ static const char *columnType( } break; } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY case TK_SELECT: { /* The expression is a sub-select. Return the declaration type and ** origin info for the single column in the result set of the SELECT @@ -54943,7 +54943,7 @@ static int prepSelectStmt(Parse *pParse, Select *p){ return 0; } if( pFrom->zName==0 ){ -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY /* A sub-query in the FROM clause of a SELECT */ assert( pFrom->pSelect!=0 ); if( pFrom->zAlias==0 ){ @@ -56680,7 +56680,7 @@ SQLITE_PRIVATE int sqlite3Select( /* If writing to memory or generating a set ** only a single column may be output. */ -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY if( checkForMultiColumnSelectError(pParse, eDest, pEList->nExpr) ){ goto select_end; } @@ -56699,7 +56699,7 @@ SQLITE_PRIVATE int sqlite3Select( /* Generate code for all sub-queries in the FROM clause */ -#if !defined(SQLITE_OMIT_SUBTQUERY) || !defined(SQLITE_OMIT_VIEW) +#if !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW) for(i=0; i<pTabList->nSrc; i++){ const char *zSavedAuthContext = 0; int needRestoreContext; @@ -57097,7 +57097,7 @@ SQLITE_PRIVATE int sqlite3Select( generateSortTail(pParse, p, v, pEList->nExpr, eDest, iParm); } -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY /* If this was a subquery, we have now converted the subquery into a ** temporary table. So set the SrcList_item.isPopulated flag to prevent ** this subquery from being evaluated again and to force the use of @@ -59035,8 +59035,8 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){ " FROM sqlite_master WHERE sql LIKE 'CREATE INDEX %' "); if( rc!=SQLITE_OK ) goto end_of_vacuum; rc = execExecSql(db, - "SELECT 'CREATE UNITQUE INDEX vacuum_db.' || substr(sql,21,100000000) " - " FROM sqlite_master WHERE sql LIKE 'CREATE UNITQUE INDEX %'"); + "SELECT 'CREATE UNIQUE INDEX vacuum_db.' || substr(sql,21,100000000) " + " FROM sqlite_master WHERE sql LIKE 'CREATE UNIQUE INDEX %'"); if( rc!=SQLITE_OK ) goto end_of_vacuum; /* Loop through the tables in the main database. For each, do @@ -60114,7 +60114,7 @@ struct ExprMaskSet { #define WHERE_IDX_ONLY 0x080000 /* Use index only - omit table */ #define WHERE_ORDERBY 0x100000 /* Output will appear in correct order */ #define WHERE_REVERSE 0x200000 /* Scan in reverse order */ -#define WHERE_UNITQUE 0x400000 /* Selects no more than one row */ +#define WHERE_UNIQUE 0x400000 /* Selects no more than one row */ #define WHERE_VIRTUALTABLE 0x800000 /* Use virtual-table processing */ /* @@ -60529,7 +60529,7 @@ static void transferJoinMarkings(Expr *pDerived, Expr *pBase){ pDerived->iRightJoinTable = pBase->iRightJoinTable; } -#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBTQUERY) +#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY) /* ** Return TRUE if the given term of an OR clause can be converted ** into an IN clause. The iCursor and iColumn define the left-hand @@ -60614,7 +60614,7 @@ static int orTermHasOkDuplicate(WhereClause *pOr, WhereTerm *pOrTerm){ ** which the original did not qualify. Either way we are done for. */ return 0; } -#endif /* !SQLITE_OMIT_OR_OPTIMIZATION && !SQLITE_OMIT_SUBTQUERY */ +#endif /* !SQLITE_OMIT_OR_OPTIMIZATION && !SQLITE_OMIT_SUBQUERY */ /* ** The input to this routine is an WhereTerm structure with only the @@ -60725,7 +60725,7 @@ static void exprAnalyze( } #endif /* SQLITE_OMIT_BETWEEN_OPTIMIZATION */ -#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBTQUERY) +#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY) /* Attempt to convert OR-connected terms into an IN operator so that ** they can make use of indices. Example: ** @@ -60735,7 +60735,7 @@ static void exprAnalyze( ** ** x IN (expr1,expr2,expr3) ** - ** This optimization must be omitted if OMIT_SUBTQUERY is defined because + ** This optimization must be omitted if OMIT_SUBQUERY is defined because ** the compiler for the the IN operator is part of sub-queries. */ else if( pExpr->op==TK_OR ){ @@ -60908,7 +60908,7 @@ static int referencesOtherTables( ** clause and the match can still be a success. ** ** All terms of the ORDER BY that match against the index must be either -** ASC or DESC. (Terms of the ORDER BY clause past the end of a UNITQUE +** ASC or DESC. (Terms of the ORDER BY clause past the end of a UNIQUE ** index do not need to satisfy this constraint.) The *pbRev value is ** set to 1 if the ORDER BY clause is all DESC and it is set to 0 if ** the ORDER BY clause is all ASC. @@ -61019,7 +61019,7 @@ static int isSortingIndex( if( pIdx->onError!=OE_None && i==pIdx->nColumn && !referencesOtherTables(pOrderBy, pMaskSet, j, base) ){ /* All terms of this index match some prefix of the ORDER BY clause - ** and the index is UNITQUE and no terms on the tail of the ORDER BY + ** and the index is UNIQUE and no terms on the tail of the ORDER BY ** clause reference other tables in a join. If this is all true then ** the order by clause is superfluous. */ return 1; @@ -61385,7 +61385,7 @@ static double bestIndex( if( pTerm->eOperator & WO_EQ ){ /* Rowid== is always the best pick. Look no further. Because only ** a single row is generated, output is always in sorted order */ - *pFlags = WHERE_ROWID_EQ | WHERE_UNITQUE; + *pFlags = WHERE_ROWID_EQ | WHERE_UNIQUE; *pnEq = 1; WHERETRACE(("... best is rowid\n")); return 0.0; @@ -61487,7 +61487,7 @@ static double bestIndex( nEq = i; if( pProbe->onError!=OE_None && (flags & WHERE_COLUMN_IN)==0 && nEq==pProbe->nColumn ){ - flags |= WHERE_UNITQUE; + flags |= WHERE_UNIQUE; } WHERETRACE(("...... nEq=%d inMult=%.9g cost=%.9g\n", nEq, inMultiplier, cost)); @@ -61648,7 +61648,7 @@ static void codeEqualityTerm( sqlite3ExprCode(pParse, pX->pRight); }else if( pX->op==TK_ISNULL ){ sqlite3VdbeAddOp(v, OP_Null, 0, 0); -#ifndef SQLITE_OMIT_SUBTQUERY +#ifndef SQLITE_OMIT_SUBQUERY }else{ int iTab; struct InLoop *pIn; @@ -62054,7 +62054,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( /* If the total query only selects a single row, then the ORDER BY ** clause is irrelevant. */ - if( (andFlags & WHERE_UNITQUE)!=0 && ppOrderBy ){ + if( (andFlags & WHERE_UNIQUE)!=0 && ppOrderBy ){ *ppOrderBy = 0; } @@ -63299,7 +63299,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* $ => nothing */ 0, /* SEMI => nothing */ 23, /* EXPLAIN => ID */ - 23, /* TQUERY => ID */ + 23, /* QUERY => ID */ 23, /* PLAN => ID */ 23, /* BEGIN => ID */ 0, /* TRANSACTION => nothing */ @@ -63390,7 +63390,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* DEFAULT => nothing */ 0, /* NULL => nothing */ 0, /* PRIMARY => nothing */ - 0, /* UNITQUE => nothing */ + 0, /* UNIQUE => nothing */ 0, /* CHECK => nothing */ 0, /* REFERENCES => nothing */ 0, /* AUTOINCR => nothing */ @@ -63531,7 +63531,7 @@ static const char *const yyTokenName[] = { "STAR", "SLASH", "REM", "CONCAT", "COLLATE", "UMINUS", "UPLUS", "BITNOT", "STRING", "JOIN_KW", "CONSTRAINT", "DEFAULT", - "NULL", "PRIMARY", "UNITQUE", "CHECK", + "NULL", "PRIMARY", "UNIQUE", "CHECK", "REFERENCES", "AUTOINCR", "ON", "DELETE", "UPDATE", "INSERT", "SET", "DEFERRABLE", "FOREIGN", "DROP", "UNION", "ALL", @@ -63585,7 +63585,7 @@ static const char *const yyRuleName[] = { /* 5 */ "ecmd ::= explain cmdx SEMI", /* 6 */ "explain ::=", /* 7 */ "explain ::= EXPLAIN", - /* 8 */ "explain ::= EXPLAIN TQUERY PLAN", + /* 8 */ "explain ::= EXPLAIN QUERY PLAN", /* 9 */ "cmd ::= BEGIN transtype trans_opt", /* 10 */ "trans_opt ::=", /* 11 */ "trans_opt ::= TRANSACTION", @@ -63635,7 +63635,7 @@ static const char *const yyRuleName[] = { /* 55 */ "ccons ::= NULL onconf", /* 56 */ "ccons ::= NOT NULL onconf", /* 57 */ "ccons ::= PRIMARY KEY sortorder onconf autoinc", - /* 58 */ "ccons ::= UNITQUE onconf", + /* 58 */ "ccons ::= UNIQUE onconf", /* 59 */ "ccons ::= CHECK LP expr RP", /* 60 */ "ccons ::= REFERENCES nm idxlist_opt refargs", /* 61 */ "ccons ::= defer_subclause", @@ -63664,7 +63664,7 @@ static const char *const yyRuleName[] = { /* 84 */ "conslist ::= tcons", /* 85 */ "tcons ::= CONSTRAINT nm", /* 86 */ "tcons ::= PRIMARY KEY LP idxlist autoinc RP onconf", - /* 87 */ "tcons ::= UNITQUE LP idxlist RP onconf", + /* 87 */ "tcons ::= UNIQUE LP idxlist RP onconf", /* 88 */ "tcons ::= CHECK LP expr RP onconf", /* 89 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt", /* 90 */ "defer_subclause_opt ::=", @@ -63811,7 +63811,7 @@ static const char *const yyRuleName[] = { /* 231 */ "nexprlist ::= nexprlist COMMA expr", /* 232 */ "nexprlist ::= expr", /* 233 */ "cmd ::= CREATE uniqueflag INDEX ifnotexists nm dbnm ON nm LP idxlist RP", - /* 234 */ "uniqueflag ::= UNITQUE", + /* 234 */ "uniqueflag ::= UNIQUE", /* 235 */ "uniqueflag ::=", /* 236 */ "idxlist_opt ::=", /* 237 */ "idxlist_opt ::= LP idxlist RP", @@ -65887,7 +65887,7 @@ static int keywordCode(const char *z, int n){ static const char zText[526] = "BEFOREIGNOREGEXPLAINSTEADDESCAPEACHECKEYCONSTRAINTERSECTABLEFT" "HENDATABASELECTRANSACTIONATURALTERAISELSEXCEPTRIGGEREFERENCES" - "UNITQUERYATTACHAVINGROUPDATEMPORARYBEGINNEREINDEXCLUSIVEXISTSBETWEEN" + "UNIQUERYATTACHAVINGROUPDATEMPORARYBEGINNEREINDEXCLUSIVEXISTSBETWEEN" "OTNULLIKECASCADEFERRABLECASECOLLATECREATECURRENT_DATEDELETEDETACH" "IMMEDIATEJOINSERTMATCHPLANALYZEPRAGMABORTVALUESVIRTUALIMITWHEN" "WHERENAMEAFTEREPLACEANDEFAULTAUTOINCREMENTCASTCOLUMNCOMMITCONFLICT" @@ -65946,7 +65946,7 @@ static int keywordCode(const char *z, int n){ TK_TABLE, TK_JOIN_KW, TK_THEN, TK_END, TK_DATABASE, TK_AS, TK_SELECT, TK_TRANSACTION,TK_ON, TK_JOIN_KW, TK_ALTER, TK_RAISE, TK_ELSE, TK_EXCEPT, TK_TRIGGER, - TK_REFERENCES, TK_UNITQUE, TK_TQUERY, TK_ATTACH, TK_HAVING, + TK_REFERENCES, TK_UNIQUE, TK_QUERY, TK_ATTACH, TK_HAVING, TK_GROUP, TK_UPDATE, TK_TEMP, TK_TEMP, TK_OR, TK_BEGIN, TK_JOIN_KW, TK_REINDEX, TK_INDEX, TK_EXCLUSIVE, TK_EXISTS, TK_BETWEEN, TK_NOTNULL, TK_NOT, TK_NULL, diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp index ac6ee24e..b3296945 100644 --- a/amarok/src/statistics.cpp +++ b/amarok/src/statistics.cpp @@ -639,10 +639,10 @@ StatisticsList::showContextMenu( TQListViewItem *item, const TQPoint &p, int ) bool hasSQL = !( item->itemType() == StatisticsDetailedItem::TRACK ); //track is url KPopupMenu menu( this ); - enum Actions { APPEND, TQUEUE, INFO }; + enum Actions { APPEND, QUEUE, INFO }; menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); - menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), TQUEUE ); + menu.insertItem( SmallIconSet( Amarok::icon( "queue_track" ) ), i18n( "&Queue Track" ), QUEUE ); menu.insertSeparator(); @@ -656,7 +656,7 @@ StatisticsList::showContextMenu( TQListViewItem *item, const TQPoint &p, int ) Playlist::instance()->insertMedia( KURL::fromPathOrURL( item->url() ) ); break; - case TQUEUE: + case QUEUE: hasSQL ? Playlist::instance()->insertMediaSql( item->getSQL(), Playlist::Queue ): Playlist::instance()->insertMedia( KURL::fromPathOrURL( item->url() ), Playlist::Queue ); diff --git a/amarok/src/statusbar/queueLabel.h b/amarok/src/statusbar/queueLabel.h index f5dd3049..42bb59b9 100644 --- a/amarok/src/statusbar/queueLabel.h +++ b/amarok/src/statusbar/queueLabel.h @@ -17,8 +17,8 @@ * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef AMAROK_TQUEUELABEL_H -#define AMAROK_TQUEUELABEL_H +#ifndef AMAROK_QUEUELABEL_H +#define AMAROK_QUEUELABEL_H #include "playlistitem.h" #include "popupMessage.h" diff --git a/amarok/src/statusbar/squeezedtextlabel.h b/amarok/src/statusbar/squeezedtextlabel.h index 41ea147f..67723d6e 100644 --- a/amarok/src/statusbar/squeezedtextlabel.h +++ b/amarok/src/statusbar/squeezedtextlabel.h @@ -18,8 +18,8 @@ * 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef STQUEEZEDTEXTLABEL_H -#define STQUEEZEDTEXTLABEL_H +#ifndef SQUEEZEDTEXTLABEL_H +#define SQUEEZEDTEXTLABEL_H #include <tqlabel.h> |