Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 25 insertions, 25 deletions

diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index 09e1b4f5d..3755fed05 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -85,19 +85,19 @@ KTNEFMain::~KTNEFMain()
 void KTNEFMain::setupActions()
 {
 	// File menu
-	KStdAction::open(this, TQT_SLOT(openFile()), actionCollection());
-	KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+	KStdAction::open(this, TQ_SLOT(openFile()), actionCollection());
+	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 
 	// Action menu
-	new TDEAction(i18n("View"), TQString("viewmag"), 0, this, TQT_SLOT(viewFile()), actionCollection(), "view_file");
-	new TDEAction(i18n("View With..."), TQString("package_applications"), 0, this, TQT_SLOT(viewFileAs()), actionCollection(), "view_file_as");
-	new TDEAction(i18n("Extract"), 0, this, TQT_SLOT(extractFile()), actionCollection(), "extract_file");
-	new TDEAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, this, TQT_SLOT(extractFileTo()), actionCollection(), "extract_file_to");
-	new TDEAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, this, TQT_SLOT(extractAllFiles()), actionCollection(), "extract_all_files");
-	new TDEAction( i18n( "Message Properties" ), "help", 0, this, TQT_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" );
-	new TDEAction(i18n("Properties"), TQString("contents"), 0, this, TQT_SLOT(propertiesFile()), actionCollection(), "properties_file");
-	new TDEAction( i18n( "Show Message Text" ), "mail_generic", 0, this, TQT_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" );
-	new TDEAction( i18n( "Save Message Text As..." ), "document-save", 0, this, TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" );
+	new TDEAction(i18n("View"), TQString("viewmag"), 0, this, TQ_SLOT(viewFile()), actionCollection(), "view_file");
+	new TDEAction(i18n("View With..."), TQString("package_applications"), 0, this, TQ_SLOT(viewFileAs()), actionCollection(), "view_file_as");
+	new TDEAction(i18n("Extract"), 0, this, TQ_SLOT(extractFile()), actionCollection(), "extract_file");
+	new TDEAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, this, TQ_SLOT(extractFileTo()), actionCollection(), "extract_file_to");
+	new TDEAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, this, TQ_SLOT(extractAllFiles()), actionCollection(), "extract_all_files");
+	new TDEAction( i18n( "Message Properties" ), "help", 0, this, TQ_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" );
+	new TDEAction(i18n("Properties"), TQString("contents"), 0, this, TQ_SLOT(propertiesFile()), actionCollection(), "properties_file");
+	new TDEAction( i18n( "Show Message Text" ), "mail_generic", 0, this, TQ_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" );
+	new TDEAction( i18n( "Save Message Text As..." ), "document-save", 0, this, TQ_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" );
 	actionCollection()->action("view_file")->setEnabled(false);
 	actionCollection()->action("view_file_as")->setEnabled(false);
 	actionCollection()->action("extract_file")->setEnabled(false);
@@ -106,12 +106,12 @@ void KTNEFMain::setupActions()
 	actionCollection()->action("properties_file")->setEnabled(false);
 
 	// Option menu
-	new TDEAction(i18n("Default Folder..."), TQString("folder_open"), 0, this, TQT_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir");
+	new TDEAction(i18n("Default Folder..."), TQString("folder_open"), 0, this, TQ_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir");
 
 	createStandardStatusBarAction();
 	setStandardToolBarMenuEnabled(true);
-	KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
-        KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() );
+	KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection());
+        KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() );
 
 	createGUI();
 }
@@ -135,10 +135,10 @@ void KTNEFMain::setupTNEF()
 	parser_ = new KTNEFParser;
 
 	setCentralWidget(view_);
-	connect(view_, TQT_SIGNAL(selectionChanged()), TQT_SLOT(viewSelectionChanged()));
-	connect(view_, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), TQT_SLOT(viewRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
-	connect(view_, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(viewDoubleClicked(TQListViewItem*)));
-	connect(view_, TQT_SIGNAL(dragRequested(const TQValueList<KTNEFAttach*>&)), TQT_SLOT(viewDragRequested(const TQValueList<KTNEFAttach*>&)));
+	connect(view_, TQ_SIGNAL(selectionChanged()), TQ_SLOT(viewSelectionChanged()));
+	connect(view_, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), TQ_SLOT(viewRightButtonPressed(TQListViewItem*,const TQPoint&,int)));
+	connect(view_, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(viewDoubleClicked(TQListViewItem*)));
+	connect(view_, TQ_SIGNAL(dragRequested(const TQValueList<KTNEFAttach*>&)), TQ_SLOT(viewDragRequested(const TQValueList<KTNEFAttach*>&)));
 }
 
 void KTNEFMain::loadFile(const TQString& filename)
@@ -321,16 +321,16 @@ void KTNEFMain::viewRightButtonPressed(TQListViewItem*, const TQPoint& p, int)
 	{
 		if (list->count() == 1u)
 		{
-			m.insertItem(SmallIcon("viewmag"), i18n("View"), this, TQT_SLOT(viewFile()));
-			m.insertItem(SmallIcon("package_applications"), i18n("View With..."), this, TQT_SLOT(viewFileAs()));
+			m.insertItem(SmallIcon("viewmag"), i18n("View"), this, TQ_SLOT(viewFile()));
+			m.insertItem(SmallIcon("package_applications"), i18n("View With..."), this, TQ_SLOT(viewFileAs()));
 			m.insertSeparator();
 		}
-		m.insertItem(i18n("Extract"), this, TQT_SLOT(extractFile()));
-		m.insertItem(SmallIcon("ktnef_extract_to"), i18n("Extract To..."), this, TQT_SLOT(extractFileTo()));
+		m.insertItem(i18n("Extract"), this, TQ_SLOT(extractFile()));
+		m.insertItem(SmallIcon("ktnef_extract_to"), i18n("Extract To..."), this, TQ_SLOT(extractFileTo()));
 		if (list->count() == 1u)
 		{
 			m.insertSeparator();
-			m.insertItem(SmallIcon("contents"), i18n("Properties"), this, TQT_SLOT(propertiesFile()));
+			m.insertItem(SmallIcon("contents"), i18n("Properties"), this, TQ_SLOT(propertiesFile()));
 		}
 	}
 	else if ( list->count() == 0 )
@@ -360,7 +360,7 @@ void KTNEFMain::slotEditToolbars()
 {
 	saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") );
 	KEditToolbar	dlg(actionCollection());
-	connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
+	connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() ));
 	dlg.exec();
 }
 
diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp
index a28a7d51f..058a11c2c 100644
--- a/ktnef/gui/ktnefview.cpp
+++ b/ktnef/gui/ktnefview.cpp
@@ -75,7 +75,7 @@ KTNEFView::KTNEFView(TQWidget *parent, const char *name)
 	setSelectionMode(TQListView::Extended);
 	setHScrollBarMode(TQScrollView::AlwaysOff);
 	setVScrollBarMode(TQScrollView::AlwaysOn);
-	TQTimer::singleShot( 0, this, TQT_SLOT(adjustColumnWidth()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(adjustColumnWidth()) );
 }
 
 KTNEFView::~KTNEFView()