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

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 6af316310b
commit 0d44d32a5b
23 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -2003,20 +2003,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>
int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");

2
amarok/src/amarok.h
Unescape View File

@ -54,7 +54,7 @@ namespace Amarok
inline TQString xmlVersion() { return "2.4"; }
/**
* Convenience function to return the KApplication instance KConfig object
* Convenience function to return the TDEApplication instance KConfig object
* pre-set to a specific group.
* @param group Will pre-set the KConfig object to this group.
*/

6
amarok/src/app.cpp
Unescape View File

@ -125,7 +125,7 @@ LIBAMAROK_EXPORT KAboutData aboutData( "amarok",
( "http://amarok.kde.org" ) );
App::App()
: KApplication(KApplication::openX11RGBADisplay())
: TDEApplication(TDEApplication::openX11RGBADisplay())
, m_pPlayerWindow( 0 ) //will be created in applySettings()
{
DEBUG_BLOCK
@ -422,7 +422,7 @@ void App::initCliArgs( int argc, char *argv[] ) //static
};
TDECmdLineArgs::reset();
TDECmdLineArgs::init( argc, argv, &::aboutData ); //calls KApplication::addCmdLineOptions()
TDECmdLineArgs::init( argc, argv, &::aboutData ); //calls TDEApplication::addCmdLineOptions()
TDECmdLineArgs::addCmdLineOptions( options ); //add our own options
}
@ -1285,7 +1285,7 @@ void App::quit()
TQTimer::singleShot( 100, this, TQT_SLOT( quit() ) );
return;
}
KApplication::quit();
TDEApplication::quit();
}
namespace Amarok

2
amarok/src/app.h
Unescape View File

@ -39,7 +39,7 @@ class Playlist;
class PlaylistWindow;
class MediaDeviceManager;
class LIBAMAROK_EXPORT App : public KApplication, public EngineObserver
class LIBAMAROK_EXPORT App : public TDEApplication, public EngineObserver
{
Q_OBJECT

2
amarok/src/collectiondb.cpp
Unescape View File

@ -6284,7 +6284,7 @@ int SqliteConnection::insert( const TQString& statement, const TQString& /* tabl
// this implements a RAND() function compatible with the MySQL RAND() (0-param-form without seed)
void SqliteConnection::sqlite_rand(sqlite3_context *context, int /*argc*/, sqlite3_value ** /*argv*/)
{
sqlite3_result_double( context, static_cast<double>(KApplication::random()) / (RAND_MAX+1.0) );
sqlite3_result_double( context, static_cast<double>(TDEApplication::random()) / (RAND_MAX+1.0) );
}
// this implements a POWER() function compatible with the MySQL POWER()

2
amarok/src/collectionscanner/collectionscanner.cpp
Unescape View File

@ -50,7 +50,7 @@ CollectionScanner::CollectionScanner( const TQStringList& folders,
bool incremental,
bool importPlaylists,
bool restart )
: KApplication( /*allowStyles*/ false, /*GUIenabled*/ false )
: TDEApplication( /*allowStyles*/ false, /*GUIenabled*/ false )
, m_importPlaylists( importPlaylists )
, m_folders( folders )
, m_recursively( recursive )

2
amarok/src/collectionscanner/collectionscanner.h
Unescape View File

@ -39,7 +39,7 @@ typedef TQMap<TQString, TQString> AttributeMap;
* @short Scans directories and builds the Collection
*/
class CollectionScanner : public KApplication
class CollectionScanner : public TDEApplication
{
Q_OBJECT

4
amarok/src/collectionscanner/main.cpp
Unescape View File

@ -53,7 +53,7 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::reset();
TDECmdLineArgs::init( argc, argv, &about ); //calls KApplication::addCmdLineOptions()
TDECmdLineArgs::init( argc, argv, &about ); //calls TDEApplication::addCmdLineOptions()
TDECmdLineArgs::addCmdLineOptions( options ); //add our own options
const TDECmdLineArgs* const args = TDECmdLineArgs::parsedArgs();
@ -68,7 +68,7 @@ int main( int argc, char *argv[] )
const bool importplaylists = args->isSet( "importplaylists" );
const bool restart = args->isSet( "restart" );
KApplication::disableAutoDcopRegistration();
TDEApplication::disableAutoDcopRegistration();
CollectionScanner scanner( folders, recursive, incremental, importplaylists, restart );

2
amarok/src/database_refactor/sqlite/sqlite_dbengine.cpp
Unescape View File

@ -200,7 +200,7 @@ int SqliteDbEngine::insert( const TQString& statement, const TQString& /* table
// this implements a RAND() function compatible with the MySQL RAND() (0-param-form without seed)
void SqliteDbEngine::sqlite_rand(sqlite3_context *context, int /*argc*/, sqlite3_value ** /*argv*/)
{
//sqlite3_result_double( context, static_cast<double>(KApplication::random()) / (RAND_MAX+1.0) );
//sqlite3_result_double( context, static_cast<double>(TDEApplication::random()) / (RAND_MAX+1.0) );
}
// this implements a POWER() function compatible with the MySQL POWER()

2
amarok/src/debug.h
Unescape View File

@ -52,7 +52,7 @@ namespace Debug
// we can't use a statically instantiated TQCString for the indent, because
// static namespaces are unique to each dlopened library. So we piggy back
// the TQCString on the KApplication instance
// the TQCString on the TDEApplication instance
#define tqtApp reinterpret_cast<TQObject*>(tqApp)
class Indent : TQObject

2
amarok/src/devicemanager.cpp
Unescape View File

@ -39,7 +39,7 @@ DeviceManager* DeviceManager::instance()
DeviceManager::DeviceManager()
{
DEBUG_BLOCK
m_dc = KApplication::dcopClient();
m_dc = TDEApplication::dcopClient();
m_dc->setNotifications(true);
m_valid = false;

12
amarok/src/dynamicmode.cpp
Unescape View File

@ -134,7 +134,7 @@ DEBUG_BLOCK
if( suggestions.isEmpty() )
break;
TQString chosen = suggestions[ KApplication::random() % suggestions.count() ];
TQString chosen = suggestions[ TDEApplication::random() % suggestions.count() ];
debug() << "found similar artist: " << chosen << endl;
@ -144,7 +144,7 @@ DEBUG_BLOCK
if( newSuggestions.isEmpty() )
break;
TQString s = newSuggestions[ KApplication::random() % newSuggestions.count() ];
TQString s = newSuggestions[ TDEApplication::random() % newSuggestions.count() ];
debug() << "found extended similar artist: " << s << endl;
newChosen += s;
@ -241,7 +241,7 @@ DEBUG_BLOCK
if( trackList.isEmpty() )
break;
KURL::List::Iterator urlIt = trackList.at( KApplication::random() % trackList.count() );
KURL::List::Iterator urlIt = trackList.at( TDEApplication::random() % trackList.count() );
if( (*urlIt).isValid() )
{
returnList << (*urlIt).path();
@ -319,7 +319,7 @@ DEBUG_BLOCK
songCount = limit;
else
// Let's get a random limit, repecting the original one.
offset += KApplication::random() % (limit - songCount);
offset += TDEApplication::random() % (limit - songCount);
if( findLocation == -1 ) // there is no limit
{
@ -361,7 +361,7 @@ DEBUG_BLOCK
{
for( uint i=0; i < songCount && urls.count(); i++ )
{
KURL::List::iterator newItem = urls.at( KApplication::random() % urls.count() );
KURL::List::iterator newItem = urls.at( TDEApplication::random() % urls.count() );
addMe << (*newItem);
urls.remove( newItem );
}
@ -388,7 +388,7 @@ DEBUG_BLOCK
{
if( m_cachedItemSet.isEmpty() )
break;
const int pos = KApplication::random() % m_cachedItemSet.count();
const int pos = TDEApplication::random() % m_cachedItemSet.count();
KURL::List::iterator newItem = m_cachedItemSet.at( pos );
if( TQFile::exists( (*newItem).path() ) )
retrieval << (*newItem);

2
amarok/src/konquisidebar/universalamarok.cpp
Unescape View File

@ -283,7 +283,7 @@ void UniversalAmarok::noAmarokRunning() {
}
void UniversalAmarok::runAmarok() {
KApplication::tdeinitExecWait("amarok");
TDEApplication::tdeinitExecWait("amarok");
}

2
amarok/src/ktrm.cpp
Unescape View File

@ -252,7 +252,7 @@ class KTRMEventHandler : public TQObject
public:
static void send(int fileId, KTRMEvent::Status status)
{
KApplication::postEvent(instance(), new KTRMEvent(fileId, status));
TDEApplication::postEvent(instance(), new KTRMEvent(fileId, status));
}
protected:

2
amarok/src/main.cpp
Unescape View File

@ -99,7 +99,7 @@ int main( int argc, char *argv[] )
registerTaglibPlugins();
KApplication::disableAutoDcopRegistration();
TDEApplication::disableAutoDcopRegistration();
App::initCliArgs( argc, argv );
App app;

2
amarok/src/pixmapviewer.cpp
Unescape View File

@ -59,7 +59,7 @@ void PixmapViewer::contentsMouseMoveEvent(TQMouseEvent *event) {
}
TQSize PixmapViewer::maximalSize() {
return m_pixmap.size().boundedTo( KApplication::desktop()->size() ) + size() - viewport()->size();
return m_pixmap.size().boundedTo( TDEApplication::desktop()->size() ) + size() - viewport()->size();
}
#include "pixmapviewer.moc"

12
amarok/src/playlist.cpp
Unescape View File

@ -1079,7 +1079,7 @@ Playlist::playNextTrack( bool forceNext )
else
{
if( Amarok::favorNone() )
item = tracks.at( KApplication::random() % tracks.count() ); //is O(1)
item = tracks.at( TDEApplication::random() % tracks.count() ); //is O(1)
else
{
const uint currenttime_t = TQDateTime::currentDateTime().toTime_t();
@ -1115,12 +1115,12 @@ Playlist::playNextTrack( bool forceNext )
TQ_INT64 random;
if( Amarok::favorLastPlay() ) //really big huge numbers
{
TQ_INT64 r = TQ_INT64( ( KApplication::random() / pow( 2, sizeof( int ) * 8 ) )
TQ_INT64 r = TQ_INT64( ( TDEApplication::random() / pow( 2, sizeof( int ) * 8 ) )
* pow( 2, 64 ) );
random = r % total;
}
else
random = KApplication::random() % total;
random = TDEApplication::random() % total;
int i = 0;
for( int n = tracks.count(); i < n && random >= 0; ++i )
random -= weights.at( i );
@ -2395,9 +2395,9 @@ Playlist::contentsDragMoveEvent( TQDragMoveEvent* e )
if( !e->isAccepted() ) return;
#if KDE_IS_VERSION( 3, 3, 91 )
const bool ctrlPressed = KApplication::keyboardMouseState() & TQt::ControlButton;
const bool ctrlPressed = TDEApplication::keyboardMouseState() & TQt::ControlButton;
#else
const bool ctrlPressed = KApplication::keyboardModifiers() & ControlMask;
const bool ctrlPressed = TDEApplication::keyboardModifiers() & ControlMask;
#endif
//Get the closest item _before_ the cursor
@ -3370,7 +3370,7 @@ Playlist::shuffle() //SLOT
takeItem( item );
//shuffle
KRandomSequence( (long)KApplication::random() ).randomize( &list );
KRandomSequence( (long)TDEApplication::random() ).randomize( &list );
//reinsert in new order
for( TQListViewItem *item = list.first(); item; item = list.next() )

4
amarok/src/playlistbrowseritem.cpp
Unescape View File

@ -3487,7 +3487,7 @@ void ShoutcastBrowser::setOpen( bool open )
TQStringList tmpdirs = KGlobal::dirs()->resourceDirs( "tmp" );
TQString tmpfile = tmpdirs[0];
tmpfile += "/amarok-genres-" + KApplication::randomString(10) + ".xml-";
tmpfile += "/amarok-genres-" + TDEApplication::randomString(10) + ".xml-";
//get the genre list
if ( !m_downloading )
@ -3659,7 +3659,7 @@ void ShoutcastGenre::setOpen( bool open )
void ShoutcastGenre::startGenreDownload( TQString genre, TQString tmppath )
{
TQString tmpfile = tmppath + "/amarok-list-" + genre + "-" + KApplication::randomString(10) + ".xml";
TQString tmpfile = tmppath + "/amarok-list-" + genre + "-" + TDEApplication::randomString(10) + ".xml";
KIO::CopyJob *cj = KIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml?genre=" + genre, tmpfile, false );
connect( cj, TQT_SIGNAL( copyingDone ( KIO::Job*, const KURL&, const KURL&, bool, bool ) ),
this, TQT_SLOT( doneListDownload( KIO::Job*, const KURL&, const KURL&, bool, bool ) ) );

4
amarok/src/scripts/graphequalizer/eqdialog.ui.h
Unescape View File

@ -25,7 +25,7 @@ void EqDialog::init()
TQByteArray send_data, reply_data;
TQCString reply_type;
//kdDebug() << "continue" << endl;
if(!KApplication::dcopClient()->call("amarok","player","equalizerEnabled()", send_data, reply_type, reply_data,true,1000));
if(!TDEApplication::dcopClient()->call("amarok","player","equalizerEnabled()", send_data, reply_type, reply_data,true,1000));
//kdDebug() << "called" << endl;
TQDataStream answer(reply_data, IO_ReadOnly);
//kdDebug() << "answer created" << answer << endl;
@ -42,5 +42,5 @@ void EqDialog::eqGroupBox_toggled( bool eqEnabled)
TQByteArray data;
TQDataStream arg(data, IO_WriteOnly);
arg << eqEnabled;
KApplication::dcopClient()->send("amarok", "player", "setEqualizerEnabled(bool)" , data);
TDEApplication::dcopClient()->send("amarok", "player", "setEqualizerEnabled(bool)" , data);
}

2
amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
Unescape View File

@ -280,7 +280,7 @@ void CallAmarok::updateEq()
TQValueList<int>::iterator it;
for ( it = cs.begin(); it != cs.end(); ++it )
arg << (*it);
KApplication::dcopClient()->send("amarok", "player",
TDEApplication::dcopClient()->send("amarok", "player",
"setEqualizer(int,int,int,int,int,int,int,int,int,int,int)"
, data);
}

2
amarok/src/scripts/graphequalizer/main.cpp
Unescape View File

@ -31,7 +31,7 @@ int main(int argc, char **argv)
KAboutData::License_GPL, "(C) 2005 Ian Monroe", 0, 0, "ian@monroe.nu");
about.addAuthor( "Ian Monroe", 0, "ian@monroe.nu" );
TDECmdLineArgs::init( argc, argv, &about );
KApplication app;
TDEApplication app;
EqDialog *mainWin = new EqDialog();
// mainWin = new EqualizerGraph(0,"equalizerdialog");
// TQCanvas canvas;

2
amarok/src/tagguesserconfigdialog.ui.h
Unescape View File

@ -76,7 +76,7 @@ void TagGuesserConfigDialog::accept()
{
if(lvSchemes->renameLineEdit()) {
TQKeyEvent returnKeyPress(TQEvent::KeyPress, Key_Return, 0, 0);
KApplication::sendEvent( lvSchemes->renameLineEdit(), &returnKeyPress );
TDEApplication::sendEvent( lvSchemes->renameLineEdit(), &returnKeyPress );
}
TQStringList schemes;

2
doc/pt/develop.docbook
Unescape View File

@ -61,7 +61,7 @@
<entry
>app.cpp</entry>
<entry
>Esta é a classe derivada da KApplication e que é mãe de vários objectos fundamentais para a execução do &amarok;, &eg; o motor, o DCOP, a bandeja do sistema, os elementos gráficos de topo, etc.</entry>
>Esta é a classe derivada da TDEApplication e que é mãe de vários objectos fundamentais para a execução do &amarok;, &eg; o motor, o DCOP, a bandeja do sistema, os elementos gráficos de topo, etc.</entry>
</row>
<row>

Write Preview
Loading…
Cancel
Save