Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdesdk

12 years ago · fdbcd3092e
parent 497ee97a3c f3480e99ff
commit fdbcd3092e
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 6b3a1fc54f258941ae7ae10909a23d32afee9df7
+Subproject commit 6868254e6c10ba5b95ef622b25c39144f3d1161a
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@ -162,7 +162,7 @@ void DiffPage::slotShowRegExpEditor()
 	if ( ! m_ignoreRegExpDialog )
 		m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );

-	KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( m_ignoreRegExpDialog->qt_cast( "KRegExpEditorInterface" ) );
+	KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( m_ignoreRegExpDialog->tqt_cast( "KRegExpEditorInterface" ) );

 	if ( !iface )
 		return;