diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:11:21 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:11:21 -0500 |
| commit | 7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2 (patch) | |
| tree | 713b8b19d0bff547fb7a12d8f36b7ab5e48bbbd2 /kate | |
| parent | 5d9a593c1fe4967f3636524cbef739d80b0d8cae (diff) | |
| parent | fe43761567120b0bda4e0aed56b7c1e56bdd93c5 (diff) | |
| download | tdelibs-7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2.tar.gz tdelibs-7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kate')
| -rw-r--r-- | kate/data/cpp.xml | 10 | ||||
| -rw-r--r-- | kate/data/objectivecpp.xml | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kate/data/cpp.xml b/kate/data/cpp.xml index 50b6991d6..2de80b9cb 100644 --- a/kate/data/cpp.xml +++ b/kate/data/cpp.xml @@ -91,7 +91,7 @@ <item> Q_ASSERT </item> <item> Q_ASSERT_X </item> <item> Q_CHECK_PTR </item> - <item> Q_CLASSINFO </item> + <item> TQ_CLASSINFO </item> <item> Q_CLEANUP_RESOURCE </item> <item> Q_D </item> <item> Q_DECLARE_FLAGS </item> @@ -105,7 +105,7 @@ <item> Q_DECLARE_TYPEINFO </item> <item> Q_DISABLE_COPY </item> <item> Q_EMIT </item> - <item> Q_ENUMS </item> + <item> TQ_ENUMS </item> <item> Q_EXPORT </item> <item> Q_FLAGS </item> <item> Q_FOREACH </item> @@ -118,13 +118,13 @@ <item> Q_INVOKABLE </item> <item> Q_NOREPLY </item> <item> Q_OBJECT </item> - <item> Q_OVERRIDE </item> + <item> TQ_OVERRIDE </item> <item> Q_PRIVATE_SLOT </item> - <item> Q_PROPERTY </item> + <item> TQ_PROPERTY </item> <item> Q_Q </item> <item> Q_RETURN_ARG </item> <item> Q_SCRIPTABLE </item> - <item> Q_SETS </item> + <item> TQ_SETS </item> <item> Q_SIGNALS </item> <item> Q_SLOTS </item> <item> Q_UNUSED </item> diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml index bf038d4a2..94e78f6bc 100644 --- a/kate/data/objectivecpp.xml +++ b/kate/data/objectivecpp.xml @@ -84,13 +84,13 @@ <item> K_DCOP </item> <item> SLOT </item> <item> SIGNAL </item> - <item> Q_CLASSINFO </item> - <item> Q_ENUMS </item> + <item> TQ_CLASSINFO </item> + <item> TQ_ENUMS </item> <item> Q_EXPORT </item> <item> Q_OBJECT </item> - <item> Q_OVERRIDE </item> - <item> Q_PROPERTY </item> - <item> Q_SETS </item> + <item> TQ_OVERRIDE </item> + <item> TQ_PROPERTY </item> + <item> TQ_SETS </item> <item> Q_SIGNALS </item> <item> Q_SLOTS </item> <item> Q_FOREACH </item> |