diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 17:39:23 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-09 01:57:37 +0100 |
commit | 03929452275f29cf2c2cb7b331be898838506e14 (patch) | |
tree | 81844df26ea61c7fcd0b7bddcd636a0769b42399 | |
parent | c2fdbe63f8d0dc822c79100ab6739f297b2c6ab8 (diff) | |
download | tdelibs-03929452275f29cf2c2cb7b331be898838506e14.tar.gz tdelibs-03929452275f29cf2c2cb7b331be898838506e14.zip |
Fix inadvertent tq changes.
(cherry picked from commit 40712e064638a603834221ccc204345c1bb9acf5)
-rw-r--r-- | kdeui/kaboutdialog.cpp | 10 | ||||
-rw-r--r-- | kdeui/kdockwidget.cpp | 2 | ||||
-rw-r--r-- | kdeui/kdockwidget_private.cpp | 2 | ||||
-rw-r--r-- | kio/kio/kdirwatch_p.h | 2 | ||||
-rw-r--r-- | kmdi/kmdidocumentviewtabwidget.cpp | 2 | ||||
-rw-r--r-- | kmdi/kmditoolviewaccessor.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/kdeui/kaboutdialog.cpp b/kdeui/kaboutdialog.cpp index 6b725a3d7..d484fe14d 100644 --- a/kdeui/kaboutdialog.cpp +++ b/kdeui/kaboutdialog.cpp @@ -41,15 +41,15 @@ #include <kaboutdialog_private.h> #include <kdebug.h> -//TQMOC_SKIP_BEGIN +//MOC_SKIP_BEGIN template class TQPtrList<KAboutContributor>; -//TQMOC_SKIP_END +//MOC_SKIP_END #define WORKTEXT_IDENTATION 16 #define Grid 3 // ############################################################## -// TQMOC OUTPUT FILES: +// MOC OUTPUT FILES: #include "kaboutdialog.moc" #include "kaboutdialog_private.moc" // ############################################################## @@ -928,7 +928,7 @@ void KAboutContainer::addImage( const TQString &fileName, int alignment ) } #if 0 -//TQMOC_SKIP_BEGIN +//MOC_SKIP_BEGIN /** Every person displayed is stored in a KAboutContributor object. * Every contributor, the author and/or the maintainer of the application are @@ -1181,7 +1181,7 @@ KAboutContributor::paintEvent(TQPaintEvent* e) paint.drawText(WORKTEXT_IDENTATION, cy, w, h, AlignLeft | WordBreak, work); // ############################################################################ } -// TQMOC_SKIP_END +// MOC_SKIP_END #endif diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp index c8d14a0d3..afaa615fd 100644 --- a/kdeui/kdockwidget.cpp +++ b/kdeui/kdockwidget.cpp @@ -3326,6 +3326,6 @@ void KDockArea::virtual_hook( int, void* ) { /*KMainWindow::virtual_hook( id, data );*/ } -#ifndef NO_INCLUDE_TQMOCFILES // for Qt-only projects, because tmake doesn't take this name +#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name #include "kdockwidget.moc" #endif diff --git a/kdeui/kdockwidget_private.cpp b/kdeui/kdockwidget_private.cpp index 41372fdf6..a067efe2a 100644 --- a/kdeui/kdockwidget_private.cpp +++ b/kdeui/kdockwidget_private.cpp @@ -707,6 +707,6 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w) } } -#ifndef NO_INCLUDE_TQMOCFILES // for Qt-only projects, because tmake doesn't take this name +#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name #include "kdockwidget_private.moc" #endif diff --git a/kio/kio/kdirwatch_p.h b/kio/kio/kdirwatch_p.h index 1c0ec8fe7..8777f56b2 100644 --- a/kio/kio/kdirwatch_p.h +++ b/kio/kio/kdirwatch_p.h @@ -1,6 +1,6 @@ /* Private Header for class of KDirWatchPrivate * - * this separate header file is needed for TQMOC processing + * this separate header file is needed for MOC processing * because KDirWatchPrivate has signals and slots */ diff --git a/kmdi/kmdidocumentviewtabwidget.cpp b/kmdi/kmdidocumentviewtabwidget.cpp index a75000148..90b618e47 100644 --- a/kmdi/kmdidocumentviewtabwidget.cpp +++ b/kmdi/kmdidocumentviewtabwidget.cpp @@ -140,7 +140,7 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( ) } -#ifndef NO_INCLUDE_TQMOCFILES +#ifndef NO_INCLUDE_MOCFILES #include "kmdidocumentviewtabwidget.moc" #endif diff --git a/kmdi/kmditoolviewaccessor.cpp b/kmdi/kmditoolviewaccessor.cpp index fa8a35f74..c85921a27 100644 --- a/kmdi/kmditoolviewaccessor.cpp +++ b/kmdi/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; |