summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-10-21 13:12:33 -0500
committerDarrell Anderson <[email protected]>2012-10-21 13:12:33 -0500
commita981b85cb9db7276e530ff0bb538bbafac94c5c4 (patch)
tree2cc0dfad5fc4f40a46880a32232bce9488d517bb
parent685de86487c13b03f3e5c33b74f317fc27389f88 (diff)
downloadtdewebdev-a981b85cb9db7276e530ff0bb538bbafac94c5c4.tar.gz
tdewebdev-a981b85cb9db7276e530ff0bb538bbafac94c5c4.zip
Fix inadvertent tqt changes.
-rw-r--r--kfilereplace/kfilereplacelib.cpp2
-rw-r--r--lib/compatibility/kmdi/qextmdi/tdelibs_export.h2
-rw-r--r--quanta/components/csseditor/csseditor_globals.h2
-rw-r--r--quanta/utility/tagaction.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/kfilereplace/kfilereplacelib.cpp b/kfilereplace/kfilereplacelib.cpp
index 5a3bfcd4..6e0d8323 100644
--- a/kfilereplace/kfilereplacelib.cpp
+++ b/kfilereplace/kfilereplacelib.cpp
@@ -324,7 +324,7 @@ void KFileReplaceLib::setIconForFileEntry(TQListViewItem* item, TQString path)
extensionMap["kmdr"] = "widget_doc";
extensionMap["kwd"] = "kword_kwd";
extensionMap["log"] = "log";
- extensionMap["tqmoc"] = "source_tqmoc";
+ extensionMap["moc"] = "source_moc";
extensionMap["mp3"] = "sound";
extensionMap["o"] = "source_o";
extensionMap["pdf"] = "pdf";
diff --git a/lib/compatibility/kmdi/qextmdi/tdelibs_export.h b/lib/compatibility/kmdi/qextmdi/tdelibs_export.h
index 436aa385..8ff4bda9 100644
--- a/lib/compatibility/kmdi/qextmdi/tdelibs_export.h
+++ b/lib/compatibility/kmdi/qextmdi/tdelibs_export.h
@@ -68,7 +68,7 @@
#endif /*_KDELIBS_EXPORT_H*/
-/* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros
+/* workaround for tdecore: stupid moc's grammar doesn't accept two macros
between 'class' keyword and <classname>: */
#ifdef KDE_DEPRECATED
# ifndef TDECORE_EXPORT_DEPRECATED
diff --git a/quanta/components/csseditor/csseditor_globals.h b/quanta/components/csseditor/csseditor_globals.h
index b2cd1405..e63a9f20 100644
--- a/quanta/components/csseditor/csseditor_globals.h
+++ b/quanta/components/csseditor/csseditor_globals.h
@@ -34,7 +34,7 @@ const TQStringList HTMLColors(TQStringList::split(",",TQString("aliceblue,antiqu
"lightskyblue,lightslategray,lightsteelblue,lightyellow,lime,limegreen,linen,magenta,"
"maroon,mediumaquamarine,mediumblue,mediumorchid,mediumpurple,mediumseagreen,"
"mediumslateblue,mediumspringgreen,mediumturquoise,mediumvioletred,midnightblue,"
- "mintcream,mistyrose,tqmoccasin,navajowhite,navy,oldlace,olive,olivedrab,orange,"
+ "mintcream,mistyrose,moccasin,navajowhite,navy,oldlace,olive,olivedrab,orange,"
"orangered,orchid,palegoldenrod,palegreen,paleturquoise,palevioletred,papayawhip,"
"peachpuff,peru,pink,plum,powderblue,purple,red,rosybrown,royalblue,saddlebrown,"
"salmon,sandybrown,seagreen,seashell,sienna,silver,skyblue,slateblue,slategray,snow,"
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 3a911291..57830da9 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -486,7 +486,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto
return true;
}
#else
- // hack to compile. tqmoc doesn't check the "#ifdef" at the declaration and the compiler complains
+ // hack to compile. moc doesn't check the "#ifdef" at the declaration and the compiler complains
// of no matching function.
bool TagAction::slotActionActivated(KAction::ActivationReason /*reason*/, TQt::ButtonState /*state*/)
{return true;}