diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 14:26:52 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-12-23 05:07:42 +0100 |
| commit | 407fa6384f95ad730e50fe76e0b98370115c4b9b (patch) | |
| tree | 24a707f48385a529f998710b51c0a5af938dce31 | |
| parent | 82f1d0a950210f955aff76449b0233f71175636c (diff) | |
| download | tdewebdev-407fa6384f95ad730e50fe76e0b98370115c4b9b.tar.gz tdewebdev-407fa6384f95ad730e50fe76e0b98370115c4b9b.zip | |
Fix inadvertent tqt changes.
(cherry picked from commit fc01e96e1ec562da4d96d1a9ba818e0f5bb5070f)
| -rw-r--r-- | kommander/examples/old/widgetgenerator.kmdr | 2 | ||||
| -rw-r--r-- | kommander/working/plugintemplate/src-Makefile.am | 2 | ||||
| -rw-r--r-- | lib/compatibility/kmdi/qextmdi/kdemacros.h.in | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr index 97267a62..83a6d269 100644 --- a/kommander/examples/old/widgetgenerator.kmdr +++ b/kommander/examples/old/widgetgenerator.kmdr @@ -236,7 +236,7 @@ void @className::showEvent( QShowEvent *e ) emit widgetOpened(); } -#include \"$classNameLower.tqmoc\" +#include \"$classNameLower.moc\" " echo "$headerContent" > @directory/$classNameLower.h diff --git a/kommander/working/plugintemplate/src-Makefile.am b/kommander/working/plugintemplate/src-Makefile.am index a7b2ee01..eb7dbe9d 100644 --- a/kommander/working/plugintemplate/src-Makefile.am +++ b/kommander/working/plugintemplate/src-Makefile.am @@ -13,7 +13,7 @@ libkmdr%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp %{APPNAMELC}plugin.cpp # these are the headers for your project that won't be installed -# let autotqmoc handle all of the meta source files (tqmoc) +# let automoc handle all of the meta source files (moc) METASOURCES = AUTO AM_CXXFLAGS= -DHAVE_SSTREAM AM_CPPFLAGS= $(all_includes) diff --git a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in index bfae0947..008bac11 100644 --- a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in +++ b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in @@ -105,11 +105,11 @@ * this is because usually get called by the class which they belong to, * and one'd assume that a class author doesn't use deprecated methods of his * own class. The only exception to this are signals which are connected to - * other signals; they get invoked from tqmoc-generated code. In any case, + * other signals; they get invoked from moc-generated code. In any case, * printing a warning message in either case is not useful. * For slots, it can make sense (since slots can be invoked directly) but be * aware that if the slots get triggered by a signal, the will get called from - * tqmoc code as well and thus the warnings are useless. + * moc code as well and thus the warnings are useless. * * \par * Also note that it is not possible to use KDE_DEPRECATED for classes which |