TDE
/
amarok
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/amarok
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix inadvertent "TQ" changes.

Browse Source
pull/1/head
Darrell Anderson 13 years ago
parent 0032469896
commit a3bc52ff9b
35 changed files with 289 additions and 289 deletions
Show Stats Download Patch File Download Diff File

12
amarok/src/actionclasses.cpp
Unescape View File

@ -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 );

4
amarok/src/actionclasses.h
Unescape View File

@ -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();

2
amarok/src/analyzers/glanalyzer2.cpp
Unescape View File

@ -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())
{

6
amarok/src/analyzers/glanalyzer3.cpp
Unescape View File

@ -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

6
amarok/src/collectionbrowser.cpp
Unescape View File

@ -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:

68
amarok/src/collectiondb.cpp
Unescape View File

@ -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;
}

4
amarok/src/database_refactor/collectiondb.cpp
Unescape View File

@ -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,"

2
amarok/src/engine/helix/helix-sp/gain.cpp
Unescape View File

@ -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:

2
amarok/src/engine/helix/helix-sp/gain.h
Unescape View File

@ -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:

156
amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
Unescape View File

@ -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_

2
amarok/src/engine/helix/helix-sp/helix-include/common/include/hxfiles.h
Unescape View File

@ -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)

6
amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h
Unescape View File

@ -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

2
amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h
Unescape View File

@ -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;

4
amarok/src/engine/mas/masengine.cpp
Unescape View File

@ -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

6
amarok/src/equalizergraph.h
Unescape View File

@ -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*/

6
amarok/src/equalizerpresetmanager.h
Unescape View File

@ -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 */

2
amarok/src/equalizersetup.cpp
Unescape View File

@ -213,7 +213,7 @@ EqualizerSetup::setPreset( TQString name )
}
/////////////////////////////////////////////////////////////////////////////////////
// ETQUALIZER PRESETS
// EQUALIZER PRESETS
/////////////////////////////////////////////////////////////////////////////////////
TQString

6
amarok/src/equalizersetup.h
Unescape View File

@ -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*/

4
amarok/src/konquisidebar/universalamarok.h
Unescape View File

@ -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>

4
amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
Unescape View File

@ -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;

6
amarok/src/mediadevice/daap/daapclient.cpp
Unescape View File

@ -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:

2
amarok/src/mediadevice/daap/daapserver.cpp
Unescape View File

@ -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 )

2
amarok/src/mediadevice/daap/mongrel/http11/ext_help.h
Unescape View File

@ -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__)

4
amarok/src/mediadevice/daap/mongrel/http11/http11.c
Unescape View File

@ -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);

6
amarok/src/mediadevice/generic/genericmediadevice.cpp
Unescape View File

@ -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:

6
amarok/src/mediadevice/ipod/ipodmediadevice.cpp
Unescape View File

@ -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:

36
amarok/src/playlistbrowseritem.cpp
Unescape View File

@ -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:

4
amarok/src/playlistwindow.cpp
Unescape View File

@ -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 );