summaryrefslogtreecommitdiffstats
path: root/lib/kofficeui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-17 16:00:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-17 16:00:39 -0600
commit2f8f2b51ac004c1325dd8c3c2a24d3fec62450f0 (patch)
treeb2a50806758f457480546bccb342017d9c971bd8 /lib/kofficeui
parent3464ad940b78776e534eded37c3ae842cae52ad8 (diff)
downloadkoffice-2f8f2b51ac004c1325dd8c3c2a24d3fec62450f0.tar.gz
koffice-2f8f2b51ac004c1325dd8c3c2a24d3fec62450f0.zip
Remove spurious TQ_OBJECT instances
Diffstat (limited to 'lib/kofficeui')
-rw-r--r--lib/kofficeui/KoCharSelectDia.h2
-rw-r--r--lib/kofficeui/KoCommandHistory.h4
-rw-r--r--lib/kofficeui/KoContextCelp.h18
-rw-r--r--lib/kofficeui/KoEditPath.h4
-rw-r--r--lib/kofficeui/KoGuideLineDia.h2
-rw-r--r--lib/kofficeui/KoGuides.h2
-rw-r--r--lib/kofficeui/KoInsertLink.h10
-rw-r--r--lib/kofficeui/KoKoolBar.h8
-rw-r--r--lib/kofficeui/KoPageLayoutColumns.h2
-rw-r--r--lib/kofficeui/KoPageLayoutDia.h4
-rw-r--r--lib/kofficeui/KoPageLayoutHeader.h2
-rw-r--r--lib/kofficeui/KoPageLayoutSize.h2
-rw-r--r--lib/kofficeui/KoPartSelectAction.h2
-rw-r--r--lib/kofficeui/KoPartSelectDia.h2
-rw-r--r--lib/kofficeui/KoPictureFilePreview.h2
-rw-r--r--lib/kofficeui/KoRuler.h2
-rw-r--r--lib/kofficeui/KoSelectAction.h2
-rw-r--r--lib/kofficeui/KoTabBar.h2
-rw-r--r--lib/kofficeui/KoTabChooser.h2
-rw-r--r--lib/kofficeui/KoTemplateChooseDia.h6
-rw-r--r--lib/kofficeui/KoTemplateCreateDia.h2
-rw-r--r--lib/kofficeui/KoToolBox.h2
-rw-r--r--lib/kofficeui/KoTooluButton.h6
-rw-r--r--lib/kofficeui/KoUnitWidgets.h8
-rw-r--r--lib/kofficeui/KoZoomAction.h2
-rw-r--r--lib/kofficeui/Kolinestyleaction.h2
-rw-r--r--lib/kofficeui/Kolinewidthaction.h4
-rw-r--r--lib/kofficeui/kcoloractions.h4
-rw-r--r--lib/kofficeui/tests/coloraction_test.h2
-rw-r--r--lib/kofficeui/tkaction.h6
-rw-r--r--lib/kofficeui/tkcoloractions.h8
-rw-r--r--lib/kofficeui/tkcombobox.h2
-rw-r--r--lib/kofficeui/tktoolbarbutton.h2
33 files changed, 65 insertions, 65 deletions
diff --git a/lib/kofficeui/KoCharSelectDia.h b/lib/kofficeui/KoCharSelectDia.h
index b281cd12..a8d0b91c 100644
--- a/lib/kofficeui/KoCharSelectDia.h
+++ b/lib/kofficeui/KoCharSelectDia.h
@@ -36,7 +36,7 @@ class KButtonBox;
class KOFFICEUI_EXPORT KoCharSelectDia : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h
index 89b83744..554b4b19 100644
--- a/lib/kofficeui/KoCommandHistory.h
+++ b/lib/kofficeui/KoCommandHistory.h
@@ -34,7 +34,7 @@ class KCommand;
class KoListBox : public TQListBox {
Q_OBJECT
- TQ_OBJECT
+
public:
KoListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
protected:
@@ -58,7 +58,7 @@ signals:
*/
class KOFFICEUI_EXPORT KoCommandHistory : public TQObject {
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Creates a command history, to store commands.
diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h
index 889e006d..9e466677 100644
--- a/lib/kofficeui/KoContextCelp.h
+++ b/lib/kofficeui/KoContextCelp.h
@@ -33,7 +33,7 @@ class TQSimpleRichText;
class KoVerticalLabel : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoVerticalLabel( TQWidget* parent = 0, const char* name = 0 );
@@ -52,7 +52,7 @@ class KoVerticalLabel : public TQWidget
class KoHelpNavButton : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum NavDirection {
@@ -79,7 +79,7 @@ class KoHelpNavButton : public TQWidget
class KoTinyButton : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Action {
@@ -108,7 +108,7 @@ class KoTinyButton : public TQWidget
class KoHelpView : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoHelpView( TQWidget* parent );
@@ -134,7 +134,7 @@ class KoHelpView : public TQWidget
class KoHelpWidget : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoHelpWidget( TQString help, TQWidget* parent );
@@ -171,7 +171,7 @@ class KoHelpWidget : public TQWidget
class KoContextHelpPopup : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoContextHelpPopup( TQWidget* parent = 0 );
@@ -217,7 +217,7 @@ class KoContextHelpPopup : public TQWidget
class KOFFICEUI_EXPORT KoContextHelpAction : public KToggleAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoContextHelpAction( KActionCollection* parentCollection, TQWidget* parent = 0 );
@@ -240,7 +240,7 @@ class KOFFICEUI_EXPORT KoContextHelpAction : public KToggleAction
class KoContextHelpWidget : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoContextHelpWidget( TQWidget* parent = 0, const char* name = 0 );
@@ -264,7 +264,7 @@ class KoContextHelpWidget : public TQWidget
class KoContextHelpDocker : public TQDockWindow
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoContextHelpDocker( TQWidget* parent = 0, const char* name = 0 );
diff --git a/lib/kofficeui/KoEditPath.h b/lib/kofficeui/KoEditPath.h
index 2b45009c..2b971ff6 100644
--- a/lib/kofficeui/KoEditPath.h
+++ b/lib/kofficeui/KoEditPath.h
@@ -30,7 +30,7 @@ class TQCheckBox;
class KOFFICEUI_EXPORT KoEditPathDia : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoEditPathDia( const TQString & _path, TQWidget *parent, const char *name );
TQString newPath()const;
@@ -43,7 +43,7 @@ private:
class KOFFICEUI_EXPORT KoChangePathDia : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoChangePathDia( const TQString & _path, TQWidget *parent, const char *name );
TQString newPath()const;
diff --git a/lib/kofficeui/KoGuideLineDia.h b/lib/kofficeui/KoGuideLineDia.h
index 0f2fcecf..9e472272 100644
--- a/lib/kofficeui/KoGuideLineDia.h
+++ b/lib/kofficeui/KoGuideLineDia.h
@@ -37,7 +37,7 @@ class TQRadioButton;
class KoGuideLineDia : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* @brief Constructor
diff --git a/lib/kofficeui/KoGuides.h b/lib/kofficeui/KoGuides.h
index c1f66138..c5e8ffda 100644
--- a/lib/kofficeui/KoGuides.h
+++ b/lib/kofficeui/KoGuides.h
@@ -36,7 +36,7 @@ class KoZoomHandler;
class KOFFICEUI_EXPORT KoGuides : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* @brief Constructor
diff --git a/lib/kofficeui/KoInsertLink.h b/lib/kofficeui/KoInsertLink.h
index d71263aa..ccade61b 100644
--- a/lib/kofficeui/KoInsertLink.h
+++ b/lib/kofficeui/KoInsertLink.h
@@ -32,7 +32,7 @@ namespace KOfficePrivate {
class internetLinkPage : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
internetLinkPage( TQWidget *parent = 0, char *name = 0 );
TQString linkName()const;
@@ -54,7 +54,7 @@ signals:
class bookmarkLinkPage : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
bookmarkLinkPage( TQWidget *parent = 0, char *name = 0 );
TQString linkName()const;
@@ -78,7 +78,7 @@ signals:
class mailLinkPage : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
mailLinkPage( TQWidget *parent = 0, char *name = 0 );
TQString linkName()const;
@@ -101,7 +101,7 @@ signals:
class fileLinkPage : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
fileLinkPage( TQWidget *parent = 0, char *name = 0 );
TQString linkName()const;
@@ -127,7 +127,7 @@ signals:
class KOFFICEUI_EXPORT KoInsertLinkDia : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoInsertLinkDia( TQWidget *parent, const char *name = 0,bool displayBookmarkLink=true );
static bool createLinkDia(TQString & linkName, TQString & hrefName, const TQStringList& bkmlist, bool displayBookmarkLink = true,
diff --git a/lib/kofficeui/KoKoolBar.h b/lib/kofficeui/KoKoolBar.h
index 445b5fee..4416610f 100644
--- a/lib/kofficeui/KoKoolBar.h
+++ b/lib/kofficeui/KoKoolBar.h
@@ -34,7 +34,7 @@ class KoKoolBarItem : public TQObject
{
private:
Q_OBJECT
- TQ_OBJECT
+
public:
KoKoolBarItem( KoKoolBarGroup *_grp, const TQPixmap& _pix, const TQString& _text = TQString() );
@@ -67,7 +67,7 @@ protected:
class KoKoolBarGroup : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoKoolBarGroup( KoKoolBar *_bar, const TQString& _text );
~KoKoolBarGroup();
@@ -101,7 +101,7 @@ protected:
class KoKoolBarBox : public TQFrame
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoKoolBarBox( KoKoolBar *_bar );
@@ -140,7 +140,7 @@ protected:
class KOFFICEUI_EXPORT KoKoolBar : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoKoolBar( TQWidget *_parent = 0L, const char *_name = 0L );
virtual ~KoKoolBar() { };
diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h
index b9dcd6c2..b4e0b35e 100644
--- a/lib/kofficeui/KoPageLayoutColumns.h
+++ b/lib/kofficeui/KoPageLayoutColumns.h
@@ -35,7 +35,7 @@ class KoPagePreview;
*/
class KoPageLayoutColumns : public KoPageLayoutColumnsBase {
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/lib/kofficeui/KoPageLayoutDia.h b/lib/kofficeui/KoPageLayoutDia.h
index 1ed23ec5..0c50b448 100644
--- a/lib/kofficeui/KoPageLayoutDia.h
+++ b/lib/kofficeui/KoPageLayoutDia.h
@@ -47,7 +47,7 @@ enum { FORMAT_AND_BORDERS = 1, HEADER_AND_FOOTER = 2, COLUMNS = 4, DISABLE_BORDE
class KoPagePreview : public TQGroupBox
{
Q_OBJECT
- TQ_OBJECT
+
public:
@@ -83,7 +83,7 @@ class KoPageLayoutDiaPrivate;
class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/lib/kofficeui/KoPageLayoutHeader.h b/lib/kofficeui/KoPageLayoutHeader.h
index 5473403b..213b021c 100644
--- a/lib/kofficeui/KoPageLayoutHeader.h
+++ b/lib/kofficeui/KoPageLayoutHeader.h
@@ -32,7 +32,7 @@ class KoPagePreview;
*/
class KoPageLayoutHeader : public KoPageLayoutHeaderBase {
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h
index 6d50e014..7de19ca3 100644
--- a/lib/kofficeui/KoPageLayoutSize.h
+++ b/lib/kofficeui/KoPageLayoutSize.h
@@ -36,7 +36,7 @@ class KoPageLayoutColumns;
*/
class KoPageLayoutSize : public TQWidget {
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/lib/kofficeui/KoPartSelectAction.h b/lib/kofficeui/KoPartSelectAction.h
index 9e9dd30f..2bfc119e 100644
--- a/lib/kofficeui/KoPartSelectAction.h
+++ b/lib/kofficeui/KoPartSelectAction.h
@@ -30,7 +30,7 @@
class KOFFICEUI_EXPORT KoPartSelectAction : public KActionMenu
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoPartSelectAction( const TQString& text, TQObject* parent = 0, const char* name = 0 );
diff --git a/lib/kofficeui/KoPartSelectDia.h b/lib/kofficeui/KoPartSelectDia.h
index 6a13084b..b6414e3a 100644
--- a/lib/kofficeui/KoPartSelectDia.h
+++ b/lib/kofficeui/KoPartSelectDia.h
@@ -36,7 +36,7 @@ class TQPushButton;
class KOFFICEUI_EXPORT KoPartSelectDia : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/lib/kofficeui/KoPictureFilePreview.h b/lib/kofficeui/KoPictureFilePreview.h
index 3922cd74..a9c9297e 100644
--- a/lib/kofficeui/KoPictureFilePreview.h
+++ b/lib/kofficeui/KoPictureFilePreview.h
@@ -33,7 +33,7 @@ class KoPictureFilePreviewWidget;
class KOFFICEUI_EXPORT KoPictureFilePreview : public KPreviewWidgetBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoPictureFilePreview( TQWidget *parent );
diff --git a/lib/kofficeui/KoRuler.h b/lib/kofficeui/KoRuler.h
index 352e6820..8019b908 100644
--- a/lib/kofficeui/KoRuler.h
+++ b/lib/kofficeui/KoRuler.h
@@ -101,7 +101,7 @@ class KoRulerPrivate;
class KOFFICEUI_EXPORT KoRuler : public TQFrame
{
Q_OBJECT
- TQ_OBJECT
+
friend class KoRulerPrivate; // for the Action enum
public:
static const int F_TABS;
diff --git a/lib/kofficeui/KoSelectAction.h b/lib/kofficeui/KoSelectAction.h
index a6d3b006..4c0f65d3 100644
--- a/lib/kofficeui/KoSelectAction.h
+++ b/lib/kofficeui/KoSelectAction.h
@@ -31,7 +31,7 @@ class TQPoint;
class KOFFICEUI_EXPORT KoSelectAction : public KAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
/** Constructs a KoSelectAction with a text and an icon.
* @param text The text that will be displayed.
diff --git a/lib/kofficeui/KoTabBar.h b/lib/kofficeui/KoTabBar.h
index 0c4233b4..5396924a 100644
--- a/lib/kofficeui/KoTabBar.h
+++ b/lib/kofficeui/KoTabBar.h
@@ -61,7 +61,7 @@ class KoTabBarPrivate;
class KOFFICEUI_EXPORT KoTabBar : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
TQ_PROPERTY( TQString activeTab READ activeTab WRITE setActiveTab )
TQ_PROPERTY( bool readOnly READ readOnly WRITE setReadOnly )
diff --git a/lib/kofficeui/KoTabChooser.h b/lib/kofficeui/KoTabChooser.h
index fb9a0591..a487959f 100644
--- a/lib/kofficeui/KoTabChooser.h
+++ b/lib/kofficeui/KoTabChooser.h
@@ -35,7 +35,7 @@ class KoTabChooserPrivate;
class KOFFICEUI_EXPORT KoTabChooser : public TQFrame
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { TAB_LEFT = 1,
diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h
index 9363477d..5bedde84 100644
--- a/lib/kofficeui/KoTemplateChooseDia.h
+++ b/lib/kofficeui/KoTemplateChooseDia.h
@@ -43,7 +43,7 @@ class TQGridLayout;
class KoTCDIconCanvas : public KIconCanvas
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoTCDIconCanvas( TQWidget *parent = 0, const char *name = 0L )
: KIconCanvas( parent, name ) {}
@@ -94,7 +94,7 @@ class KoTCDIconViewItem : public KIconViewItem
*/
class KoTCDRecentFilesIconView : public KFileIconView {
Q_OBJECT
- TQ_OBJECT
+
public:
KoTCDRecentFilesIconView( TQWidget* parent, const char* name ) :
KFileIconView( parent, name ), toolTip(0)
@@ -133,7 +133,7 @@ class KoTemplateChooseDiaPrivate;
class KOFFICEUI_EXPORT KoTemplateChooseDia : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/lib/kofficeui/KoTemplateCreateDia.h b/lib/kofficeui/KoTemplateCreateDia.h
index 821d2f27..e3e30322 100644
--- a/lib/kofficeui/KoTemplateCreateDia.h
+++ b/lib/kofficeui/KoTemplateCreateDia.h
@@ -42,7 +42,7 @@ class KoTemplateCreateDiaPrivate;
class KOFFICEUI_EXPORT KoTemplateCreateDia : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoTemplateCreateDia( const TQCString &templateType, KInstance *instance,
diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 7b31d847..4b83f03c 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -45,7 +45,7 @@ class ToolArea;
class KOFFICEUI_EXPORT KoToolBox : public KToolBar {
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h
index 804b270b..78d67cd5 100644
--- a/lib/kofficeui/KoTooluButton.h
+++ b/lib/kofficeui/KoTooluButton.h
@@ -29,7 +29,7 @@ class TQPopupMenu;
class KoColorPanel : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoColorPanel( TQWidget* parent = 0, const char* name = 0 );
virtual ~KoColorPanel();
@@ -106,7 +106,7 @@ bool operator<( const KoColorPanel::Position& lhs, const KoColorPanel::Position&
class KoColorPopupProxy : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoColorPopupProxy( const TQColor& defaultColor, KoColorPanel* recentColors, TQObject* parent, const char* name );
virtual ~KoColorPopupProxy() {}
@@ -130,7 +130,7 @@ private:
class KoToolButton : public KToolBarButton
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Construct a button with an icon loaded by the button itself.
diff --git a/lib/kofficeui/KoUnitWidgets.h b/lib/kofficeui/KoUnitWidgets.h
index 80db554d..cd741f32 100644
--- a/lib/kofficeui/KoUnitWidgets.h
+++ b/lib/kofficeui/KoUnitWidgets.h
@@ -107,7 +107,7 @@ protected:
class KOFFICEUI_EXPORT KoUnitDoubleSpinBox : public KDoubleSpinBox, public KoUnitDoubleBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoUnitDoubleSpinBox( TQWidget *parent = 0L, const char *name = 0L );
// lower, upper, step and value are in pt
@@ -158,7 +158,7 @@ private slots:
class KOFFICEUI_EXPORT KoUnitDoubleLineEdit : public KLineEdit, public KoUnitDoubleBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoUnitDoubleLineEdit( TQWidget *parent = 0L, const char *name = 0L );
KoUnitDoubleLineEdit( TQWidget *parent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
@@ -187,7 +187,7 @@ private:
class KOFFICEUI_EXPORT KoUnitDoubleComboBox : public KComboBox, public KoUnitDoubleBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoUnitDoubleComboBox( TQWidget *parent = 0L, const char *name = 0L );
KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
@@ -224,7 +224,7 @@ protected:
class KOFFICEUI_EXPORT KoUnitDoubleSpinComboBox : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoUnitDoubleSpinComboBox( TQWidget *parent = 0L, const char *name = 0L );
KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value = 0.0, KoUnit::Unit unit = KoUnit::U_PT, unsigned int precision = 2, const char *name = 0 );
diff --git a/lib/kofficeui/KoZoomAction.h b/lib/kofficeui/KoZoomAction.h
index 932c409a..118c7a13 100644
--- a/lib/kofficeui/KoZoomAction.h
+++ b/lib/kofficeui/KoZoomAction.h
@@ -31,7 +31,7 @@
class KOFFICEUI_EXPORT KoZoomAction : public KSelectAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/lib/kofficeui/Kolinestyleaction.h b/lib/kofficeui/Kolinestyleaction.h
index 63be979c..d0eb4ef0 100644
--- a/lib/kofficeui/Kolinestyleaction.h
+++ b/lib/kofficeui/Kolinestyleaction.h
@@ -26,7 +26,7 @@
class KOFFICEUI_EXPORT KoLineStyleAction : public KoSelectAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
/** Constructs a KoLineStyleAction with a text and an icon.
* @param text The text that will be displayed.
diff --git a/lib/kofficeui/Kolinewidthaction.h b/lib/kofficeui/Kolinewidthaction.h
index a2b1dfe4..fe1ed705 100644
--- a/lib/kofficeui/Kolinewidthaction.h
+++ b/lib/kofficeui/Kolinewidthaction.h
@@ -30,7 +30,7 @@
class KOFFICEUI_EXPORT KoLineWidthAction : public KoSelectAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
/** Constructs a KoLineWidthAction with a text and an icon.
* @param text The text that will be displayed.
@@ -88,7 +88,7 @@ class KOFFICEUI_EXPORT KoLineWidthAction : public KoSelectAction
class KoLineWidthChooser : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KoLineWidthChooser(TQWidget* parent = 0, const char* name = 0);
~KoLineWidthChooser();
diff --git a/lib/kofficeui/kcoloractions.h b/lib/kofficeui/kcoloractions.h
index 8f2c713b..3ca03c62 100644
--- a/lib/kofficeui/kcoloractions.h
+++ b/lib/kofficeui/kcoloractions.h
@@ -29,7 +29,7 @@
class KColorAction : public KAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Type {
@@ -68,7 +68,7 @@ private:
class KSelectColorAction : public KAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Type {
TextColor,
diff --git a/lib/kofficeui/tests/coloraction_test.h b/lib/kofficeui/tests/coloraction_test.h
index d0847493..f2d1618e 100644
--- a/lib/kofficeui/tests/coloraction_test.h
+++ b/lib/kofficeui/tests/coloraction_test.h
@@ -28,7 +28,7 @@ class KoColorPanel;
class TopLevel : public TQMainWindow
{
Q_OBJECT
- TQ_OBJECT
+
public:
TopLevel( TQWidget* parent = 0, const char* name = 0 );
diff --git a/lib/kofficeui/tkaction.h b/lib/kofficeui/tkaction.h
index b9a84a41..da38f38d 100644
--- a/lib/kofficeui/tkaction.h
+++ b/lib/kofficeui/tkaction.h
@@ -32,7 +32,7 @@ class TKComboBox;
class KOFFICEUI_EXPORT TKAction : public KAction
{ Q_OBJECT
- TQ_OBJECT
+
public:
TKAction(TQObject* parent, const char* name);
~TKAction();
@@ -61,7 +61,7 @@ private:
/******************************************************************************/
class KOFFICEUI_EXPORT TKBaseSelectAction : public TKAction
{ Q_OBJECT
- TQ_OBJECT
+
friend class TKSelectAction;
public:
TKBaseSelectAction(TQObject* parent, const char* name);
@@ -96,7 +96,7 @@ private:
/******************************************************************************/
class KOFFICEUI_EXPORT TKSelectAction : public TKBaseSelectAction
{ Q_OBJECT
- TQ_OBJECT
+
public:
TKSelectAction(TQObject* parent, const char* name);
~TKSelectAction();
diff --git a/lib/kofficeui/tkcoloractions.h b/lib/kofficeui/tkcoloractions.h
index b478e2dd..5ef5d3f4 100644
--- a/lib/kofficeui/tkcoloractions.h
+++ b/lib/kofficeui/tkcoloractions.h
@@ -32,7 +32,7 @@ class TKSelectColorActionPrivate;
class TKColorPopupMenu : public KPopupMenu
{ Q_OBJECT
- TQ_OBJECT
+
public:
TKColorPopupMenu( TQWidget* parent = 0, const char* name = 0 );
~TKColorPopupMenu();
@@ -43,7 +43,7 @@ public slots:
/****************************************************************************************/
class KOFFICEUI_EXPORT TKSelectColorAction : public TKAction
{ Q_OBJECT
- TQ_OBJECT
+
public:
enum Type {
TextColor,
@@ -100,7 +100,7 @@ private:
/****************************************************************************************/
class TKColorPanelButton : public TQFrame
{ Q_OBJECT
- TQ_OBJECT
+
public:
TKColorPanelButton( const TQColor&, TQWidget* parent, const char* name = 0 );
~TKColorPanelButton();
@@ -128,7 +128,7 @@ private:
/****************************************************************************************/
class TKColorPanel : public TQWidget
{ Q_OBJECT
- TQ_OBJECT
+
public:
TKColorPanel( TQWidget* parent = 0L, const char* name = 0 );
diff --git a/lib/kofficeui/tkcombobox.h b/lib/kofficeui/tkcombobox.h
index 066e9b93..63e52f55 100644
--- a/lib/kofficeui/tkcombobox.h
+++ b/lib/kofficeui/tkcombobox.h
@@ -23,7 +23,7 @@
#include <tqcombobox.h>
class TKComboBox : public TQComboBox
{ Q_OBJECT
- TQ_OBJECT
+
public:
TKComboBox(TQWidget* parent=0, const char* name=0);
TKComboBox(bool isEditable, TQWidget* parent=0, const char* name=0);
diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h
index 883d7811..17fc3758 100644
--- a/lib/kofficeui/tktoolbarbutton.h
+++ b/lib/kofficeui/tktoolbarbutton.h
@@ -33,7 +33,7 @@ class TQPainter;
class TKToolBarButton : public TQToolButton
{ Q_OBJECT
- TQ_OBJECT
+
public:
TKToolBarButton(const TQString& icon, const TQString& txt,
TQWidget* parent = 0, const char *name=0L,