Rename TDEApplication::kApplication() to TDEApplication::tdeApplication() and kapp to tdeApp.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 22 insertions, 22 deletions

diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index 817c14423..33eb53676 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -93,7 +93,7 @@ public:
     }
     bool saveState( TQSessionManager& )
     {
-        TDEConfig* config = TDEApplication::kApplication()->sessionConfig();
+        TDEConfig* config = tdeApp->sessionConfig();
         if ( TDEMainWindow::memberList->first() ){
             // According to Jochen Wilhelmy <digisnap@cs.tu-berlin.de>, this
             // hook is useful for better document orientation
@@ -182,9 +182,9 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
     KWhatsThisManager::init ();
     setDockMenuEnabled( false );
     mHelpMenu = 0;
-    kapp->setTopWidget( this );
+    tdeApp->setTopWidget( this );
     actionCollection()->setWidget( this );
-    connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
+    connect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
     if( !memberList )
         memberList = new TQPtrList<TDEMainWindow>;
 
@@ -196,7 +196,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
     int unusedNumber;
     if ( !name )
         { // no name given
-        objname = kapp->instanceName() + "-mainwindow#";
+        objname = tdeApp->instanceName() + "-mainwindow#";
         s = objname + '1'; // start adding number immediately
         unusedNumber = 1;
         }
@@ -213,7 +213,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
         unusedNumber = 0; // add numbers only when needed
         }
     for(;;) {
-        TQWidgetList* list = kapp->topLevelWidgets();
+        TQWidgetList* list = tdeApp->topLevelWidgets();
         TQWidgetListIt it( *list );
         bool found = false;
         for( TQWidget* w = it.current();
@@ -246,13 +246,13 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
     d->shuttingDown = false;
     if ((d->care_about_geometry = being_first)) {
         being_first = false;
-        if ( kapp->geometryArgument().isNull() ) // if there is no geometry, it doesn't matter
+        if ( tdeApp->geometryArgument().isNull() ) // if there is no geometry, it doesn't matter
             d->care_about_geometry = false;
         else
             parseGeometry(false);
     }
 
-    setCaption( kapp->caption() );
+    setCaption( tdeApp->caption() );
     if ( cflags & NoDCOPObject)
         d->m_interface = 0;
     else
@@ -260,13 +260,13 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
 
     if ( cflags & NewRefCountMode ) {
         d->newStyleRefCounting = true;
-        kapp->ref();
+        tdeApp->ref();
     }
     else {
         d->newStyleRefCounting = false;
     }
 
-    if (!kapp->authorize("movable_toolbars"))
+    if (!tdeApp->authorize("movable_toolbars"))
         setDockWindowsMovable(false);
 }
 
@@ -287,13 +287,13 @@ void TDEMainWindow::setupToolbarMenuActions()
 
 void TDEMainWindow::parseGeometry(bool parsewidth)
 {
-    assert ( !kapp->geometryArgument().isNull() );
+    assert ( !tdeApp->geometryArgument().isNull() );
     assert ( d->care_about_geometry );
 
 #if defined TQ_WS_X11
     int x, y;
     int w, h;
-    int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
+    int m = XParseGeometry( tdeApp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
     if (parsewidth) {
         TQSize minSize = minimumSize();
         TQSize maxSize = maximumSize();
@@ -360,9 +360,9 @@ TDEPopupMenu* TDEMainWindow::customHelpMenu( bool showWhatsThis )
 
 bool TDEMainWindow::canBeRestored( int number )
 {
-    if ( !kapp->isRestored() )
+    if ( !tdeApp->isRestored() )
         return false;
-    TDEConfig *config = kapp->sessionConfig();
+    TDEConfig *config = tdeApp->sessionConfig();
     if ( !config )
         return false;
     config->setGroup( TQString::fromLatin1("Number") );
@@ -372,9 +372,9 @@ bool TDEMainWindow::canBeRestored( int number )
 
 const TQString TDEMainWindow::classNameOfToplevel( int number )
 {
-    if ( !kapp->isRestored() )
+    if ( !tdeApp->isRestored() )
         return TQString::null;
-    TDEConfig *config = kapp->sessionConfig();
+    TDEConfig *config = tdeApp->sessionConfig();
     if ( !config )
         return TQString::null;
     TQString s;
@@ -421,7 +421,7 @@ bool TDEMainWindow::restore( int number, bool show )
 {
     if ( !canBeRestored( number ) )
         return false;
-    TDEConfig *config = kapp->sessionConfig();
+    TDEConfig *config = tdeApp->sessionConfig();
     if ( readPropertiesInternal( config, number ) ){
         if ( show )
             TDEMainWindow::show();
@@ -589,12 +589,12 @@ bool TDEMainWindow::isHelpMenuEnabled()
 
 void TDEMainWindow::setCaption( const TQString &caption )
 {
-    setPlainCaption( kapp->makeStdCaption(caption) );
+    setPlainCaption( tdeApp->makeStdCaption(caption) );
 }
 
 void TDEMainWindow::setCaption( const TQString &caption, bool modified )
 {
-    setPlainCaption( kapp->makeStdCaption(caption, true, modified) );
+    setPlainCaption( tdeApp->makeStdCaption(caption, true, modified) );
 }
 
 void TDEMainWindow::setPlainCaption( const TQString &caption )
@@ -657,11 +657,11 @@ void TDEMainWindow::closeEvent ( TQCloseEvent *e )
         }
 
         if ( !no_query_exit && not_withdrawn <= 0 ) { // last window close accepted?
-            if ( queryExit() && !kapp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app?
+            if ( queryExit() && !tdeApp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app?
                 // don't call queryExit() twice
-                disconnect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
+                disconnect(tdeApp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
                 d->shuttingDown = true;
-                kapp->deref();             // ...and quit application.
+                tdeApp->deref();             // ...and quit application.
             }  else {
                 // cancel closing, it's stupid to end up with no windows at all....
                 e->ignore();
@@ -1216,7 +1216,7 @@ TQSize TDEMainWindow::sizeForCentralWidgetSize(TQSize size)
             break;
 
           case TDEToolBar::Flat:
-            size += TQSize(0, 3+kapp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
+            size += TQSize(0, 3+tdeApp->style().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
             break;
 
           default: