summaryrefslogtreecommitdiffstats
path: root/libk3b
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b')
-rw-r--r--libk3b/cddb/k3bcddblocalquery.cpp2
-rw-r--r--libk3b/cddb/k3bcddbquery.cpp2
-rw-r--r--libk3b/core/k3bglobals.cpp8
-rw-r--r--libk3b/projects/movixcd/k3bmovixdoc.cpp4
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.cpp10
-rw-r--r--libk3b/tools/k3bmultichoicedialog.cpp2
6 files changed, 14 insertions, 14 deletions
diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp
index 6f984f4..1d45721 100644
--- a/libk3b/cddb/k3bcddblocalquery.cpp
+++ b/libk3b/cddb/k3bcddblocalquery.cpp
@@ -39,7 +39,7 @@ K3bCddbLocalQuery::~K3bCddbLocalQuery()
void K3bCddbLocalQuery::doQuery()
{
emit infoMessage( i18n("Searching entry in %1").arg( m_cddbDir ) );
- kapp->processEvents(); //BAD!
+ tdeApp->processEvents(); //BAD!
TQString path = preparePath( m_cddbDir );
diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp
index facf224..4ba9ce9 100644
--- a/libk3b/cddb/k3bcddbquery.cpp
+++ b/libk3b/cddb/k3bcddbquery.cpp
@@ -226,7 +226,7 @@ TQString K3bCddbQuery::handshakeString() const
if( host.isEmpty() )
host = "kde-host";
- return TQString("%1 %2 K3b %3").arg(user).arg(host).arg(kapp->aboutData()->version());
+ return TQString("%1 %2 K3b %3").arg(user).arg(host).arg(tdeApp->aboutData()->version());
}
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index 2dd7ae6..f8f7425 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -175,10 +175,10 @@ TQString K3b::findTempFile( const TQString& ending, const TQString& d )
TQString K3b::defaultTempPath()
{
- TQString oldGroup = kapp->config()->group();
- kapp->config()->setGroup( "General Options" );
- TQString url = kapp->config()->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() );
- kapp->config()->setGroup( oldGroup );
+ TQString oldGroup = tdeApp->config()->group();
+ tdeApp->config()->setGroup( "General Options" );
+ TQString url = tdeApp->config()->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() );
+ tdeApp->config()->setGroup( oldGroup );
return prepareDir(url);
}
diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp
index 74a53d2..1148188 100644
--- a/libk3b/projects/movixcd/k3bmovixdoc.cpp
+++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp
@@ -85,8 +85,8 @@ void K3bMovixDoc::addMovixFile( const KURL& _url, int pos )
TQString newName = f.fileName();
if( nameAlreadyInDir( newName, root() ) ) {
- kapp->config()->setGroup("Data project settings");
- bool dropDoubles = kapp->config()->readBoolEntry( "Drop doubles", false );
+ tdeApp->config()->setGroup("Data project settings");
+ bool dropDoubles = tdeApp->config()->readBoolEntry( "Drop doubles", false );
if( dropDoubles )
return;
diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index 0c192df..82cca1b 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -207,7 +207,7 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
m_urlAddingTimer->stop();
setVcdType( vcdTypes( mpegVersion ) );
vcdOptions() ->setMpegVersion( mpegVersion );
- KMessageBox::information( kapp->mainWidget(),
+ KMessageBox::information( tdeApp->mainWidget(),
i18n( "K3b will create a %1 image from the given MPEG "
"files, but these files must already be in %2 "
"format. K3b does not yet resample MPEG files." )
@@ -219,7 +219,7 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
m_urlAddingTimer->stop();
vcdOptions() ->setMpegVersion( mpegVersion );
bool force = false;
- force = ( KMessageBox::questionYesNo( kapp->mainWidget(),
+ force = ( KMessageBox::questionYesNo( tdeApp->mainWidget(),
i18n( "K3b will create a %1 image from the given MPEG "
"files, but these files must already be in %2 "
"format. K3b does not yet resample MPEG files." )
@@ -242,7 +242,7 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
if ( numOfTracks() > 0 && vcdOptions() ->mpegVersion() != mpegVersion ) {
- KMessageBox::error( kapp->mainWidget(), "(" + url.path() + ")\n" +
+ KMessageBox::error( tdeApp->mainWidget(), "(" + url.path() + ")\n" +
i18n( "You cannot mix MPEG1 and MPEG2 video files.\nPlease start a new Project for this filetype.\nResample not implemented in K3b yet." ),
i18n( "Wrong File Type for This Project" ) );
@@ -254,7 +254,7 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
*( newTrack->mpeg_info ) = *( Mpeg->mpeg_info );
if ( newTrack->isSegment() && !vcdOptions()->PbcEnabled() ) {
- KMessageBox::information( kapp->mainWidget(),
+ KMessageBox::information( tdeApp->mainWidget(),
i18n( "PBC (Playback control) enabled.\n"
"Videoplayers can not reach Segments (Mpeg Still Pictures) without Playback control ." ) ,
i18n( "Information" ) );
@@ -286,7 +286,7 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
}
// error (unsupported files)
- KMessageBox::error( kapp->mainWidget(), "(" + url.path() + ")\n" +
+ KMessageBox::error( tdeApp->mainWidget(), "(" + url.path() + ")\n" +
i18n( "Only MPEG1 and MPEG2 video files are supported.\n" ) + error_string ,
i18n( "Wrong File Format" ) );
diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp
index de4cb22..6b7c2ba 100644
--- a/libk3b/tools/k3bmultichoicedialog.cpp
+++ b/libk3b/tools/k3bmultichoicedialog.cpp
@@ -67,7 +67,7 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon)
break;
}
- TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
+ TQPixmap ret = tdeApp->iconLoader()->loadIcon(icon_name, TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
if (ret.isNull())
return TQMessageBox::standardIcon(icon);