Use tdeAppHEADmaster

Signed-off-by: Michele Calgaro <[email protected]>

3 files changed, 10 insertions, 10 deletions

diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index 5861427..78bf592 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -57,7 +57,7 @@ namespace Codeine {
 
 
    /// @see codeine.h
-   TQWidget *mainWindow() { return kapp->mainWidget(); }
+   TQWidget *mainWindow() { return tdeApp->mainWidget(); }
 
 
 MainWindow::MainWindow()
@@ -70,7 +70,7 @@ MainWindow::MainWindow()
 
    clearWFlags( WDestructiveClose ); //we are allocated on the stack
 
-   kapp->setMainWidget( this );
+   tdeApp->setMainWidget( this );
 
    m_widgetStack = new TQWidgetStack(this, "m_widgetStack");
 
@@ -169,7 +169,7 @@ MainWindow::MainWindow()
    KXMLGUIClient::stateChanged( "empty" );
 
    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
-   if( args->count() || args->isSet( "play-dvd" ) || kapp->isRestored() )
+   if( args->count() || args->isSet( "play-dvd" ) || tdeApp->isRestored() )
       //we need to resize the window, so we can't show the window yet
       init();
    else {
@@ -208,7 +208,7 @@ MainWindow::init()
 
    TQApplication::restoreOverrideCursor();
 
-   if( !kapp->isRestored() ) {
+   if( !tdeApp->isRestored() ) {
       TDECmdLineArgs &args = *TDECmdLineArgs::parsedArgs();
       if (args.isSet( "play-dvd" ))
          open( "dvd:/" );
@@ -266,7 +266,7 @@ MainWindow::setupActions()
 
    TDEActionCollection * const ac = actionCollection();
 
-   KStdAction::quit( kapp, TQ_SLOT(quit()), ac );
+   KStdAction::quit( tdeApp, TQ_SLOT(quit()), ac );
    KStdAction::open( this, TQ_SLOT(playMedia()), ac, "play_media" )->setText( i18n("Play &Media...") );
    connect( new FullScreenAction( this, ac ), TQ_SIGNAL(toggled( bool )), TQ_SLOT(fullScreenToggled( bool )) );
 
@@ -713,7 +713,7 @@ MainWindow::menu( const TQString& name )
 TDEActionCollection*
 actionCollection()
 {
-   return static_cast<MainWindow*>(kapp->mainWidget())->actionCollection();
+   return static_cast<MainWindow*>(tdeApp->mainWidget())->actionCollection();
 }
 
 /// Convenience class for other classes that need access to the actions
@@ -726,7 +726,7 @@ action( const char *name )
    TDEActionCollection *actionCollection = nullptr;
    TDEAction *action = nullptr;
 
-   mainWindow = dynamic_cast<MainWindow *>(kapp->mainWidget());
+   mainWindow = dynamic_cast<MainWindow *>(tdeApp->mainWidget());
    if (mainWindow)
    {
       actionCollection = mainWindow->actionCollection();
diff --git a/src/app/playDialog.cpp b/src/app/playDialog.cpp
index 8c40520..bcb03b1 100644
--- a/src/app/playDialog.cpp
+++ b/src/app/playDialog.cpp
@@ -25,7 +25,7 @@ namespace Codeine {
 PlayDialog::PlayDialog( TQWidget *parent, bool be_welcome_dialog )
       : TQDialog( parent )
 {
-   setCaption( kapp->makeStdCaption( i18n("Play Media") ) );
+   setCaption( tdeApp->makeStdCaption( i18n("Play Media") ) );
 
    TQSignalMapper *mapper = new TQSignalMapper( this );
    TQWidget *o, *closeButton = new KPushButton( KStdGuiItem::close(), this );
@@ -59,7 +59,7 @@ PlayDialog::PlayDialog( TQWidget *parent, bool be_welcome_dialog )
    if( be_welcome_dialog ) {
       TQWidget *w = new KPushButton( KStdGuiItem::quit(), this );
       hbox->addWidget( w );
-      connect( w, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()) );
+      connect( w, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT(quit()) );
    }
 
    hbox->addWidget( closeButton );
diff --git a/src/app/xineConfig.cpp b/src/app/xineConfig.cpp
index 414b33c..022f859 100644
--- a/src/app/xineConfig.cpp
+++ b/src/app/xineConfig.cpp
@@ -59,7 +59,7 @@ XineConfigDialog::XineConfigDialog( xine_t *xine, TQWidget *parent )
 
    {
       TQHBoxLayout *infoLayout = new TQHBoxLayout(topLayout, spacingHint());
-      TQPixmap info = kapp->iconLoader()->loadIcon("messagebox_info", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, nullptr, true);
+      TQPixmap info = tdeApp->iconLoader()->loadIcon("messagebox_info", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, nullptr, true);
       TQLabel *label = new TQLabel(page);
       label->setPixmap(info);
       label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);