Use tdeApp

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/31/head
Michele Calgaro 5 months ago
parent fc0e591805
commit a130452020
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -348,7 +348,7 @@ distribution. -->
<title>Credits and License</title> <title>Credits and License</title>
<sect1 id="kapp"> <sect1 id="tdeApp">
<title>&codeine;</title> <title>&codeine;</title>
<para>Program copyright 2004 Max B. Howell <email>max.howell@methylblue.com</email></para> <para>Program copyright 2004 Max B. Howell <email>max.howell@methylblue.com</email></para>

@ -57,7 +57,7 @@ namespace Codeine {
/// @see codeine.h /// @see codeine.h
TQWidget *mainWindow() { return kapp->mainWidget(); } TQWidget *mainWindow() { return tdeApp->mainWidget(); }
MainWindow::MainWindow() MainWindow::MainWindow()
@ -70,7 +70,7 @@ MainWindow::MainWindow()
clearWFlags( WDestructiveClose ); //we are allocated on the stack clearWFlags( WDestructiveClose ); //we are allocated on the stack
kapp->setMainWidget( this ); tdeApp->setMainWidget( this );
m_widgetStack = new TQWidgetStack(this, "m_widgetStack"); m_widgetStack = new TQWidgetStack(this, "m_widgetStack");
@ -169,7 +169,7 @@ MainWindow::MainWindow()
KXMLGUIClient::stateChanged( "empty" ); KXMLGUIClient::stateChanged( "empty" );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); 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 //we need to resize the window, so we can't show the window yet
init(); init();
else { else {
@ -208,7 +208,7 @@ MainWindow::init()
TQApplication::restoreOverrideCursor(); TQApplication::restoreOverrideCursor();
if( !kapp->isRestored() ) { if( !tdeApp->isRestored() ) {
TDECmdLineArgs &args = *TDECmdLineArgs::parsedArgs(); TDECmdLineArgs &args = *TDECmdLineArgs::parsedArgs();
if (args.isSet( "play-dvd" )) if (args.isSet( "play-dvd" ))
open( "dvd:/" ); open( "dvd:/" );
@ -266,7 +266,7 @@ MainWindow::setupActions()
TDEActionCollection * const ac = actionCollection(); 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...") ); 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 )) ); connect( new FullScreenAction( this, ac ), TQ_SIGNAL(toggled( bool )), TQ_SLOT(fullScreenToggled( bool )) );
@ -713,7 +713,7 @@ MainWindow::menu( const TQString& name )
TDEActionCollection* TDEActionCollection*
actionCollection() 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 /// Convenience class for other classes that need access to the actions
@ -726,7 +726,7 @@ action( const char *name )
TDEActionCollection *actionCollection = nullptr; TDEActionCollection *actionCollection = nullptr;
TDEAction *action = nullptr; TDEAction *action = nullptr;
mainWindow = dynamic_cast<MainWindow *>(kapp->mainWidget()); mainWindow = dynamic_cast<MainWindow *>(tdeApp->mainWidget());
if (mainWindow) if (mainWindow)
{ {
actionCollection = mainWindow->actionCollection(); actionCollection = mainWindow->actionCollection();

@ -25,7 +25,7 @@ namespace Codeine {
PlayDialog::PlayDialog( TQWidget *parent, bool be_welcome_dialog ) PlayDialog::PlayDialog( TQWidget *parent, bool be_welcome_dialog )
: TQDialog( parent ) : TQDialog( parent )
{ {
setCaption( kapp->makeStdCaption( i18n("Play Media") ) ); setCaption( tdeApp->makeStdCaption( i18n("Play Media") ) );
TQSignalMapper *mapper = new TQSignalMapper( this ); TQSignalMapper *mapper = new TQSignalMapper( this );
TQWidget *o, *closeButton = new KPushButton( KStdGuiItem::close(), 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 ) { if( be_welcome_dialog ) {
TQWidget *w = new KPushButton( KStdGuiItem::quit(), this ); TQWidget *w = new KPushButton( KStdGuiItem::quit(), this );
hbox->addWidget( w ); hbox->addWidget( w );
connect( w, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()) ); connect( w, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT(quit()) );
} }
hbox->addWidget( closeButton ); hbox->addWidget( closeButton );

@ -59,7 +59,7 @@ XineConfigDialog::XineConfigDialog( xine_t *xine, TQWidget *parent )
{ {
TQHBoxLayout *infoLayout = new TQHBoxLayout(topLayout, spacingHint()); 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); TQLabel *label = new TQLabel(page);
label->setPixmap(info); label->setPixmap(info);
label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum); label->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);

Loading…
Cancel
Save