1 files changed, 23 insertions, 23 deletions

diff --git a/kviewshell/kviewshell.cpp b/kviewshell/kviewshell.cpp
index 1a29eb71..a759ddeb 100644
--- a/kviewshell/kviewshell.cpp
+++ b/kviewshell/kviewshell.cpp
@@ -13,7 +13,7 @@
 #include <tqregexp.h>
 
 #include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
@@ -55,13 +55,13 @@ KViewShell::KViewShell(const TQString& defaultMimeType)
   if (factory) {
     if (defaultMimeType == TQString())
     {
-      view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart");
+      view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart");
     }
     else
     {
       TQStringList args;
       args << defaultMimeType;
-      view = (KViewPart_Iface*) factory->create(TQT_TQOBJECT(this), "kviewerpart", "KViewPart", args);
+      view = (KViewPart_Iface*) factory->create(this, "kviewerpart", "KViewPart", args);
     }
     if (!view)
       ::exit(-1);
@@ -73,33 +73,33 @@ KViewShell::KViewShell(const TQString& defaultMimeType)
   setCentralWidget(view->widget());
 
   // file menu
-  KStdAction::open(TQT_TQOBJECT(view), TQT_SLOT(slotFileOpen()), actionCollection());
-  recent = KStdAction::openRecent (TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL &)), actionCollection());
-  reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQT_SLOT(reload()), actionCollection(), "reload");
-  closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection());
-  KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+  KStdAction::open(view, TQ_SLOT(slotFileOpen()), actionCollection());
+  recent = KStdAction::openRecent (this, TQ_SLOT(openURL(const KURL &)), actionCollection());
+  reloadAction = new TDEAction(i18n("Reload"), "reload", CTRL + Key_R, view, TQ_SLOT(reload()), actionCollection(), "reload");
+  closeAction = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection());
+  KStdAction::quit (this, TQ_SLOT(slotQuit()), actionCollection());
 
-  connect(view, TQT_SIGNAL(fileOpened()), this, TQT_SLOT(addRecentFile()));
+  connect(view, TQ_SIGNAL(fileOpened()), this, TQ_SLOT(addRecentFile()));
 
   // view menu
-  fullScreenAction = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" );
+  fullScreenAction = KStdAction::fullScreen(this, TQ_SLOT(slotFullScreen()), actionCollection(), this, "fullscreen" );
 
   // settings menu
   createStandardStatusBarAction();
 
   setStandardToolBarMenuEnabled(true);
 
-  KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection());
-  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbar()), actionCollection());
+  KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection());
+  KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbar()), actionCollection());
 
   // statusbar connects
-  connect( view, TQT_SIGNAL( zoomChanged(const TQString &) ), this,TQT_SLOT( slotChangeZoomText(const TQString &) ) );
-  connect( view, TQT_SIGNAL( pageChanged(const TQString &) ), this,TQT_SLOT( slotChangePageText(const TQString &) ) );
-  connect( view, TQT_SIGNAL( sizeChanged(const TQString &) ), this,TQT_SLOT( slotChangeSizeText(const TQString &) ) );
+  connect( view, TQ_SIGNAL( zoomChanged(const TQString &) ), this,TQ_SLOT( slotChangeZoomText(const TQString &) ) );
+  connect( view, TQ_SIGNAL( pageChanged(const TQString &) ), this,TQ_SLOT( slotChangePageText(const TQString &) ) );
+  connect( view, TQ_SIGNAL( sizeChanged(const TQString &) ), this,TQ_SLOT( slotChangeSizeText(const TQString &) ) );
 
   // Setup session management
-  connect( this, TQT_SIGNAL( restoreDocument(const KURL &, int) ), view, TQT_SLOT( restoreDocument(const KURL &, int)));
-  connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), view, TQT_SLOT( saveDocumentRestoreInfo(TDEConfig*)));
+  connect( this, TQ_SIGNAL( restoreDocument(const KURL &, int) ), view, TQ_SLOT( restoreDocument(const KURL &, int)));
+  connect( this, TQ_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), view, TQ_SLOT( saveDocumentRestoreInfo(TDEConfig*)));
 
   setXMLFile( "kviewshell.rc" );
   createGUI(view);
@@ -120,7 +120,7 @@ KViewShell::KViewShell(const TQString& defaultMimeType)
   statusBar()->changeItem("", StatusBar_ID_Zoom);
   statusBar()->insertItem(view->pageSizeDescription(), StatusBar_ID_PageSize, 0, true);
 
-  connect( view, TQT_SIGNAL(pluginChanged(KParts::Part*)), this, TQT_SLOT(createGUI(KParts::Part*)));
+  connect( view, TQ_SIGNAL(pluginChanged(KParts::Part*)), this, TQ_SLOT(createGUI(KParts::Part*)));
 }
 
 
@@ -158,8 +158,8 @@ void KViewShell::slotQuit()
     menuBar()->show();
     view->slotSetFullPage(false); 
   }
-  kapp->closeAllWindows();
-  kapp->quit();
+  tdeApp->closeAllWindows();
+  tdeApp->quit();
 }
 
 
@@ -168,7 +168,7 @@ void KViewShell::readSettings()
   resize(600, 300); // default size if the config file specifies no size
   setAutoSaveSettings( "General" ); // apply mainwindow settings (size, toolbars, etc.)
 
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup("General");
 
   recent->loadEntries(config, "Recent Files");
@@ -191,7 +191,7 @@ void KViewShell::readSettings()
 
 void KViewShell::writeSettings()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "General" );
   recent->saveEntries(config, "Recent Files");
 
@@ -290,7 +290,7 @@ void KViewShell::slotEditToolbar()
 {
   saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
   KEditToolbar dlg(factory());
-  connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_SLOT( slotNewToolbarConfig() ) );
+  connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), TQ_SLOT( slotNewToolbarConfig() ) );
   dlg.exec();
 }