Fix inadvertent tqt changes.

pull/1/head
Darrell Anderson 12 years ago
parent 685de86487
commit a981b85cb9

@ -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";

@ -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

@ -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,"

@ -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;}

Loading…
Cancel
Save