1 files changed, 23 insertions, 23 deletions

diff --git a/src/kbibtexshell.cpp b/src/kbibtexshell.cpp
index 3c297fb..7e672b5 100644
--- a/src/kbibtexshell.cpp
+++ b/src/kbibtexshell.cpp
@@ -74,8 +74,8 @@ KBibTeXShell::KBibTeXShell( TQWidget* parentWidget, const char* name )
         // if we couldn't find our Part, we exit since the Shell by
         // itself can't do anything useful
         KMessageBox::error( this, i18n( "Could not find our part!" ) );
-        kapp->quit();
-        // we return here, cause kapp->quit() only means "exit the
+        tdeApp->quit();
+        // we return here, cause tdeApp->quit() only means "exit the
         // next time we enter the event loop...
         return ;
     }
@@ -115,21 +115,21 @@ bool KBibTeXShell::openURL( const KURL& url )
     if ( m_part->url().isEmpty() && !m_part->isModified() )
     {
         if ( !m_part->openURL( url ) )
-            return FALSE;
+            return false;
     }
     else
     {
         KBibTeXShell *shell = new KBibTeXShell();
 
         if ( !shell->part() ->openURL( url ) )
-            return FALSE;
+            return false;
         else
             initializePart( shell->part() );
         shell->show();
     }
 
     m_recentFiles->addURL( url );
-    return TRUE;
+    return true;
 }
 
 KParts::ReadWritePart * KBibTeXShell::part()
@@ -154,13 +154,13 @@ void KBibTeXShell::writeConfig( TDEConfig *config )
 
 void KBibTeXShell::readConfig()
 {
-    TDEConfig * config = kapp->config();
+    TDEConfig * config = tdeApp->config();
     readConfig( config );
 }
 
 void KBibTeXShell::writeConfig()
 {
-    TDEConfig * config = kapp->config();
+    TDEConfig * config = tdeApp->config();
     writeConfig( config );
 }
 
@@ -178,28 +178,28 @@ void KBibTeXShell::setupActions()
 {
     TDEAction * action;
 
-    action = KStdAction::openNew( this, SLOT( slotFileNew() ), actionCollection() );
+    action = KStdAction::openNew( this, TQ_SLOT( slotFileNew() ), actionCollection() );
     action ->setToolTip( i18n( "Create a new window for a new BibTeX file" ) );
-    TDEAction *actionOpen = KStdAction::open( this, SLOT( slotFileOpen() ), actionCollection() );
+    TDEAction *actionOpen = KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection() );
     actionOpen->setToolTip( i18n( "Open an existing BibTeX file" ) );
 
-    m_recentFiles = KStdAction::openRecent( this, SLOT( slotFileOpen( const KURL& ) ), actionCollection() );
+    m_recentFiles = KStdAction::openRecent( this, TQ_SLOT( slotFileOpen( const KURL& ) ), actionCollection() );
     m_recentFiles->setWhatsThis( i18n( "This lists files which you have opened recently, and allows you to easily open them again." ) );
-    connect( m_recentFiles, SIGNAL( activated() ), actionOpen, SLOT( activate() ) );
+    connect( m_recentFiles, TQ_SIGNAL( activated() ), actionOpen, TQ_SLOT( activate() ) );
 
-    action = KStdAction::close( this, SLOT( slotFileClose() ), actionCollection() );
+    action = KStdAction::close( this, TQ_SLOT( slotFileClose() ), actionCollection() );
     action->setToolTip( i18n( "Close this KBibTeX window" ) );
-    //     action = KStdAction::quit( kapp, SLOT( closeAllWindows() ), actionCollection() );
+    //     action = KStdAction::quit( tdeApp, TQ_SLOT( closeAllWindows() ), actionCollection() );
     //     action->setToolTip( i18n( "Close all windows and quit KBibTeX" ) );
 
-    m_statusbarAction = KStdAction::showStatusbar( this, SLOT( optionsShowStatusbar() ), actionCollection() );
+    m_statusbarAction = KStdAction::showStatusbar( this, TQ_SLOT( optionsShowStatusbar() ), actionCollection() );
     m_statusbarAction->setToolTip( i18n( "Show or hide the window's status bar" ) );
 
-    KStdAction::keyBindings( this, SLOT( optionsConfigureKeys() ), actionCollection() ) ->setToolTip( i18n( "Configure key bindings for KBibTeX" ) );
-    KStdAction::configureToolbars( this, SLOT( optionsConfigureToolbars() ), actionCollection() ) ->setToolTip( i18n( "Configure the tool bar for KBibTeX" ) );
+    KStdAction::keyBindings( this, TQ_SLOT( optionsConfigureKeys() ), actionCollection() ) ->setToolTip( i18n( "Configure key bindings for KBibTeX" ) );
+    KStdAction::configureToolbars( this, TQ_SLOT( optionsConfigureToolbars() ), actionCollection() ) ->setToolTip( i18n( "Configure the tool bar for KBibTeX" ) );
 
-    connect( actionCollection(), SIGNAL( actionStatusText( const TQString & ) ), this, SLOT( slotActionStatusText( const TQString & ) ) );
-    connect( actionCollection(), SIGNAL( clearStatusText( ) ), statusBar(), SLOT( clear() ) );
+    connect( actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), this, TQ_SLOT( slotActionStatusText( const TQString & ) ) );
+    connect( actionCollection(), TQ_SIGNAL( clearStatusText( ) ), statusBar(), TQ_SLOT( clear() ) );
 }
 
 void KBibTeXShell::slotActionStatusText( const TQString &text )
@@ -260,8 +260,8 @@ void KBibTeXShell::optionsConfigureToolbars()
 
     // use the standard toolbar editor
     KEditToolbar dlg( factory() );
-    connect( &dlg, SIGNAL( newToolbarConfig() ),
-             this, SLOT( applyNewToolbarConfig() ) );
+    connect( &dlg, TQ_SIGNAL( newToolbarConfig() ),
+             this, TQ_SLOT( applyNewToolbarConfig() ) );
     dlg.exec();
 }
 
@@ -281,7 +281,7 @@ void KBibTeXShell::applyNewToolbarConfig()
 bool KBibTeXShell::queryClose()
 {
     if ( m_part && !m_part ->closeURL() )
-        return FALSE;
+        return false;
 
     writeConfig();
 
@@ -326,7 +326,7 @@ void KBibTeXShell::slotFileOpen( const KURL& url )
 {
     if ( url.isEmpty() ) return ;
 
-    if ( !TDEIO::NetAccess::exists( url, TRUE, this ) )
+    if ( !TDEIO::NetAccess::exists( url, true, this ) )
     {
         m_recentFiles->removeURL( url );
         KMessageBox::error( this, i18n( "The given file could not be read, check if it exists or if it is readable for the current user." ) );
@@ -365,7 +365,7 @@ void KBibTeXShell::initializePart( KParts::ReadWritePart* part )
 {
     if ( part )
     {
-        connect( static_cast<KBibTeXPart*>( part ), SIGNAL( signalAddRecentURL( const KURL & ) ), this, SLOT( slotAddRecentURL( const KURL& ) ) );
+        connect( static_cast<KBibTeXPart*>( part ), TQ_SIGNAL( signalAddRecentURL( const KURL & ) ), this, TQ_SLOT( slotAddRecentURL( const KURL& ) ) );
     }
 }