diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-03-08 11:24:58 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-03-08 11:24:58 -0600 |
| commit | fdbcd3092edd5187fb135b3a1af951843fb2de87 (patch) | |
| tree | 7723e3268d9f071a3a8d5e333c86eca7ee7bc896 | |
| parent | 497ee97a3c67c75c38bf9e411ef50fa8207c50f7 (diff) | |
| parent | f3480e99ff19c3365a32f325075c0ff0642d2ece (diff) | |
| download | tdesdk-fdbcd3092edd5187fb135b3a1af951843fb2de87.tar.gz tdesdk-fdbcd3092edd5187fb135b3a1af951843fb2de87.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdesdk
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | kompare/libdialogpages/diffpage.cpp | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/cmake b/cmake -Subproject 6b3a1fc54f258941ae7ae10909a23d32afee9df +Subproject 6868254e6c10ba5b95ef622b25c39144f3d1161 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<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; |