From 9a6b614070df8c787c814aca888865d226d14733 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 21 Oct 2012 13:16:08 -0500 Subject: [PATCH] Fix inadvertent tqt changes. (cherry picked from commit d08e3983f108adde3d605a126304b60198dcde77) --- certmanager/lib/backends/qgpgme/qgpgmejob.h | 4 ++-- certmanager/lib/ui/keylistview.h | 2 +- kaddressbook/views/configuretableviewdialog.h | 2 +- kmail/configuredialog_p.h | 6 +++--- kmail/index.h | 2 +- korganizer/korganizer.h | 2 +- korn/kio_count.h | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 4f393cfb..9cf39421 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -64,9 +64,9 @@ namespace Kleo { /** This is a hackish helper class to avoid code duplication in this backend's Kleo::Job subclasses. It contains several workarounds - for tqmoc/signal/slot shortcomings, most of which the author of + for moc/signal/slot shortcomings, most of which the author of this thinks are TQt bugs (lazy implementations), first and - foremost the inability of tqmoc to handle inheritance from + foremost the inability of moc to handle inheritance from multiple TQObject-derived subclasses. To use it, inherit from the Job-subclass, then from this class, diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 012b2ac5..fd301bff 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -45,7 +45,7 @@ class TQColor; namespace Kleo { - // work around tqmoc parser bug... + // work around moc parser bug... #define TEMPLATE_TYPENAME(T) template TEMPLATE_TYPENAME(T) inline T * lvi_cast( TQListViewItem * item ) { diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h index 3533ae0d..993e71ab 100644 --- a/kaddressbook/views/configuretableviewdialog.h +++ b/kaddressbook/views/configuretableviewdialog.h @@ -58,7 +58,7 @@ class ConfigureTableViewWidget : public ViewConfigureWidget }; /** - Internal class. It is only defined here for tqmoc + Internal class. It is only defined here for moc */ class LookAndFeelPage : public TQWidget { diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index 14921839..c5d07504 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -409,7 +409,7 @@ public: TQString helpAnchor() const; - // hrmpf. tqmoc doesn't like nested classes with slots/signals...: + // hrmpf. moc doesn't like nested classes with slots/signals...: typedef AccountsPageSendingTab SendingTab; typedef AccountsPageReceivingTab ReceivingTab; @@ -588,7 +588,7 @@ public: TQString helpAnchor() const; - // hrmpf. tqmoc doesn't like nested classes with slots/signals...: + // hrmpf. moc doesn't like nested classes with slots/signals...: typedef AppearancePageFontsTab FontsTab; typedef AppearancePageColorsTab ColorsTab; typedef AppearancePageLayoutTab LayoutTab; @@ -817,7 +817,7 @@ public: TQString helpAnchor() const; - // hrmpf. tqmoc doesn't like nested classes with slots/signals...: + // hrmpf. moc doesn't like nested classes with slots/signals...: typedef ComposerPageGeneralTab GeneralTab; typedef ComposerPagePhrasesTab PhrasesTab; typedef ComposerPageTemplatesTab TemplatesTab; diff --git a/kmail/index.h b/kmail/index.h index 1a8ae33a..7a7b84c1 100644 --- a/kmail/index.h +++ b/kmail/index.h @@ -152,7 +152,7 @@ class KMMsgIndex : public TQObject { * DO NOT USE THIS CLASS * * It is conceptually a private class. - * Just needs to be public because of tqmoc limitations + * Just needs to be public because of moc limitations */ class Search; private: diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h index 9148a07f..507e0ef5 100644 --- a/korganizer/korganizer.h +++ b/korganizer/korganizer.h @@ -50,7 +50,7 @@ namespace KCal { class CalendarResources; } using namespace KCal; -// Workaround for tqmoc workaround for visual c++ 6.0 sucking +// Workaround for moc workaround for visual c++ 6.0 sucking typedef KOrg::MainWindow KOrgMainWindow; typedef KParts::MainWindow KPartsMainWindow; diff --git a/korn/kio_count.h b/korn/kio_count.h index 3b555739..999dbd69 100644 --- a/korn/kio_count.h +++ b/korn/kio_count.h @@ -25,7 +25,7 @@ #include "kio.h" //Alsewise, no access to KKioDrop::FileInfo (needed in template) -#include //FIXME: without this, tqmoc-compiler fails. +#include //FIXME: without this, moc-compiler fails. class KIO_Protocol; class KIO_Single_Subject;