From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab. --- tqt3integration/module/module.cpp | 4 ++-- tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tqt3integration') diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp index fd1f8c8bd..11e2108ae 100644 --- a/tqt3integration/module/module.cpp +++ b/tqt3integration/module/module.cpp @@ -57,8 +57,8 @@ static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1, KWin::setState( w->winId(), NET::Modal ); KWin::WindowInfo info = KWin::windowInfo( parent, (unsigned long)NET::WMGeometry ); if( info.valid()) - w->move( info.geometry().x() + ( info.geometry().width() - w->width())/2, - info.geometry().y() + ( info.geometry().height()- w->height())/2 ); + w->move( info.tqgeometry().x() + ( info.tqgeometry().width() - w->width())/2, + info.tqgeometry().y() + ( info.tqgeometry().height()- w->height())/2 ); } // duped in qtkde diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp index 2b9d5e5bb..719df105a 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp +++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp @@ -56,7 +56,7 @@ static TQCString findLibrary() static long parentToWinId( const TQWidget* w ) { if( w != NULL ) - return w->topLevelWidget()->winId(); + return w->tqtopLevelWidget()->winId(); // try to find some usable parent if( tqApp->activeWindow() && w != tqApp->activeWindow()) return tqApp->activeWindow()->winId(); -- cgit v1.2.3