TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 24 insertions, 24 deletions

diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 66bf89d2..3af1af3b 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -61,7 +61,7 @@ KompareShell::KompareShell()
 	setupStatusBar();
 
 	KTrader::OfferList offers = KTrader::self()->query( "text/x-diff",
-	    "Kompare/ViewPart", TQString::null, TQString::null );
+	    "Kompare/ViewPart", TQString(), TQString() );
 #ifdef NDEBUG
 	for( int i = 0; i < offers.count(); i++ )
 	{
@@ -86,7 +86,7 @@ KompareShell::KompareShell()
 		m_mainViewDock = createDockWidget( "View", kapp->icon() );
 		// now that the Part is loaded, we cast it to a KomparePart to get
 		// our hands on it
-		m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(m_mainViewDock,
+		m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(TQT_TQOBJECT(m_mainViewDock),
 		              "kompare_part", "KParts::ReadWritePart" ));
 
 		if ( m_viewPart )
@@ -108,7 +108,7 @@ KompareShell::KompareShell()
 	}
 
 	offers.clear();
-	offers = KTrader::self()->query( "text/x-diff", "KParts/ReadOnlyPart", "'Kompare/NavigationPart' in ServiceTypes", TQString::null );
+	offers = KTrader::self()->query( "text/x-diff", "KParts/ReadOnlyPart", "'Kompare/NavigationPart' in ServiceTypes", TQString() );
 	if ( offers.count() == 0 )
 	{
 		KMessageBox::error(this, i18n( "Could not find our KompareNavigationPart." ) );
@@ -122,7 +122,7 @@ KompareShell::KompareShell()
 	{
 		m_navTreeDock = createDockWidget( "Navigation", kapp->icon() );
 
-		m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(m_navTreeDock,
+		m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(TQT_TQOBJECT(m_navTreeDock),
 		                 "komparenavtreepart", "KParts::ReadOnlyPart" ));
 
 		if ( m_navTreePart )
@@ -171,9 +171,9 @@ KompareShell::KompareShell()
 
 	// Hook up the KomparePart -> KompareShell communication
 	connect( m_viewPart, TQT_SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ),
-	         this, TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) );
+	         TQT_TQOBJECT(this), TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) );
 	connect( m_viewPart, TQT_SIGNAL( setStatusBarText(const TQString&) ),
-	         this, TQT_SLOT( slotSetStatusBarText(const TQString&) ) );
+	         TQT_TQOBJECT(this), TQT_SLOT( slotSetStatusBarText(const TQString&) ) );
 
 	// Read basic main-view settings, and set to autosave
 	setAutoSaveSettings( "General Options" );
@@ -228,26 +228,26 @@ void KompareShell::blend( const KURL& url1, const KURL& diff )
 
 void KompareShell::setupActions()
 {
-	KAction* open = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
+	KAction* open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
 	open->setText( i18n( "&Open Diff..." ) );
-	new KAction( i18n("&Compare Files..."), "fileopen", Qt::CTRL + Qt::Key_C,
-	              this, TQT_SLOT(slotFileCompareFiles()),
+	new KAction( i18n("&Compare Files..."), "fileopen", TQt::CTRL + TQt::Key_C,
+	              TQT_TQOBJECT(this), TQT_SLOT(slotFileCompareFiles()),
 	              actionCollection(), "file_compare_files" );
-	new KAction( i18n("&Blend URL with Diff..."), "fileblend", Qt::CTRL + Qt::Key_B,
-	              this, TQT_SLOT(slotFileBlendURLAndDiff()),
+	new KAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B,
+	              TQT_TQOBJECT(this), TQT_SLOT(slotFileBlendURLAndDiff()),
 	              actionCollection(), "file_blend_url" );
-	KStdAction::quit( this, TQT_SLOT( slotFileClose() ), actionCollection() );
+	KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection() );
 
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
 	createStandardStatusBarAction();
 #endif
 	setStandardToolBarMenuEnabled(true);
-	m_showTextView = new KToggleAction( i18n("Show T&ext View"), 0, this, TQT_SLOT(slotShowTextView()),
+	m_showTextView = new KToggleAction( i18n("Show T&ext View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTextView()),
 	                                  actionCollection(), "options_show_text_view" );
         m_showTextView->setCheckedState(i18n("Hide T&ext View"));
 
-	KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-	KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+	KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
 void KompareShell::setupStatusBar()
@@ -258,7 +258,7 @@ void KompareShell::setupStatusBar()
 
 	m_generalLabel = new KSqueezedTextLabel( "", 0, "general_statusbar_label" );
 	statusBar()->addWidget( m_generalLabel, 1, false );
-	m_generalLabel->setAlignment( Qt::AlignLeft );
+	m_generalLabel->tqsetAlignment( TQt::AlignLeft );
 }
 
 void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount )
@@ -269,13 +269,13 @@ void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int
 	TQString diffStr;
 
 	if ( modelIndex >= 0 )
-		fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).arg( modelIndex + 1 );
+		fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).tqarg( modelIndex + 1 );
 	else
 		fileStr = i18n( " %n file ", " %n files ", modelCount );
 
 	if ( differenceIndex >= 0 )
 		diffStr = i18n( " %1 of %n difference, %2 applied ", " %1 of %n differences, %2 applied ", differenceCount )
-		          .arg( differenceIndex + 1 ).arg( appliedCount );
+		          .tqarg( differenceIndex + 1 ).tqarg( appliedCount );
 	else
 		diffStr = i18n( " %n difference ", " %n differences ", differenceCount );
 
@@ -352,7 +352,7 @@ void KompareShell::readProperties(KConfig* config)
 void KompareShell::slotFileOpen()
 {
 	// FIXME: use different filedialog which gets encoding
-	KURL url = KFileDialog::getOpenURL( TQString::null, "text/x-diff", this );
+	KURL url = KFileDialog::getOpenURL( TQString(), "text/x-diff", this );
 	if( !url.isEmpty() ) {
 		KompareShell* shell = new KompareShell();
 		kapp->ref();
@@ -369,7 +369,7 @@ void KompareShell::slotFileBlendURLAndDiff()
 	dialog->setFirstGroupBoxTitle( i18n( "File/Folder" ) );
 	dialog->setSecondGroupBoxTitle( i18n( "Diff Output" ) );
 
-	KGuiItem blendGuiItem( i18n( "Blend" ), TQString::null, i18n( "Blend this file or folder with the diff output" ), i18n( "If you have entered a file or folder name and a file that contains diff output in the fields in this dialog then this button will be enabled and pressing it will open kompare's main view where the output of the entered file or files from the folder are mixed with the diff output so you can then apply the difference(s) to a file or to the files. " ) );
+	KGuiItem blendGuiItem( i18n( "Blend" ), TQString(), i18n( "Blend this file or folder with the diff output" ), i18n( "If you have entered a file or folder name and a file that contains diff output in the fields in this dialog then this button will be enabled and pressing it will open kompare's main view where the output of the entered file or files from the folder are mixed with the diff output so you can then apply the difference(s) to a file or to the files. " ) );
 	dialog->setButtonOK( blendGuiItem );
 
 	dialog->setGroup( "Recent Blend Files" );
@@ -398,7 +398,7 @@ void KompareShell::slotFileCompareFiles()
 	dialog->setFirstGroupBoxTitle( i18n( "Source" ) );
 	dialog->setSecondGroupBoxTitle( i18n( "Destination" ) );
 
-	KGuiItem compareGuiItem( i18n( "Compare" ), TQString::null, i18n( "Compare these files or folders" ), i18n( "If you have entered 2 filenames or 2 folders in the fields in this dialog then this button will be enabled and pressing it will start a comparison of the entered files or folders. " ) );
+	KGuiItem compareGuiItem( i18n( "Compare" ), TQString(), i18n( "Compare these files or folders" ), i18n( "If you have entered 2 filenames or 2 folders in the fields in this dialog then this button will be enabled and pressing it will start a comparison of the entered files or folders. " ) );
 	dialog->setButtonOK( compareGuiItem );
 
 	dialog->setGroup( "Recent Compare Files" );
@@ -438,15 +438,15 @@ void KompareShell::slotShowTextView()
 		// FIXME: proper error checking
 		m_textViewWidget = createDockWidget( i18n("Text View"), SmallIcon( "text") );
 		m_textViewPart = KParts::ComponentFactory::createPartInstanceFromQuery<KTextEditor::Document>(
-		                 TQString::fromLatin1("KTextEditor/Document"),
-		                 TQString::null, (TQWidget*)this, 0, (TQWidget*)this, 0, TQStringList(), &errCode );
+		                 TQString::tqfromLatin1("KTextEditor/Document"),
+		                 TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0, TQStringList(), &errCode );
 		if ( m_textViewPart )
 		{
 			m_textView = m_textViewPart->createView( this, 0 );
 			m_textViewWidget->setWidget( static_cast<TQWidget*>(m_textView) );
 			m_textEditIface = editInterface( m_textViewPart );
 			connect( m_viewPart, TQT_SIGNAL(diffString(const TQString&)),
-			         this, TQT_SLOT(slotSetDiffString(const TQString&)) );
+			         TQT_TQOBJECT(this), TQT_SLOT(slotSetDiffString(const TQString&)) );
 		}
 	}