1 files changed, 112 insertions, 112 deletions

diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 7a79bba..78cd0ed 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -357,7 +357,7 @@ void MainWindow::renameFile() {
 	} else {
 		url = mDocument->url();
 	}
-	FileOperation::rename(url, this, this, TQT_SLOT(slotRenamed(const TQString &)));
+	FileOperation::rename(url, this, this, TQ_SLOT(slotRenamed(const TQString &)));
 }
 
 
@@ -493,7 +493,7 @@ void MainWindow::openFileViewControllerContextMenu(const TQPoint& pos, bool onIt
 	actionCollection()->action("view_sort")->plug(&menu);
 	mGoUp->plug(&menu);
 
-	menu.insertItem(SmallIcon("folder-new"), i18n("New Folder..."), this, TQT_SLOT(makeDir()));
+	menu.insertItem(SmallIcon("folder-new"), i18n("New Folder..."), this, TQ_SLOT(makeDir()));
 
 	menu.insertSeparator();
 
@@ -664,12 +664,12 @@ void MainWindow::showConfigDialog() {
 #else
 	ConfigDialog dialog(this, 0);
 #endif
-	connect(&dialog, TQT_SIGNAL(settingsChanged()),
-		mSlideShow, TQT_SLOT(slotSettingsChanged()) );
-	connect(&dialog, TQT_SIGNAL(settingsChanged()),
-		mImageViewController, TQT_SLOT(updateFromSettings()) );
-	connect(&dialog, TQT_SIGNAL(settingsChanged()),
-		mFileViewController, TQT_SLOT(updateFromSettings()) );
+	connect(&dialog, TQ_SIGNAL(settingsChanged()),
+		mSlideShow, TQ_SLOT(slotSettingsChanged()) );
+	connect(&dialog, TQ_SIGNAL(settingsChanged()),
+		mImageViewController, TQ_SLOT(updateFromSettings()) );
+	connect(&dialog, TQ_SIGNAL(settingsChanged()),
+		mFileViewController, TQ_SLOT(updateFromSettings()) );
 	dialog.exec();
 }
 
@@ -690,7 +690,7 @@ void MainWindow::showKeyDialog() {
 void MainWindow::showToolBarDialog() {
 	saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
 	KEditToolbar dlg(actionCollection());
-	connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(applyMainWindowSettings()));
+	connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(applyMainWindowSettings()));
 	dlg.exec();
 }
 
@@ -880,15 +880,15 @@ void MainWindow::createWidgets() {
 	statusBar()->addWidget(mSBDetailLabel, 0);
 	statusBar()->addWidget(mSBHintLabel, 1);
 	mHintTimer=new TQTimer(this);
-	connect(mHintTimer, TQT_SIGNAL(timeout()),
-		mSBHintLabel, TQT_SLOT(clear()) );
+	connect(mHintTimer, TQ_SIGNAL(timeout()),
+		mSBHintLabel, TQ_SLOT(clear()) );
 
 	// Pixmap widget
 	mImageDock = mDockArea->createDockWidget("Image",SmallIcon("gwenview"),NULL,i18n("Image"));
 	mImageViewController=new ImageViewController(mImageDock, mDocument, actionCollection());
 	mImageDock->setWidget(mImageViewController->widget());
-	connect(mImageViewController, TQT_SIGNAL(requestHintDisplay(const TQString&)),
-		this, TQT_SLOT(showHint(const TQString&)) );
+	connect(mImageViewController, TQ_SIGNAL(requestHintDisplay(const TQString&)),
+		this, TQ_SLOT(showHint(const TQString&)) );
 
 	// Folder widget
 	mFolderDock = mDockArea->createDockWidget("Folders",SmallIcon("folder_open"),NULL,i18n("Folders"));
@@ -962,55 +962,55 @@ void MainWindow::createWidgets() {
  */
 void MainWindow::createActions() {
 	// Stack
-	mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, this, TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode");
+	mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, this, TQ_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode");
 	mSwitchToBrowseMode->setExclusiveGroup("centralStackMode");
 	mSwitchToBrowseMode->setChecked(true);
-	mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, this, TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode");
+	mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, this, TQ_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode");
 	mSwitchToViewMode->setExclusiveGroup("centralStackMode");
 	
 	// File
-	KStdAction::open(this,TQT_SLOT(showFileDialog()),actionCollection() );
-	mSaveFile=KStdAction::save(mDocument,TQT_SLOT(save()),actionCollection() );
-	mSaveFileAs=KStdAction::saveAs(mDocument,TQT_SLOT(saveAs()),actionCollection() );
-	mFilePrint = KStdAction::print(this, TQT_SLOT(printFile()), actionCollection());
-	mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,this,TQT_SLOT(renameFile()),actionCollection(),"file_rename");
-	mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,this,TQT_SLOT(copyFiles()),actionCollection(),"file_copy");
-	mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,this,TQT_SLOT(moveFiles()),actionCollection(),"file_move");
-	mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,this,TQT_SLOT(linkFiles()),actionCollection(),"file_link");
-	mDeleteFiles=new TDEAction(i18n("&Delete"),"edit-delete",Key_Delete,this,TQT_SLOT(deleteFiles()),actionCollection(),"file_delete");
-	mShowFileProperties=new TDEAction(i18n("Properties"),0,this,TQT_SLOT(showFileProperties()),actionCollection(),"file_properties");
-	KStdAction::quit( kapp, TQT_SLOT (closeAllWindows()), actionCollection() );
+	KStdAction::open(this,TQ_SLOT(showFileDialog()),actionCollection() );
+	mSaveFile=KStdAction::save(mDocument,TQ_SLOT(save()),actionCollection() );
+	mSaveFileAs=KStdAction::saveAs(mDocument,TQ_SLOT(saveAs()),actionCollection() );
+	mFilePrint = KStdAction::print(this, TQ_SLOT(printFile()), actionCollection());
+	mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,this,TQ_SLOT(renameFile()),actionCollection(),"file_rename");
+	mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,this,TQ_SLOT(copyFiles()),actionCollection(),"file_copy");
+	mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,this,TQ_SLOT(moveFiles()),actionCollection(),"file_move");
+	mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,this,TQ_SLOT(linkFiles()),actionCollection(),"file_link");
+	mDeleteFiles=new TDEAction(i18n("&Delete"),"edit-delete",Key_Delete,this,TQ_SLOT(deleteFiles()),actionCollection(),"file_delete");
+	mShowFileProperties=new TDEAction(i18n("Properties"),0,this,TQ_SLOT(showFileProperties()),actionCollection(),"file_properties");
+	KStdAction::quit( kapp, TQ_SLOT (closeAllWindows()), actionCollection() );
 
 	// Edit
-	mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, this, TQT_SLOT(rotateLeft()),actionCollection(),"rotate_left");
-	mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, this, TQT_SLOT(rotateRight()),actionCollection(),"rotate_right");
-	mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, this, TQT_SLOT(mirror()),actionCollection(),"mirror");
-	mFlip=new TDEAction(i18n("&Flip"),"flip",0, this, TQT_SLOT(flip()),actionCollection(),"flip");
+	mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, this, TQ_SLOT(rotateLeft()),actionCollection(),"rotate_left");
+	mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, this, TQ_SLOT(rotateRight()),actionCollection(),"rotate_right");
+	mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, this, TQ_SLOT(mirror()),actionCollection(),"mirror");
+	mFlip=new TDEAction(i18n("&Flip"),"flip",0, this, TQ_SLOT(flip()),actionCollection(),"flip");
 
 	// View
-	mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQT_SLOT(reload()), actionCollection(), "reload");
+	mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQ_SLOT(reload()), actionCollection(), "reload");
 	mReload->setEnabled(false);
 
-	mToggleFullScreen= KStdAction::fullScreen(this,TQT_SLOT(toggleFullScreen()),actionCollection(),0);
-	mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,this,TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow");
+	mToggleFullScreen= KStdAction::fullScreen(this,TQ_SLOT(toggleFullScreen()),actionCollection(),0);
+	mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,this,TQ_SLOT(toggleSlideShow()),actionCollection(),"slideshow");
 	mFullScreenLabelAction=new TDEToolBarLabelAction("", 0, 0, 0, actionCollection(), "fullscreen_label");
   
 	// Go
-	mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, this, TQT_SLOT(goUp()), actionCollection(), "go_up");
-	new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), this, TQT_SLOT(goHome()), actionCollection(), "go_home");
+	mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, this, TQ_SLOT(goUp()), actionCollection(), "go_up");
+	new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), this, TQ_SLOT(goHome()), actionCollection(), "go_home");
 
 	// Window
-	mResetDockWidgets = new TDEAction(i18n("Reset"), 0, this, TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets");
+	mResetDockWidgets = new TDEAction(i18n("Reset"), 0, this, TQ_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets");
 
 	// Settings
 	mShowConfigDialog=
-		KStdAction::preferences(this, TQT_SLOT(showConfigDialog()), actionCollection() );
+		KStdAction::preferences(this, TQ_SLOT(showConfigDialog()), actionCollection() );
 	mShowKeyDialog=
-		KStdAction::keyBindings(this, TQT_SLOT(showKeyDialog()), actionCollection() );
+		KStdAction::keyBindings(this, TQ_SLOT(showKeyDialog()), actionCollection() );
 	(void)new TDEAction(i18n("Configure External Tools..."), "configure", 0,
-		this, TQT_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools");
+		this, TQ_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools");
 	(void)KStdAction::configureToolbars(
-		this, TQT_SLOT(showToolBarDialog()), actionCollection() );
+		this, TQ_SLOT(showToolBarDialog()), actionCollection() );
 
 	actionCollection()->readShortcutSettings();
 }
@@ -1059,11 +1059,11 @@ void MainWindow::createObjectInteractions() {
 	}
 
 	// Make sure file actions are correctly updated
-	connect(mFileViewController, TQT_SIGNAL(selectionChanged()),
-		this, TQT_SLOT(updateImageActions()) );
+	connect(mFileViewController, TQ_SIGNAL(selectionChanged()),
+		this, TQ_SLOT(updateImageActions()) );
 
-	connect(mFileViewController, TQT_SIGNAL(requestContextMenu(const TQPoint&, bool)),
-		this, TQT_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) );
+	connect(mFileViewController, TQ_SIGNAL(requestContextMenu(const TQPoint&, bool)),
+		this, TQ_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) );
 
 	// Bookmarks
 	TQString file = locate( "data", "tdefile/bookmarks.xml" );
@@ -1081,11 +1081,11 @@ void MainWindow::createObjectInteractions() {
 	TDEActionMenu* bookmark=new TDEActionMenu(i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" );
 	new KBookmarkMenu(manager, bookmarkOwner, bookmark->popupMenu(), 0, true);
 
-	connect(bookmarkOwner,TQT_SIGNAL(openURL(const KURL&)),
-		mFileViewController,TQT_SLOT(setDirURL(const KURL&)) );
+	connect(bookmarkOwner,TQ_SIGNAL(openURL(const KURL&)),
+		mFileViewController,TQ_SLOT(setDirURL(const KURL&)) );
 
-	connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)),
-		bookmarkOwner,TQT_SLOT(setURL(const KURL&)) );
+	connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)),
+		bookmarkOwner,TQ_SLOT(setURL(const KURL&)) );
 }
 
 
@@ -1097,7 +1097,7 @@ void MainWindow::createHideShowAction(KDockWidget* dock) {
 		caption=i18n("Show %1").arg(dock->caption());
 	}
 
-	TDEAction* action=new TDEAction(caption, 0, dock, TQT_SLOT(changeHideShowState()), (TQObject*)0 );
+	TDEAction* action=new TDEAction(caption, 0, dock, TQ_SLOT(changeHideShowState()), (TQObject*)0 );
 	if (dock->icon()) {
 		action->setIconSet( TQIconSet(*dock->icon()) );
 	}
@@ -1116,91 +1116,91 @@ void MainWindow::updateWindowActions() {
 
 
 void MainWindow::createConnections() {
-	connect(mGoUp->popupMenu(), TQT_SIGNAL(aboutToShow()),
-		this,TQT_SLOT(fillGoUpMenu()));
+	connect(mGoUp->popupMenu(), TQ_SIGNAL(aboutToShow()),
+		this,TQ_SLOT(fillGoUpMenu()));
 	
-	connect(mGoUp->popupMenu(), TQT_SIGNAL(activated(int)),
-		this,TQT_SLOT(goUpTo(int)));
+	connect(mGoUp->popupMenu(), TQ_SIGNAL(activated(int)),
+		this,TQ_SLOT(goUpTo(int)));
 	
 	// Slideshow connections
-	connect( mSlideShow, TQT_SIGNAL(nextURL(const KURL&)),
-		TQT_SLOT( openURL(const KURL&)) );
-	connect( mSlideShow, TQT_SIGNAL( stateChanged(bool)),
-		TQT_SLOT( slotSlideShowChanged(bool)) );
+	connect( mSlideShow, TQ_SIGNAL(nextURL(const KURL&)),
+		TQ_SLOT( openURL(const KURL&)) );
+	connect( mSlideShow, TQ_SIGNAL( stateChanged(bool)),
+		TQ_SLOT( slotSlideShowChanged(bool)) );
 
 	// Dir view connections
-	connect(mDirViewController, TQT_SIGNAL(urlChanged(const KURL&)),
-		mFileViewController, TQT_SLOT(setDirURL(const KURL&)) );
-	connect(mDirViewController, TQT_SIGNAL(urlRenamed(const KURL&, const KURL&)),
-		this, TQT_SLOT(slotDirRenamed(const KURL&, const KURL&)) );
+	connect(mDirViewController, TQ_SIGNAL(urlChanged(const KURL&)),
+		mFileViewController, TQ_SLOT(setDirURL(const KURL&)) );
+	connect(mDirViewController, TQ_SIGNAL(urlRenamed(const KURL&, const KURL&)),
+		this, TQ_SLOT(slotDirRenamed(const KURL&, const KURL&)) );
 
 	// Bookmark view connections
-	connect(mBookmarkViewController, TQT_SIGNAL(openURL(const KURL&)),
-		mFileViewController,TQT_SLOT(setDirURL(const KURL&)) );
-	connect(mFileViewController, TQT_SIGNAL(directoryChanged(const KURL&)),
-		mBookmarkViewController, TQT_SLOT(setURL(const KURL&)) );
+	connect(mBookmarkViewController, TQ_SIGNAL(openURL(const KURL&)),
+		mFileViewController,TQ_SLOT(setDirURL(const KURL&)) );
+	connect(mFileViewController, TQ_SIGNAL(directoryChanged(const KURL&)),
+		mBookmarkViewController, TQ_SLOT(setURL(const KURL&)) );
 
 	// Pixmap view connections
-	connect(mImageViewController, TQT_SIGNAL(selectPrevious()),
-		mFileViewController, TQT_SLOT(slotSelectPrevious()) );
-	connect(mImageViewController, TQT_SIGNAL(selectNext()),
-		mFileViewController, TQT_SLOT(slotSelectNext()) );
-	connect(mImageViewController, TQT_SIGNAL(doubleClicked()),
-		mToggleFullScreen, TQT_SLOT(activate()) );
+	connect(mImageViewController, TQ_SIGNAL(selectPrevious()),
+		mFileViewController, TQ_SLOT(slotSelectPrevious()) );
+	connect(mImageViewController, TQ_SIGNAL(selectNext()),
+		mFileViewController, TQ_SLOT(slotSelectNext()) );
+	connect(mImageViewController, TQ_SIGNAL(doubleClicked()),
+		mToggleFullScreen, TQ_SLOT(activate()) );
 
 	// File view connections
-	connect(mFileViewController,TQT_SIGNAL(urlChanged(const KURL&)),
-		mDocument,TQT_SLOT(setURL(const KURL&)) );
-	connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)),
-		this,TQT_SLOT(slotDirURLChanged(const KURL&)) );
-	connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)),
-		mDirViewController,TQT_SLOT(setURL(const KURL&)) );
-	connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)),
-		mHistory,TQT_SLOT(addURLToHistory(const KURL&)) );
-
-	connect(mFileViewController,TQT_SIGNAL(completed()),
-		this,TQT_SLOT(updateStatusInfo()) );
-	connect(mFileViewController,TQT_SIGNAL(canceled()),
-		this,TQT_SLOT(updateStatusInfo()) );
-	connect(mFileViewController,TQT_SIGNAL(imageDoubleClicked()),
-		mToggleFullScreen,TQT_SLOT(activate()) );
-	connect(mFileViewController,TQT_SIGNAL(shownFileItemRefreshed(const KFileItem*)),
-		this,TQT_SLOT(slotShownFileItemRefreshed(const KFileItem*)) );
-	connect(mFileViewController,TQT_SIGNAL(sortingChanged()),
-		this, TQT_SLOT(updateStatusInfo()) );
+	connect(mFileViewController,TQ_SIGNAL(urlChanged(const KURL&)),
+		mDocument,TQ_SLOT(setURL(const KURL&)) );
+	connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)),
+		this,TQ_SLOT(slotDirURLChanged(const KURL&)) );
+	connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)),
+		mDirViewController,TQ_SLOT(setURL(const KURL&)) );
+	connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)),
+		mHistory,TQ_SLOT(addURLToHistory(const KURL&)) );
+
+	connect(mFileViewController,TQ_SIGNAL(completed()),
+		this,TQ_SLOT(updateStatusInfo()) );
+	connect(mFileViewController,TQ_SIGNAL(canceled()),
+		this,TQ_SLOT(updateStatusInfo()) );
+	connect(mFileViewController,TQ_SIGNAL(imageDoubleClicked()),
+		mToggleFullScreen,TQ_SLOT(activate()) );
+	connect(mFileViewController,TQ_SIGNAL(shownFileItemRefreshed(const KFileItem*)),
+		this,TQ_SLOT(slotShownFileItemRefreshed(const KFileItem*)) );
+	connect(mFileViewController,TQ_SIGNAL(sortingChanged()),
+		this, TQ_SLOT(updateStatusInfo()) );
 
 	// History connections
-	connect(mHistory, TQT_SIGNAL(urlChanged(const KURL&)),
-		mFileViewController, TQT_SLOT(setDirURL(const KURL&)) );
+	connect(mHistory, TQ_SIGNAL(urlChanged(const KURL&)),
+		mFileViewController, TQ_SLOT(setDirURL(const KURL&)) );
 	
 	// Document connections
-	connect(mDocument,TQT_SIGNAL(loading()),
-		this,TQT_SLOT(slotImageLoading()) );
-	connect(mDocument,TQT_SIGNAL(loaded(const KURL&)),
-		this,TQT_SLOT(slotImageLoaded()) );
-	connect(mDocument,TQT_SIGNAL(saved(const KURL&)),
-		mFileViewController,TQT_SLOT(updateThumbnail(const KURL&)) );
-	connect(mDocument,TQT_SIGNAL(reloaded(const KURL&)),
-		mFileViewController,TQT_SLOT(updateThumbnail(const KURL&)) );
+	connect(mDocument,TQ_SIGNAL(loading()),
+		this,TQ_SLOT(slotImageLoading()) );
+	connect(mDocument,TQ_SIGNAL(loaded(const KURL&)),
+		this,TQ_SLOT(slotImageLoaded()) );
+	connect(mDocument,TQ_SIGNAL(saved(const KURL&)),
+		mFileViewController,TQ_SLOT(updateThumbnail(const KURL&)) );
+	connect(mDocument,TQ_SIGNAL(reloaded(const KURL&)),
+		mFileViewController,TQ_SLOT(updateThumbnail(const KURL&)) );
 
 	// Location bar
-	connect(mURLEdit, TQT_SIGNAL(activated(const TQString &)),
-		this,TQT_SLOT(slotGo()) );
-	connect(mURLEdit, TQT_SIGNAL(returnPressed()),
-		this,TQT_SLOT(slotGo()) );
+	connect(mURLEdit, TQ_SIGNAL(activated(const TQString &)),
+		this,TQ_SLOT(slotGo()) );
+	connect(mURLEdit, TQ_SIGNAL(returnPressed()),
+		this,TQ_SLOT(slotGo()) );
 
 	// Non configurable stop-fullscreen accel
 	TQAccel* accel=new TQAccel(this);
-	accel->connectItem(accel->insertItem(Key_Escape),this,TQT_SLOT(escapePressed()));
+	accel->connectItem(accel->insertItem(Key_Escape),this,TQ_SLOT(escapePressed()));
 
 	// Dock related
-	connect(mDockArea->manager(), TQT_SIGNAL(change()),
-		this, TQT_SLOT(updateWindowActions()) );
+	connect(mDockArea->manager(), TQ_SIGNAL(change()),
+		this, TQ_SLOT(updateWindowActions()) );
 
 	// Plugin menu
 	TQPopupMenu *popup = static_cast<TQPopupMenu*>(
 		factory()->container( "plugins", this));
-    connect(popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(loadPlugins()) );
+    connect(popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(loadPlugins()) );
 }
 
 
@@ -1232,15 +1232,15 @@ void MainWindow::createLocationToolBar() {
 	// Clear button
 	(void)new TDEAction( i18n("Clear Location Bar"),
 		TQApplication::reverseLayout()?"clear_left" : "locationbar_erase",
-		0, this, TQT_SLOT(clearLocationLabel()), actionCollection(), "clear_location");
+		0, this, TQ_SLOT(clearLocationLabel()), actionCollection(), "clear_location");
 
 	// URL Label
 	TDEToolBarLabelAction* locationAction = new TDEToolBarLabelAction(i18n("L&ocation:"), 
-		Key_F6, this, TQT_SLOT( activateLocationLabel()), actionCollection(), "location_label");
+		Key_F6, this, TQ_SLOT( activateLocationLabel()), actionCollection(), "location_label");
 	locationAction->setBuddy(mURLEdit);
 
 	// Go button
-	(void)new TDEAction(i18n("Go"), "key_enter", 0, this, TQT_SLOT(slotGo()), actionCollection(), "location_go");
+	(void)new TDEAction(i18n("Go"), "key_enter", 0, this, TQ_SLOT(slotGo()), actionCollection(), "location_go");
 
 }
 
@@ -1266,7 +1266,7 @@ void MainWindow::loadPlugins() {
 	// Sets up the plugin interface, and load the plugins
 	KIPIInterface* interface = new KIPIInterface(this, mFileViewController);
 	mPluginLoader = new KIPI::PluginLoader(TQStringList(), interface );
-	connect( mPluginLoader, TQT_SIGNAL( replug() ), this, TQT_SLOT( slotReplug() ) );
+	connect( mPluginLoader, TQ_SIGNAL( replug() ), this, TQ_SLOT( slotReplug() ) );
 	mPluginLoader->loadPlugins();
 }