From ffc74f031874e3823f212e40a03cb9f25091cb5f Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 21 Oct 2012 13:38:34 -0500 Subject: Fix inadvertent tqt changes. --- parts/astyle/astyle_part.cpp | 2 +- parts/doxygen/doxygenpart.cpp | 2 +- parts/outputviews/makeactionfilter.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'parts') diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 7cfb6b17..eef40e98 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -36,7 +36,7 @@ static const KDevPluginInfo data("kdevastyle"); namespace { - const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.tqmoc,*.patch,*.tlh,*.xpm"; + const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm"; } diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index e04e79da..f267fec9 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -172,7 +172,7 @@ void DoxygenPart::adjustDoxyfile() patterns->addValue("*.tlh"); patterns->addValue("*.diff"); patterns->addValue("*.patch"); - patterns->addValue("*.tqmoc"); + patterns->addValue("*.moc"); patterns->addValue("*.xpm"); patterns->addValue("*.dox"); } diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index 0058b2e9..5c8e7c6c 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -79,8 +79,8 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats() ActionFormat( i18n("built"), 1, 1, "\\[.+%\\] Built target (.*)" ), //cmake ActionFormat( i18n("generating"), 1, 1, "\\[.+%\\] Generating (.*)" ), //cmake - //tqmoc and uic - ActionFormat( i18n("generating"), 1, 2, "/(tqmoc|uic)\\b.*\\s-o\\s([^\\s;]+)"), + //moc and uic + ActionFormat( i18n("generating"), 1, 2, "/(moc|uic)\\b.*\\s-o\\s([^\\s;]+)"), ActionFormat( i18n("generating"), 1, 2, "^generating (.*)" ), //unsermake ActionFormat( i18n("linking"), "libtool", "/bin/sh\\s.*libtool.*--mode=link\\s.*\\s-o\\s([^\\s;]+)", 1 ), -- cgit v1.2.1