Rename TDEApplication::kApplication() to TDEApplication::tdeApplication() and kapp to tdeApp.rename/kapp-tdeapp

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

6 files changed, 12 insertions, 12 deletions

diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 7e51396c1..9a8a2b3ed 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -212,7 +212,7 @@ void KComboBoxTest::slotReturnPressed(const TQString& item)
 
 void KComboBoxTest::quitApp()
 {
-  kapp->closeAllWindows();
+  tdeApp->closeAllWindows();
 }
 
 int main ( int argc, char **argv)
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index ba3f97d74..e1583fa4a 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -81,7 +81,7 @@ static const char *preview_xpm[] = {
 SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const char* name )
 :TQDialog(0L,name,true)
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup( TQString::fromLatin1("SFileDialogData:") + name );
   if ( initially.isNull() ){
     initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() );
@@ -166,7 +166,7 @@ void SFileDialog::dockChange()
 
 SFileDialog::~SFileDialog()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
   config->setGroup( TQString("SFileDialogData:") + name() );
   config->writeEntry( "Bookmarks", fd->getBookmark() );
 
@@ -188,7 +188,7 @@ void SFileDialog::setDockDefaultPos( KDockWidget* d )
 void SFileDialog::changeDir( const TQString& f )
 {
   if ( !f.isEmpty() ){
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup( TQString("SFileDialogData:") + name() );
     config->writePathEntry( "InitiallyDir", f );
   }
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index e9601ccec..e22ea882e 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -65,7 +65,7 @@ KLineEditTest::~KLineEditTest()
 
 void KLineEditTest::quitApp()
 {
-    kapp->closeAllWindows();
+    tdeApp->closeAllWindows();
 }
 
 void KLineEditTest::show()
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index a2bb2b6e8..47b432a37 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -22,7 +22,7 @@ testWindow::testWindow (TQWidget *, const char *name)
     menuBar = new KMenuBar (this);
     fileMenu = new TQPopupMenu;
     menuBar->insertItem ("&File", fileMenu);
-    fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
+    fileMenu->insertItem ("&Exit", tdeApp,
                           TQ_SLOT( quit() ), ALT + Key_Q );
     statusbar = new KStatusBar (this);
     statusbar->insertItem("Zoom: XXXX", 0);
@@ -41,7 +41,7 @@ testWindow::testWindow (TQWidget *, const char *name)
 
     setCentralWidget(widget);
 
-    setCaption( TDEApplication::kApplication()->caption() );
+    setCaption( tdeApp->caption() );
 
     smenu = new TQPopupMenu;
   
diff --git a/tdeui/tests/tdemainwindowrestoretest.cpp b/tdeui/tests/tdemainwindowrestoretest.cpp
index 559348ec0..453550b16 100644
--- a/tdeui/tests/tdemainwindowrestoretest.cpp
+++ b/tdeui/tests/tdemainwindowrestoretest.cpp
@@ -16,7 +16,7 @@ int main( int argc, char * argv[] ) {
 
   TDEApplication app( argc, argv, "tdemainwindowrestoretest" );
 
-  if ( kapp->isRestored() ) {
+  if ( tdeApp->isRestored() ) {
     kRestoreMainWindows< MainWin1, MainWin2, MainWin3 >();
     kRestoreMainWindows< MainWin4, MainWin5 >();
     RESTORE(MainWin6);
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index 8fd5170e0..2f43c15d8 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -55,7 +55,7 @@ setAutoSaveSettings();
     menuBar->insertItem ("&File", fileMenu);
     // We insert item "Exit" with accelerator ALT-Q, and connect
     // it to application's exit-slot.
-    fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
+    fileMenu->insertItem ("&Exit", tdeApp,
                           TQ_SLOT( quit() ), ALT + Key_Q );
 
     // Another popup...
@@ -148,7 +148,7 @@ setAutoSaveSettings();
 
     // Now add another button and align it right
     pix = BarIcon("system-log-out");
-    tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(),
+    tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), tdeApp,
                           TQ_SLOT( quit() ), true, "Exit");
     tb->alignItemRight (6);
 
@@ -291,7 +291,7 @@ void testWindow::slotGoGoGoo()
 
 void testWindow::slotSave()
 {
-  kapp->beep();
+  tdeApp->beep();
   statusBar->changeItem("Saving properties...", 0);
 }
 
@@ -408,7 +408,7 @@ void testWindow::slotExit ()
    {
      TQPixmap pix;
      pix = BarIcon("system-log-out");
-     tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(),
+     tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), tdeApp,
                            TQ_SLOT( quit() ), true, "Exit");
      tb->alignItemRight (6);
      exitB = true;