From f1d7d93a70359ef991d6a74821bfbd88176e07a0 Mon Sep 17 00:00:00 2001 From: Automated System Date: Mon, 5 Mar 2012 23:32:22 -0600 Subject: [PATCH 1/3] Reset submodule main/tdesdk/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 6b3a1fc5..ea715e15 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6b3a1fc54f258941ae7ae10909a23d32afee9df7 +Subproject commit ea715e15edb3f6b9e78d631d75e18bb9dbace497 From 3074ea4b40fcb1be3221b0a81e1eeed5f09645db Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 6 Mar 2012 11:51:43 -0600 Subject: [PATCH 2/3] Reset submodule main/tdesdk/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index ea715e15..6868254e 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit ea715e15edb3f6b9e78d631d75e18bb9dbace497 +Subproject commit 6868254e6c10ba5b95ef622b25c39144f3d1161a From f3480e99ff19c3365a32f325075c0ff0642d2ece Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Mar 2012 21:19:36 -0600 Subject: [PATCH 3/3] Rename additional members for tqt3 --- kompare/libdialogpages/diffpage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index e4c26db9..1348b93b 100644 --- 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( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); - KRegExpEditorInterface *iface = static_cast( m_ignoreRegExpDialog->qt_cast( "KRegExpEditorInterface" ) ); + KRegExpEditorInterface *iface = static_cast( m_ignoreRegExpDialog->tqt_cast( "KRegExpEditorInterface" ) ); if ( !iface ) return;