From b46b29c7d7720027aec2936e80d6a09351b7d641 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 17 Feb 2012 15:58:47 -0600 Subject: Remove spurious TQ_OBJECT instances --- bibletime/bibletime.h | 2 +- bibletime/frontend/btinstallmgr.h | 2 +- bibletime/frontend/cinfodisplay.h | 2 +- bibletime/frontend/cinputdialog.h | 2 +- bibletime/frontend/cmanageindiceswidget.h | 2 +- bibletime/frontend/cmdiarea.h | 2 +- bibletime/frontend/cmoduleindexdialog.h | 2 +- bibletime/frontend/coptionsdialog.h | 2 +- bibletime/frontend/cprinter.h | 2 +- bibletime/frontend/cswordsetupdialog.h | 2 +- bibletime/frontend/cswordsetupinstallsourcesdialog.h | 2 +- bibletime/frontend/cswordsetupmodulelistview.h | 2 +- bibletime/frontend/display/cdisplay.h | 2 +- bibletime/frontend/display/chtmlreaddisplay.h | 4 ++-- bibletime/frontend/display/chtmlwritedisplay.h | 2 +- bibletime/frontend/displaywindow/cbiblereadwindow.h | 2 +- bibletime/frontend/displaywindow/cbookreadwindow.h | 2 +- bibletime/frontend/displaywindow/cbuttons.h | 4 ++-- bibletime/frontend/displaywindow/ccommentaryreadwindow.h | 2 +- bibletime/frontend/displaywindow/cdisplaywindow.h | 2 +- bibletime/frontend/displaywindow/chtmlwritewindow.h | 2 +- bibletime/frontend/displaywindow/clexiconreadwindow.h | 2 +- bibletime/frontend/displaywindow/cmodulechooserbar.h | 2 +- bibletime/frontend/displaywindow/cmodulechooserbutton.h | 2 +- bibletime/frontend/displaywindow/cplainwritewindow.h | 2 +- bibletime/frontend/displaywindow/creadwindow.h | 2 +- bibletime/frontend/displaywindow/cwritewindow.h | 2 +- bibletime/frontend/keychooser/cbiblekeychooser.h | 2 +- bibletime/frontend/keychooser/cbookkeychooser.h | 2 +- bibletime/frontend/keychooser/cbooktreechooser.h | 2 +- bibletime/frontend/keychooser/ckeychooser.h | 2 +- bibletime/frontend/keychooser/ckeychooserwidget.h | 4 ++-- bibletime/frontend/keychooser/ckeyreferencewidget.h | 6 +++--- bibletime/frontend/keychooser/clexiconkeychooser.h | 2 +- bibletime/frontend/keychooser/crefselectdialog.h | 2 +- bibletime/frontend/keychooser/cscrollbutton.h | 2 +- bibletime/frontend/keychooser/cscrollerwidgetset.h | 2 +- bibletime/frontend/mainindex/cmainindex.h | 2 +- bibletime/frontend/searchdialog/cmodulechooser.h | 4 ++-- bibletime/frontend/searchdialog/cmoduleresultview.h | 2 +- bibletime/frontend/searchdialog/crangechooser.h | 2 +- bibletime/frontend/searchdialog/csearchanalysis.h | 6 +++--- bibletime/frontend/searchdialog/csearchdialog.h | 2 +- bibletime/frontend/searchdialog/csearchdialogpages.h | 4 ++-- bibletime/frontend/searchdialog/csearchresultview.h | 2 +- 45 files changed, 54 insertions(+), 54 deletions(-) diff --git a/bibletime/bibletime.h b/bibletime/bibletime.h index b108333..a2ccebd 100644 --- a/bibletime/bibletime.h +++ b/bibletime/bibletime.h @@ -135,7 +135,7 @@ class TQSplitter; class BibleTime : public KMainWindow, virtual public BibleTimeInterface { friend class CMDIArea; Q_OBJECT - TQ_OBJECT + public: /** * construtor of BibleTime diff --git a/bibletime/frontend/btinstallmgr.h b/bibletime/frontend/btinstallmgr.h index e370c6f..bef03e8 100644 --- a/bibletime/frontend/btinstallmgr.h +++ b/bibletime/frontend/btinstallmgr.h @@ -40,7 +40,7 @@ namespace BookshelfManager { */ class BTInstallMgr : public TQObject, public sword::InstallMgr, public sword::StatusReporter { Q_OBJECT - TQ_OBJECT + public: class Tool { public: diff --git a/bibletime/frontend/cinfodisplay.h b/bibletime/frontend/cinfodisplay.h index d2e5653..ae60f51 100644 --- a/bibletime/frontend/cinfodisplay.h +++ b/bibletime/frontend/cinfodisplay.h @@ -31,7 +31,7 @@ namespace InfoDisplay { */ class CInfoDisplay : public TQWidget { Q_OBJECT - TQ_OBJECT + public: enum InfoType { Abbreviation, diff --git a/bibletime/frontend/cinputdialog.h b/bibletime/frontend/cinputdialog.h index 6b5cd33..4babe37 100644 --- a/bibletime/frontend/cinputdialog.h +++ b/bibletime/frontend/cinputdialog.h @@ -24,7 +24,7 @@ class TQWidget; */ class CInputDialog : public KDialog { Q_OBJECT - TQ_OBJECT + public: CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *parent=0, const char *name=0, const bool modal = true); /** diff --git a/bibletime/frontend/cmanageindiceswidget.h b/bibletime/frontend/cmanageindiceswidget.h index 4bafce7..e937924 100644 --- a/bibletime/frontend/cmanageindiceswidget.h +++ b/bibletime/frontend/cmanageindiceswidget.h @@ -28,7 +28,7 @@ namespace BookshelfManager { class CManageIndicesWidget : public ManageIndicesForm { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/bibletime/frontend/cmdiarea.h b/bibletime/frontend/cmdiarea.h index 18499ab..2acaf66 100644 --- a/bibletime/frontend/cmdiarea.h +++ b/bibletime/frontend/cmdiarea.h @@ -32,7 +32,7 @@ class CSwordKey; */ class CMDIArea : public TQWorkspace, public CPointers { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/bibletime/frontend/cmoduleindexdialog.h b/bibletime/frontend/cmoduleindexdialog.h index 7e64c57..ba30dc4 100644 --- a/bibletime/frontend/cmoduleindexdialog.h +++ b/bibletime/frontend/cmoduleindexdialog.h @@ -29,7 +29,7 @@ class KProgressDialog; */ class CModuleIndexDialog : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** Get the singleton instance. * diff --git a/bibletime/frontend/coptionsdialog.h b/bibletime/frontend/coptionsdialog.h index dbac0a2..5a8656e 100644 --- a/bibletime/frontend/coptionsdialog.h +++ b/bibletime/frontend/coptionsdialog.h @@ -52,7 +52,7 @@ class KActionCollection; */ class COptionsDialog : public KDialogBase, public CPointers { Q_OBJECT - TQ_OBJECT + public: COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection); diff --git a/bibletime/frontend/cprinter.h b/bibletime/frontend/cprinter.h index 67dab27..078cfe2 100644 --- a/bibletime/frontend/cprinter.h +++ b/bibletime/frontend/cprinter.h @@ -33,7 +33,7 @@ namespace Printing { */ class CPrinter : public TQObject, public Rendering::CDisplayRendering { Q_OBJECT - TQ_OBJECT + public: CPrinter( TQObject *parent, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions diff --git a/bibletime/frontend/cswordsetupdialog.h b/bibletime/frontend/cswordsetupdialog.h index 5b12c93..da54ed3 100644 --- a/bibletime/frontend/cswordsetupdialog.h +++ b/bibletime/frontend/cswordsetupdialog.h @@ -44,7 +44,7 @@ namespace BookshelfManager { */ class CSwordSetupDialog : public KDialogBase, public CPointers { Q_OBJECT - TQ_OBJECT + public: CSwordSetupDialog(TQWidget *parent=0, const char *name=0); diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.h b/bibletime/frontend/cswordsetupinstallsourcesdialog.h index d21283d..c26fe15 100644 --- a/bibletime/frontend/cswordsetupinstallsourcesdialog.h +++ b/bibletime/frontend/cswordsetupinstallsourcesdialog.h @@ -12,7 +12,7 @@ namespace BookshelfManager { class CSwordSetupInstallSourcesDialog : public TQDialog { Q_OBJECT - TQ_OBJECT + public: static sword::InstallSource getSource(); diff --git a/bibletime/frontend/cswordsetupmodulelistview.h b/bibletime/frontend/cswordsetupmodulelistview.h index 7de4149..bbdfb65 100644 --- a/bibletime/frontend/cswordsetupmodulelistview.h +++ b/bibletime/frontend/cswordsetupmodulelistview.h @@ -29,7 +29,7 @@ namespace BookshelfManager { class CSwordSetupModuleListView : public KListView { Q_OBJECT - TQ_OBJECT + public: CSwordSetupModuleListView(TQWidget* parent, bool is_remote, sword::InstallSource* installSource = 0); diff --git a/bibletime/frontend/display/cdisplay.h b/bibletime/frontend/display/cdisplay.h index 1b394ce..19ae581 100644 --- a/bibletime/frontend/display/cdisplay.h +++ b/bibletime/frontend/display/cdisplay.h @@ -142,7 +142,7 @@ private: class CDisplayConnections : public TQObject { Q_OBJECT - TQ_OBJECT + public: CDisplayConnections( CDisplay* parent ); diff --git a/bibletime/frontend/display/chtmlreaddisplay.h b/bibletime/frontend/display/chtmlreaddisplay.h index a4ef53d..8b9a5c8 100644 --- a/bibletime/frontend/display/chtmlreaddisplay.h +++ b/bibletime/frontend/display/chtmlreaddisplay.h @@ -32,7 +32,7 @@ class CHTMLReadDisplayView; */ class CHTMLReadDisplay : public KHTMLPart, public CReadDisplay { Q_OBJECT - TQ_OBJECT + public: //reimplemented functions from CDisplay /** @@ -114,7 +114,7 @@ protected slots: class CHTMLReadDisplayView : public KHTMLView, public CPointers { Q_OBJECT - TQ_OBJECT + protected: // Protected methods friend class CHTMLReadDisplay; diff --git a/bibletime/frontend/display/chtmlwritedisplay.h b/bibletime/frontend/display/chtmlwritedisplay.h index c0698e1..739eb94 100644 --- a/bibletime/frontend/display/chtmlwritedisplay.h +++ b/bibletime/frontend/display/chtmlwritedisplay.h @@ -34,7 +34,7 @@ class KColorButton; */ class CHTMLWriteDisplay : public CPlainWriteDisplay { Q_OBJECT - TQ_OBJECT + public: /** * Sets the new text for this display widget. diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.h b/bibletime/frontend/displaywindow/cbiblereadwindow.h index 1383225..339b34b 100644 --- a/bibletime/frontend/displaywindow/cbiblereadwindow.h +++ b/bibletime/frontend/displaywindow/cbiblereadwindow.h @@ -33,7 +33,7 @@ class CTransliterationButton; class CBibleReadWindow : public CLexiconReadWindow { Q_OBJECT - TQ_OBJECT + public: CBibleReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0); virtual ~CBibleReadWindow(); diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.h b/bibletime/frontend/displaywindow/cbookreadwindow.h index 1403f9e..694bdce 100644 --- a/bibletime/frontend/displaywindow/cbookreadwindow.h +++ b/bibletime/frontend/displaywindow/cbookreadwindow.h @@ -26,7 +26,7 @@ class CBookTreeChooser; */ class CBookReadWindow : public CLexiconReadWindow { Q_OBJECT - TQ_OBJECT + public: static void insertKeyboardActions( KActionCollection* const a ); diff --git a/bibletime/frontend/displaywindow/cbuttons.h b/bibletime/frontend/displaywindow/cbuttons.h index 5d9dcd7..98d748e 100644 --- a/bibletime/frontend/displaywindow/cbuttons.h +++ b/bibletime/frontend/displaywindow/cbuttons.h @@ -29,7 +29,7 @@ class KPopupMenu; */ // class CTransliterationButton : public KToolBarButton { // Q_OBJECT -// TQ_OBJECT +// // public: // CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, TQWidget *parent, const char *name=0); // ~CTransliterationButton(); @@ -58,7 +58,7 @@ class KPopupMenu; */ class CDisplaySettingsButton : public KToolBarButton { Q_OBJECT - TQ_OBJECT + public: CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, TQWidget *parent=0, const char *name=0); void reset(const ListCSwordModuleInfo& useModules); diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h index a5a233d..db7b966 100644 --- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h +++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h @@ -24,7 +24,7 @@ class CCommentaryReadWindow : public CLexiconReadWindow { Q_OBJECT - TQ_OBJECT + public: /** * Reimplementation. diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.h b/bibletime/frontend/displaywindow/cdisplaywindow.h index 65ee850..ae8c1c6 100644 --- a/bibletime/frontend/displaywindow/cdisplaywindow.h +++ b/bibletime/frontend/displaywindow/cdisplaywindow.h @@ -51,7 +51,7 @@ class KPopupMenu; class CDisplayWindow : public KMainWindow, public CPointers { Q_OBJECT - TQ_OBJECT + public: enum WriteWindowType { HTMLWindow = 1, diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.h b/bibletime/frontend/displaywindow/chtmlwritewindow.h index 03b9a8a..15e817a 100644 --- a/bibletime/frontend/displaywindow/chtmlwritewindow.h +++ b/bibletime/frontend/displaywindow/chtmlwritewindow.h @@ -25,7 +25,7 @@ class KAction; */ class CHTMLWriteWindow : public CPlainWriteWindow { Q_OBJECT - TQ_OBJECT + public: CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0); virtual ~CHTMLWriteWindow(); diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.h b/bibletime/frontend/displaywindow/clexiconreadwindow.h index 49d79da..01a82d3 100644 --- a/bibletime/frontend/displaywindow/clexiconreadwindow.h +++ b/bibletime/frontend/displaywindow/clexiconreadwindow.h @@ -32,7 +32,7 @@ class KToolBarPopupAction; class CLexiconReadWindow : public CReadWindow { Q_OBJECT - TQ_OBJECT + public: CLexiconReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0); virtual ~CLexiconReadWindow(); diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.h b/bibletime/frontend/displaywindow/cmodulechooserbar.h index bd9e76a..77dc520 100644 --- a/bibletime/frontend/displaywindow/cmodulechooserbar.h +++ b/bibletime/frontend/displaywindow/cmodulechooserbar.h @@ -31,7 +31,7 @@ */ class CModuleChooserBar : public KToolBar { Q_OBJECT - TQ_OBJECT + public: /** * Default constructor diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.h b/bibletime/frontend/displaywindow/cmodulechooserbutton.h index 01ecd24..9f1111a 100644 --- a/bibletime/frontend/displaywindow/cmodulechooserbutton.h +++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.h @@ -33,7 +33,7 @@ class CModuleChooserBar; */ class CModuleChooserButton : public KToolBarButton, public CPointers { Q_OBJECT - TQ_OBJECT + public: CModuleChooserButton(CSwordModuleInfo* useModule, CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name = 0 ); ~CModuleChooserButton(); diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.h b/bibletime/frontend/displaywindow/cplainwritewindow.h index 03780c6..541287f 100644 --- a/bibletime/frontend/displaywindow/cplainwritewindow.h +++ b/bibletime/frontend/displaywindow/cplainwritewindow.h @@ -27,7 +27,7 @@ class KToggleAction; */ class CPlainWriteWindow : public CWriteWindow { Q_OBJECT - TQ_OBJECT + public: CPlainWriteWindow( ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0 ); virtual ~CPlainWriteWindow(); diff --git a/bibletime/frontend/displaywindow/creadwindow.h b/bibletime/frontend/displaywindow/creadwindow.h index a99ae7b..e49bd8f 100644 --- a/bibletime/frontend/displaywindow/creadwindow.h +++ b/bibletime/frontend/displaywindow/creadwindow.h @@ -30,7 +30,7 @@ class KPopupMenu; class CReadWindow : public CDisplayWindow { Q_OBJECT - TQ_OBJECT + public: // static void insertKeyboardActions( KAccel* const a ); static void insertKeyboardActions( KActionCollection* const a ); diff --git a/bibletime/frontend/displaywindow/cwritewindow.h b/bibletime/frontend/displaywindow/cwritewindow.h index 0622f5e..122fb2b 100644 --- a/bibletime/frontend/displaywindow/cwritewindow.h +++ b/bibletime/frontend/displaywindow/cwritewindow.h @@ -25,7 +25,7 @@ class CWriteWindow : public CDisplayWindow { Q_OBJECT - TQ_OBJECT + public: static void insertKeyboardActions( KActionCollection* const a ); diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.h b/bibletime/frontend/keychooser/cbiblekeychooser.h index 9756085..34722e4 100644 --- a/bibletime/frontend/keychooser/cbiblekeychooser.h +++ b/bibletime/frontend/keychooser/cbiblekeychooser.h @@ -32,7 +32,7 @@ class CSwordBibleModuleInfo; class CBibleKeyChooser : public CKeyChooser { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/bibletime/frontend/keychooser/cbookkeychooser.h b/bibletime/frontend/keychooser/cbookkeychooser.h index 3b02090..7c5bb2c 100644 --- a/bibletime/frontend/keychooser/cbookkeychooser.h +++ b/bibletime/frontend/keychooser/cbookkeychooser.h @@ -40,7 +40,7 @@ class TQHBoxLayout; */ class CBookKeyChooser : public CKeyChooser { Q_OBJECT - TQ_OBJECT + public: CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *parent=0, const char *name=0); ~CBookKeyChooser(); diff --git a/bibletime/frontend/keychooser/cbooktreechooser.h b/bibletime/frontend/keychooser/cbooktreechooser.h index d9c81e1..10809f3 100644 --- a/bibletime/frontend/keychooser/cbooktreechooser.h +++ b/bibletime/frontend/keychooser/cbooktreechooser.h @@ -45,7 +45,7 @@ namespace sword { */ class CBookTreeChooser : public CKeyChooser { Q_OBJECT - TQ_OBJECT + public: CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *parent=0, const char *name=0); ~CBookTreeChooser(); diff --git a/bibletime/frontend/keychooser/ckeychooser.h b/bibletime/frontend/keychooser/ckeychooser.h index 49fffb2..79d2458 100644 --- a/bibletime/frontend/keychooser/ckeychooser.h +++ b/bibletime/frontend/keychooser/ckeychooser.h @@ -30,7 +30,7 @@ class CSwordKey; class CKeyChooser : public TQWidget { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.h b/bibletime/frontend/keychooser/ckeychooserwidget.h index d774f66..bc897df 100644 --- a/bibletime/frontend/keychooser/ckeychooserwidget.h +++ b/bibletime/frontend/keychooser/ckeychooserwidget.h @@ -37,7 +37,7 @@ class TQHBoxLayout; */ class CKCComboBox : public TQComboBox { Q_OBJECT - TQ_OBJECT + public: CKCComboBox(bool rw, TQWidget * parent=0, const char * name=0 ); @@ -72,7 +72,7 @@ signals: */ class CKeyChooserWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: /** * the constructor diff --git a/bibletime/frontend/keychooser/ckeyreferencewidget.h b/bibletime/frontend/keychooser/ckeyreferencewidget.h index 84eed2e..eaee9ff 100644 --- a/bibletime/frontend/keychooser/ckeyreferencewidget.h +++ b/bibletime/frontend/keychooser/ckeyreferencewidget.h @@ -26,7 +26,7 @@ class CSwordVerseKey; class CKeyReferenceCompletion : public KCompletion { Q_OBJECT - TQ_OBJECT + public: CKeyReferenceCompletion(CSwordBibleModuleInfo*); TQString makeCompletion(const TQString &); @@ -38,7 +38,7 @@ private: class CKeyReferenceLineEdit : public KLineEdit { Q_OBJECT - TQ_OBJECT + public: CKeyReferenceLineEdit(TQWidget *parent=0, const char *name=0); void makeCompletion(const TQString &); @@ -46,7 +46,7 @@ public: class CKeyReferenceWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: /** * the constructor diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.h b/bibletime/frontend/keychooser/clexiconkeychooser.h index 2bdb838..41d2729 100644 --- a/bibletime/frontend/keychooser/clexiconkeychooser.h +++ b/bibletime/frontend/keychooser/clexiconkeychooser.h @@ -31,7 +31,7 @@ class TQHBoxLayout; */ class CLexiconKeyChooser : public CKeyChooser { Q_OBJECT - TQ_OBJECT + public: /** * The constructor diff --git a/bibletime/frontend/keychooser/crefselectdialog.h b/bibletime/frontend/keychooser/crefselectdialog.h index 73a1411..51f6666 100644 --- a/bibletime/frontend/keychooser/crefselectdialog.h +++ b/bibletime/frontend/keychooser/crefselectdialog.h @@ -26,7 +26,7 @@ class TQLineEdit; //class CRefSelectDialog : public KDialogBase { // Q_OBJECT - TQ_OBJECT + // public: // CRefSelectDialog(TQWidget *parent); // virtual ~CRefSelectDialog(); diff --git a/bibletime/frontend/keychooser/cscrollbutton.h b/bibletime/frontend/keychooser/cscrollbutton.h index 8eeb234..0df6789 100644 --- a/bibletime/frontend/keychooser/cscrollbutton.h +++ b/bibletime/frontend/keychooser/cscrollbutton.h @@ -22,7 +22,7 @@ class TQMouseEvent; */ class CScrollButton : public TQToolButton { Q_OBJECT - TQ_OBJECT + public: /** * The constructor diff --git a/bibletime/frontend/keychooser/cscrollerwidgetset.h b/bibletime/frontend/keychooser/cscrollerwidgetset.h index 75d710a..9b49724 100644 --- a/bibletime/frontend/keychooser/cscrollerwidgetset.h +++ b/bibletime/frontend/keychooser/cscrollerwidgetset.h @@ -29,7 +29,7 @@ */ class CScrollerWidgetSet : public TQWidget { Q_OBJECT - TQ_OBJECT + public: /** * the constructor diff --git a/bibletime/frontend/mainindex/cmainindex.h b/bibletime/frontend/mainindex/cmainindex.h index 5c2d62d..9f84dd9 100644 --- a/bibletime/frontend/mainindex/cmainindex.h +++ b/bibletime/frontend/mainindex/cmainindex.h @@ -36,7 +36,7 @@ class CSearchDialog; */ class CMainIndex : public KListView { Q_OBJECT - TQ_OBJECT + class ToolTip : public TQToolTip { public: diff --git a/bibletime/frontend/searchdialog/cmodulechooser.h b/bibletime/frontend/searchdialog/cmodulechooser.h index 06b20f2..8cb47bc 100644 --- a/bibletime/frontend/searchdialog/cmodulechooser.h +++ b/bibletime/frontend/searchdialog/cmodulechooser.h @@ -40,7 +40,7 @@ namespace Search { class CModuleChooser : public KListView, public CPointers { Q_OBJECT - TQ_OBJECT + public: class ModuleCheckBoxItem : virtual public TQCheckListItem { public: @@ -85,7 +85,7 @@ protected: // Protected methods class CModuleChooserDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: CModuleChooserDialog(TQWidget* parentDialog, ListCSwordModuleInfo modules); ~CModuleChooserDialog(); diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.h b/bibletime/frontend/searchdialog/cmoduleresultview.h index 056f394..4f2c37f 100644 --- a/bibletime/frontend/searchdialog/cmoduleresultview.h +++ b/bibletime/frontend/searchdialog/cmoduleresultview.h @@ -41,7 +41,7 @@ namespace Search { class CModuleResultView : public KListView { Q_OBJECT - TQ_OBJECT + public: CModuleResultView(TQWidget* parent, const char* name = 0); ~CModuleResultView(); diff --git a/bibletime/frontend/searchdialog/crangechooser.h b/bibletime/frontend/searchdialog/crangechooser.h index 35d916a..6d4d2d9 100644 --- a/bibletime/frontend/searchdialog/crangechooser.h +++ b/bibletime/frontend/searchdialog/crangechooser.h @@ -46,7 +46,7 @@ namespace Search { class CRangeChooserDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: CRangeChooserDialog(TQWidget* parentDialog); ~CRangeChooserDialog(); diff --git a/bibletime/frontend/searchdialog/csearchanalysis.h b/bibletime/frontend/searchdialog/csearchanalysis.h index 6a8d460..04ea676 100644 --- a/bibletime/frontend/searchdialog/csearchanalysis.h +++ b/bibletime/frontend/searchdialog/csearchanalysis.h @@ -52,7 +52,7 @@ class CSearchAnalysisView; */ class CSearchAnalysis : public TQCanvas { Q_OBJECT - TQ_OBJECT + public: CSearchAnalysis(TQObject *parent=0, const char *name=0); virtual ~CSearchAnalysis(); @@ -102,7 +102,7 @@ public slots: // Public slots class CSearchAnalysisDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: CSearchAnalysisDialog(ListCSwordModuleInfo modules, TQWidget* parentDialog); ~CSearchAnalysisDialog(); @@ -180,7 +180,7 @@ private: //---------------------------------------------------------- class CSearchAnalysisView : public TQCanvasView { Q_OBJECT - TQ_OBJECT + public: /** * Standard constructor diff --git a/bibletime/frontend/searchdialog/csearchdialog.h b/bibletime/frontend/searchdialog/csearchdialog.h index 231fdb2..3009969 100644 --- a/bibletime/frontend/searchdialog/csearchdialog.h +++ b/bibletime/frontend/searchdialog/csearchdialog.h @@ -46,7 +46,7 @@ namespace Search { */ class CSearchDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: static void openDialog(const ListCSwordModuleInfo modules, const TQString& searchText = TQString(), TQWidget* parentDialog = 0); diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.h b/bibletime/frontend/searchdialog/csearchdialogpages.h index 0a7e482..a3f6b38 100644 --- a/bibletime/frontend/searchdialog/csearchdialogpages.h +++ b/bibletime/frontend/searchdialog/csearchdialogpages.h @@ -151,7 +151,7 @@ private: */ class CSearchResultPage : public SearchResultsForm { Q_OBJECT - TQ_OBJECT + public: CSearchResultPage(TQWidget *parent=0, const char *name=0); ~CSearchResultPage(); @@ -208,7 +208,7 @@ protected slots: // Protected slots class CSearchOptionsPage : public SearchOptionsForm { Q_OBJECT - TQ_OBJECT + public: CSearchOptionsPage(TQWidget *parent=0, const char *name=0); ~CSearchOptionsPage(); diff --git a/bibletime/frontend/searchdialog/csearchresultview.h b/bibletime/frontend/searchdialog/csearchresultview.h index f957534..65b0cf5 100644 --- a/bibletime/frontend/searchdialog/csearchresultview.h +++ b/bibletime/frontend/searchdialog/csearchresultview.h @@ -38,7 +38,7 @@ namespace Search { class CSearchResultView : public KListView { Q_OBJECT - TQ_OBJECT + public: CSearchResultView(TQWidget* parent, const char* name = 0); virtual ~CSearchResultView(); -- cgit v1.2.3