From 3bdf3dc2205539349446a4b5453ee18ab4a9eb31 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 21 Oct 2012 17:37:45 -0500 Subject: [PATCH] Fix inadvertent tq changes. (cherry picked from commit eed075ad241e6d1be5a68d60f6a77ce4d63f7e25) --- lib/compatibility/kmdi/qextmdi/kdockwidget.cpp | 2 +- lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp | 2 +- lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp | 2 +- lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 983bf1db..ae92803d 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -3270,6 +3270,6 @@ void KDockArea::virtual_hook( int, void* ) { /*KMainWindow::virtual_hook( id, data );*/ } -#ifndef NO_INCLUDE_TQMOCFILES // for TQt-only projects, because tmake doesn't take this name +#ifndef NO_INCLUDE_MOCFILES // for TQt-only projects, because tmake doesn't take this name #include "kdockwidget.moc" #endif diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp index 49ddccdc..ef60f031 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp @@ -626,6 +626,6 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w) } } -#ifndef NO_INCLUDE_TQMOCFILES // for TQt-only projects, because tmake doesn't take this name +#ifndef NO_INCLUDE_MOCFILES // for TQt-only projects, because tmake doesn't take this name #include "kdockwidget_private.moc" #endif diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp index f2c2d599..f62b6056 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp @@ -144,7 +144,7 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( ) } -#ifndef NO_INCLUDE_TQMOCFILES +#ifndef NO_INCLUDE_MOCFILES #include "kmdidocumentviewtabwidget.moc" #endif diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp index 02f3f5d8..1e42f12d 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp @@ -262,7 +262,7 @@ void KMdiToolViewAccessor::show() } -#ifndef NO_INCLUDE_TQMOCFILES +#ifndef NO_INCLUDE_MOCFILES #include "kmditoolviewaccessor.moc" #endif // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;