diff options
Diffstat (limited to 'lib')
66 files changed, 74 insertions, 74 deletions
diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index 91945e53..01d7c5cd 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -598,7 +598,7 @@ void Driver::setupLexer( Lexer * lexer ) { // qt lexer->addSkipWord( "Q_OBJECT" ); - lexer->addSkipWord( "TQ_OBJECT" ); + lexer->addSkipWord( "" ); lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); lexer->addSkipWord( "Q_ENUMS", SkipWordAndArguments ); lexer->addSkipWord( "TQ_PROPERTY", SkipWordAndArguments ); diff --git a/lib/cppparser/keywords.h b/lib/cppparser/keywords.h index 34aabd3c..5c48324d 100644 --- a/lib/cppparser/keywords.h +++ b/lib/cppparser/keywords.h @@ -10,7 +10,7 @@ INSERT( "k_dcop_signals", Token_k_dcop_signals ); // TQt Keywords INSERT( "Q_OBJECT", Token_Q_OBJECT ); -INSERT( "TQ_OBJECT", Token_TQ_OBJECT ); +INSERT( "", Token_ ); INSERT( "signals", Token_signals ); INSERT( "slots", Token_slots ); INSERT( "emit", Token_emit ); diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index 12f16696..047fc864 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -61,7 +61,7 @@ enum Type { Token_k_dcop_signals, Token_Q_OBJECT, - Token_TQ_OBJECT, + Token_, Token_signals, Token_slots, Token_emit, diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp index 08b4e6bb..a9b77ed2 100644 --- a/lib/cppparser/parser.cpp +++ b/lib/cppparser/parser.cpp @@ -2005,7 +2005,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) if( lex->lookAhead(0) == ';' ){ nextToken(); return true; - } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ + } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_ || lex->lookAhead(0) == Token_K_DCOP ){ nextToken(); return true; } else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){ diff --git a/lib/interfaces/KDevCoreIface.h b/lib/interfaces/KDevCoreIface.h index 7c2aa411..d7eb37bd 100644 --- a/lib/interfaces/KDevCoreIface.h +++ b/lib/interfaces/KDevCoreIface.h @@ -30,7 +30,7 @@ class KDevCore; class KDevCoreIface : public TQObject, public DCOPObject { Q_OBJECT -// TQ_OBJECT +// K_DCOP public: diff --git a/lib/interfaces/KDevPartControllerIface.h b/lib/interfaces/KDevPartControllerIface.h index b140df97..8c3647ea 100644 --- a/lib/interfaces/KDevPartControllerIface.h +++ b/lib/interfaces/KDevPartControllerIface.h @@ -28,7 +28,7 @@ class KDevPartController; class KDevPartControllerIface : public TQObject, public DCOPObject { Q_OBJECT -// TQ_OBJECT +// K_DCOP public: diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h index 7cef01c9..e8158fe4 100644 --- a/lib/interfaces/extensions/codebrowserfrontend.h +++ b/lib/interfaces/extensions/codebrowserfrontend.h @@ -27,7 +27,7 @@ namespace Extensions { class KDevCodeBrowserFrontend : public KDevPlugin { Q_OBJECT - TQ_OBJECT + public: KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h index 5a16984b..0e065055 100644 --- a/lib/interfaces/extensions/kdevappfrontend.h +++ b/lib/interfaces/extensions/kdevappfrontend.h @@ -57,7 +57,7 @@ if (apf) { class KDevAppFrontend : public KDevPlugin { Q_OBJECT - TQ_OBJECT + public: /**Constructor. diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h index 485f4b43..978f118f 100644 --- a/lib/interfaces/extensions/kdevmakefrontend.h +++ b/lib/interfaces/extensions/kdevmakefrontend.h @@ -53,7 +53,7 @@ if (mf) { class KDevMakeFrontend : public KDevPlugin { Q_OBJECT - TQ_OBJECT + public: diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h index 2b61805d..4a0b4095 100644 --- a/lib/interfaces/extensions/kdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -135,7 +135,7 @@ if (vcs) { class KDevVersionControl: public KDevPlugin { Q_OBJECT - TQ_OBJECT + public: /**Constructs a VCS plugin. @@ -185,7 +185,7 @@ Basic interface for providing info on file registered in a version control repos class KDevVCSFileInfoProvider: public TQObject { Q_OBJECT - TQ_OBJECT + public: /**Constructor. @param parent The parent VCS plugin. diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h index c071f2db..936ae810 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -65,7 +65,7 @@ mimetype then it becomes automatically integrated into KDevelop IDE. */ class Designer: public KParts::ReadWritePart{ Q_OBJECT - TQ_OBJECT + public: Designer(TQObject *parent, const char *name); diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h index abdcf2ea..f7ed383d 100644 --- a/lib/interfaces/extras/kdevcompileroptions.h +++ b/lib/interfaces/extras/kdevcompileroptions.h @@ -72,7 +72,7 @@ if ( plugin ) class KDevCompilerOptions : public TQObject { Q_OBJECT - TQ_OBJECT + public: KDevCompilerOptions( TQObject *parent=0, const char *name=0 ); diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h index c12d87c4..3715d8b5 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.h +++ b/lib/interfaces/extras/kdevvcsintegrator.h @@ -64,7 +64,7 @@ It can, for example, perform checkout or import operations. */ class KDevVCSIntegrator: public TQObject { Q_OBJECT - TQ_OBJECT + public: KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0); diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h index 97ef2ad4..8bdbdf8f 100644 --- a/lib/interfaces/katedocumentmanagerinterface.h +++ b/lib/interfaces/katedocumentmanagerinterface.h @@ -33,7 +33,7 @@ This is an emulated interface to provide compatibility with Kate scripts. class KateDocumentManagerInterface : public TQObject, public DCOPObject { Q_OBJECT -// TQ_OBJECT +// K_DCOP public: KateDocumentManagerInterface( KDevPartController *pc ); diff --git a/lib/interfaces/kdevapi.h b/lib/interfaces/kdevapi.h index 9af6d074..b118001d 100644 --- a/lib/interfaces/kdevapi.h +++ b/lib/interfaces/kdevapi.h @@ -47,7 +47,7 @@ class because @ref KDevPlugin already provides API convenience methods. class KDevApi: public TQObject { Q_OBJECT - TQ_OBJECT + public: /**Constructor.*/ KDevApi(); diff --git a/lib/interfaces/kdevcoderepository.h b/lib/interfaces/kdevcoderepository.h index 768c8030..f7f53291 100644 --- a/lib/interfaces/kdevcoderepository.h +++ b/lib/interfaces/kdevcoderepository.h @@ -48,7 +48,7 @@ symbol store like @ref CodeModel. class KDevCodeRepository : public TQObject { Q_OBJECT - TQ_OBJECT + public: /**Constructor.*/ KDevCodeRepository(); diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index efba7d50..3d58a1d7 100644 --- a/lib/interfaces/kdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -300,7 +300,7 @@ It defines: class KDevCore: public TQObject { Q_OBJECT - TQ_OBJECT + public: /**Constructor @param parent The TQObject that's the parent of this class. diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h index 33ec4b69..78501616 100644 --- a/lib/interfaces/kdevdesignerintegration.h +++ b/lib/interfaces/kdevdesignerintegration.h @@ -51,7 +51,7 @@ and reimplement slots defined in the form. class KDevDesignerIntegration : public TQObject { Q_OBJECT - TQ_OBJECT + public: /**Constructor. @param parent Parent object. diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h index f366c303..7753e6b9 100644 --- a/lib/interfaces/kdevlanguagesupport.h +++ b/lib/interfaces/kdevlanguagesupport.h @@ -61,7 +61,7 @@ formatted name). class KDevLanguageSupport: public KDevPlugin { Q_OBJECT - TQ_OBJECT + public: diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h index 65baa0e4..8c237bf3 100644 --- a/lib/interfaces/kdevpartcontroller.h +++ b/lib/interfaces/kdevpartcontroller.h @@ -56,7 +56,7 @@ GUI designers, etc. class KDevPartController: public KParts::PartManager { Q_OBJECT - TQ_OBJECT + public: /**Constructor. diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h index 2809fbde..f174e02b 100644 --- a/lib/interfaces/kdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -107,7 +107,7 @@ from shell applications. class KDevPlugin: public TQObject, public KXMLGUIClient { Q_OBJECT - TQ_OBJECT + public: /**Constructs a plugin. diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h index fab3a6a6..8458e8ef 100644 --- a/lib/interfaces/kdevplugincontroller.h +++ b/lib/interfaces/kdevplugincontroller.h @@ -39,7 +39,7 @@ Plugin controller is responsible for quering, loading and unloading available pl class KDevPluginController: public TQObject { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h index 4fcd7539..d567906b 100644 --- a/lib/interfaces/kdevproject.h +++ b/lib/interfaces/kdevproject.h @@ -48,7 +48,7 @@ as a way of providing support for a build system (like it is done in KDevelop ID class KDevProject: public KDevPlugin { Q_OBJECT - TQ_OBJECT + public: /**Constructs a project plugin. @param info Important information about the plugin - plugin internal and generic diff --git a/lib/interfaces/kdevprojectiface.h b/lib/interfaces/kdevprojectiface.h index 59323f71..e30cd6cc 100644 --- a/lib/interfaces/kdevprojectiface.h +++ b/lib/interfaces/kdevprojectiface.h @@ -34,7 +34,7 @@ DCOP Interface for the @ref KDevProject object. class KDevProjectIface : public TQObject, public DCOPObject { Q_OBJECT -// TQ_OBJECT +// K_DCOP public: KDevProjectIface(KDevProject *prj); diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingkprocess.h index 3db2c170..f6fa9d2e 100644 --- a/lib/util/blockingkprocess.h +++ b/lib/util/blockingkprocess.h @@ -31,7 +31,7 @@ class TQTimer; class BlockingKProcess : public KProcess { Q_OBJECT - TQ_OBJECT + public: BlockingKProcess(TQObject *parent, const char *name=0); diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index 145483b1..7881f830 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -71,7 +71,7 @@ KDevCore::projectConfigWidget() slots. class ConfigWidgetProxy : public TQObject { Q_OBJECT - TQ_OBJECT + public: /**Constructor. diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h index abdcd687..540e5b1a 100644 --- a/lib/util/execcommand.h +++ b/lib/util/execcommand.h @@ -45,7 +45,7 @@ Command execution facilities. class ExecCommand : public TQObject { Q_OBJECT - TQ_OBJECT + public: ExecCommand( const TQString& executable, const TQStringList& args, const TQString& workingDir = TQString(), diff --git a/lib/util/kdevjobtimer.h b/lib/util/kdevjobtimer.h index 09c325f3..b0fa829e 100644 --- a/lib/util/kdevjobtimer.h +++ b/lib/util/kdevjobtimer.h @@ -17,7 +17,7 @@ class KDevJobTimer : public TQTimer { Q_OBJECT - TQ_OBJECT + public: static void singleShot( int msec, TQObject * receiver, const char * member, void * payload ); diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h index 81e81eff..2743c829 100644 --- a/lib/util/kdevshellwidget.h +++ b/lib/util/kdevshellwidget.h @@ -27,7 +27,7 @@ class KDevShellWidget : public TQVBox { Q_OBJECT - TQ_OBJECT + public: KDevShellWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/lib/util/kscriptactionmanager.h b/lib/util/kscriptactionmanager.h index fa2c53ed..c2e43238 100644 --- a/lib/util/kscriptactionmanager.h +++ b/lib/util/kscriptactionmanager.h @@ -37,7 +37,7 @@ class TQTimer; */ class KScriptAction : public TQObject, public KScriptClientInterface { Q_OBJECT - TQ_OBJECT + public: KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ); @@ -93,7 +93,7 @@ private: */ class KScriptActionManager : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/lib/widgets/flagboxes.h b/lib/widgets/flagboxes.h index 76e7ab84..ce5c6205 100644 --- a/lib/widgets/flagboxes.h +++ b/lib/widgets/flagboxes.h @@ -68,7 +68,7 @@ private: class FlagListBox : public TQListView { Q_OBJECT - TQ_OBJECT + public: FlagListBox( TQWidget *parent=0, const char *name=0 ); ~FlagListBox() @@ -83,7 +83,7 @@ public: class FlagCheckBox : public TQCheckBox { Q_OBJECT - TQ_OBJECT + public: FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description); @@ -110,7 +110,7 @@ private: class FlagRadioButton : public TQRadioButton { Q_OBJECT - TQ_OBJECT + public: FlagRadioButton(TQWidget *parent, FlagRadioButtonController *controller, const TQString &flagstr, const TQString &description); @@ -126,7 +126,7 @@ private: class FlagPathEdit: public TQWidget { Q_OBJECT - TQ_OBJECT + public: /**If the pathDelimiter is not empty then path edit can contain a list of paths*/ FlagPathEdit(TQWidget *parent, TQString pathDelimiter, FlagPathEditController *controller, @@ -156,7 +156,7 @@ private: class FlagListEdit: public TQWidget { Q_OBJECT - TQ_OBJECT + public: /**If the listDelimiter is not empty then list edit can contain a list of entries*/ FlagListEdit(TQWidget *parent, TQString listDelimiter, FlagEditController *controller, diff --git a/lib/widgets/kcomboview.h b/lib/widgets/kcomboview.h index 981eaa1a..8a72e5e8 100644 --- a/lib/widgets/kcomboview.h +++ b/lib/widgets/kcomboview.h @@ -55,7 +55,7 @@ class CustomCompleter : public KCompletion { class KComboView: public QComboView { Q_OBJECT - TQ_OBJECT + public: ///The combo-view takes the ownership of the completer and deletes it on destruction KComboView( bool rw, int defaultWidth = 100, TQWidget* parent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() ); diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h index 22da1d65..c9520d7f 100644 --- a/lib/widgets/kdevhtmlpart.h +++ b/lib/widgets/kdevhtmlpart.h @@ -44,7 +44,7 @@ It has it's own popup menu and font/zoom settings. class KDevHTMLPart : public KHTMLPart { Q_OBJECT - TQ_OBJECT + public: diff --git a/lib/widgets/ksavealldialog.h b/lib/widgets/ksavealldialog.h index 36b5089a..a122b11a 100644 --- a/lib/widgets/ksavealldialog.h +++ b/lib/widgets/ksavealldialog.h @@ -36,7 +36,7 @@ Dialog to save selected files. class KSaveSelectDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ); @@ -62,7 +62,7 @@ Dialog to save all files. class KSaveAllDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: enum SaveAllResult{ SaveAll, Cancel, Revert }; diff --git a/lib/widgets/processlinemaker.h b/lib/widgets/processlinemaker.h index f304cdd8..e75824cd 100644 --- a/lib/widgets/processlinemaker.h +++ b/lib/widgets/processlinemaker.h @@ -35,7 +35,7 @@ Convenience class to catch output of KProcess. class ProcessLineMaker : public TQObject { Q_OBJECT - TQ_OBJECT + public: ProcessLineMaker(); diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index 814db870..935c7456 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -58,7 +58,7 @@ private: class ProcessWidget : public KListBox { Q_OBJECT - TQ_OBJECT + public: ProcessWidget(TQWidget *parent, const char *name=0); diff --git a/lib/widgets/propeditor/pcheckbox.h b/lib/widgets/propeditor/pcheckbox.h index 8a7ff781..ed2aea39 100644 --- a/lib/widgets/propeditor/pcheckbox.h +++ b/lib/widgets/propeditor/pcheckbox.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PCheckBox: public PropertyWidget{ Q_OBJECT - TQ_OBJECT + public: PCheckBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pcolorbutton.h b/lib/widgets/propeditor/pcolorbutton.h index d7b7494e..ab17b449 100644 --- a/lib/widgets/propeditor/pcolorbutton.h +++ b/lib/widgets/propeditor/pcolorbutton.h @@ -36,7 +36,7 @@ namespace PropertyLib{ class PColorButton: public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PColorButton(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pcolorcombo.h b/lib/widgets/propeditor/pcolorcombo.h index 3b189cb6..052c287d 100644 --- a/lib/widgets/propeditor/pcolorcombo.h +++ b/lib/widgets/propeditor/pcolorcombo.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PColorCombo: public PropertyWidget{ Q_OBJECT - TQ_OBJECT + public: PColorCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pcombobox.h b/lib/widgets/propeditor/pcombobox.h index 82ccd220..98937eaa 100644 --- a/lib/widgets/propeditor/pcombobox.h +++ b/lib/widgets/propeditor/pcombobox.h @@ -35,7 +35,7 @@ namespace PropertyLib{ */ class PComboBox: public PropertyWidget{ Q_OBJECT - TQ_OBJECT + public: /**This constructor is used for read-only selection combo. It provides a value from valueList*/ PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pcursoredit.h b/lib/widgets/propeditor/pcursoredit.h index 34bede80..1d3925ae 100644 --- a/lib/widgets/propeditor/pcursoredit.h +++ b/lib/widgets/propeditor/pcursoredit.h @@ -30,7 +30,7 @@ namespace PropertyLib{ class PCursorEdit: public PComboBox { Q_OBJECT - TQ_OBJECT + public: PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/pdateedit.h b/lib/widgets/propeditor/pdateedit.h index 8348a24d..126a4023 100644 --- a/lib/widgets/propeditor/pdateedit.h +++ b/lib/widgets/propeditor/pdateedit.h @@ -32,7 +32,7 @@ namespace PropertyLib{ class PDateEdit : public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PDateEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/pdatetimeedit.h b/lib/widgets/propeditor/pdatetimeedit.h index 57130322..4b54714b 100644 --- a/lib/widgets/propeditor/pdatetimeedit.h +++ b/lib/widgets/propeditor/pdatetimeedit.h @@ -32,7 +32,7 @@ namespace PropertyLib{ class PDateTimeEdit : public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PDateTimeEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/pdoublenuminput.h b/lib/widgets/propeditor/pdoublenuminput.h index c3ef0d35..a26c2b0f 100644 --- a/lib/widgets/propeditor/pdoublenuminput.h +++ b/lib/widgets/propeditor/pdoublenuminput.h @@ -36,7 +36,7 @@ namespace PropertyLib{ class PDoubleNumInput: public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PDoubleNumInput(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pdummywidget.h b/lib/widgets/propeditor/pdummywidget.h index 55649b45..dad94591 100644 --- a/lib/widgets/propeditor/pdummywidget.h +++ b/lib/widgets/propeditor/pdummywidget.h @@ -40,7 +40,7 @@ like TQValueList's or TQMap's stored in a variant. class PDummyWidget: public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PDummyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h index 91c07d81..761cb003 100644 --- a/lib/widgets/propeditor/pfontbutton.h +++ b/lib/widgets/propeditor/pfontbutton.h @@ -32,7 +32,7 @@ namespace PropertyLib{ class PFontButton : public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PFontButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h index ec22f662..f3ede408 100644 --- a/lib/widgets/propeditor/pfontcombo.h +++ b/lib/widgets/propeditor/pfontcombo.h @@ -35,7 +35,7 @@ namespace PropertyLib{ */ class PFontCombo: public PropertyWidget{ Q_OBJECT - TQ_OBJECT + public: PFontCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/plineedit.h b/lib/widgets/propeditor/plineedit.h index 46ee3963..4730a5c7 100644 --- a/lib/widgets/propeditor/plineedit.h +++ b/lib/widgets/propeditor/plineedit.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PLineEdit: public PropertyWidget{ Q_OBJECT - TQ_OBJECT + public: PLineEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/plinestyleedit.h b/lib/widgets/propeditor/plinestyleedit.h index 8d0a5347..2df5f3be 100644 --- a/lib/widgets/propeditor/plinestyleedit.h +++ b/lib/widgets/propeditor/plinestyleedit.h @@ -31,7 +31,7 @@ namespace PropertyLib { */ class PLineStyleEdit : public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PLineStyleEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/ppixmapedit.h b/lib/widgets/propeditor/ppixmapedit.h index cbffa443..1d95b6b5 100644 --- a/lib/widgets/propeditor/ppixmapedit.h +++ b/lib/widgets/propeditor/ppixmapedit.h @@ -33,7 +33,7 @@ namespace PropertyLib{ class PPixmapEdit : public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PPixmapEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/ppointedit.h b/lib/widgets/propeditor/ppointedit.h index 3deb3d94..b6f9f9ad 100644 --- a/lib/widgets/propeditor/ppointedit.h +++ b/lib/widgets/propeditor/ppointedit.h @@ -32,7 +32,7 @@ namespace PropertyLib{ class PPointEdit : public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PPointEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/prectedit.h b/lib/widgets/propeditor/prectedit.h index 09cf11c7..82abcda1 100644 --- a/lib/widgets/propeditor/prectedit.h +++ b/lib/widgets/propeditor/prectedit.h @@ -32,7 +32,7 @@ namespace PropertyLib{ class PRectEdit : public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PRectEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h index 2fdbe432..7cfa8521 100644 --- a/lib/widgets/propeditor/propertyeditor.h +++ b/lib/widgets/propeditor/propertyeditor.h @@ -57,7 +57,7 @@ creation of property widgets from the machine factory. */ class PropertyEditor: public KListView{ Q_OBJECT - TQ_OBJECT + public: /**Constructs the property editor.*/ PropertyEditor(TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/propertylist.h b/lib/widgets/propeditor/propertylist.h index 94baf50d..9cee76f8 100644 --- a/lib/widgets/propeditor/propertylist.h +++ b/lib/widgets/propeditor/propertylist.h @@ -55,7 +55,7 @@ alphabetically sorted list of properties or both at the same time. class PropertyList: public TQObject { Q_OBJECT - TQ_OBJECT + public: class Iterator { @@ -182,7 +182,7 @@ buf->intersect(list3); */ class PropertyBuffer: public PropertyList{ Q_OBJECT - TQ_OBJECT + public: /**Constructs a buffer from given property list.*/ PropertyBuffer(PropertyList *list); diff --git a/lib/widgets/propeditor/propertywidget.h b/lib/widgets/propeditor/propertywidget.h index 2105a220..f1cec5bc 100644 --- a/lib/widgets/propeditor/propertywidget.h +++ b/lib/widgets/propeditor/propertywidget.h @@ -48,7 +48,7 @@ in the library. */ class PropertyWidget: public TQWidget{ Q_OBJECT - TQ_OBJECT + public: /**Constructs widget for property with name "propertyName".*/ PropertyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/propertywidgetproxy.h b/lib/widgets/propeditor/propertywidgetproxy.h index 642d7824..37bbadb8 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.h +++ b/lib/widgets/propeditor/propertywidgetproxy.h @@ -42,7 +42,7 @@ depending on the property type. class PropertyWidgetProxy: public TQWidget { Q_OBJECT - TQ_OBJECT + TQ_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true ) TQ_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false ) public: diff --git a/lib/widgets/propeditor/psizeedit.h b/lib/widgets/propeditor/psizeedit.h index 43da3c55..34acbb41 100644 --- a/lib/widgets/propeditor/psizeedit.h +++ b/lib/widgets/propeditor/psizeedit.h @@ -34,7 +34,7 @@ namespace PropertyLib{ class PSizeEdit: public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PSizeEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/psizepolicyedit.h b/lib/widgets/propeditor/psizepolicyedit.h index 586b4cba..58b661f6 100644 --- a/lib/widgets/propeditor/psizepolicyedit.h +++ b/lib/widgets/propeditor/psizepolicyedit.h @@ -34,7 +34,7 @@ namespace PropertyLib{ class PSizePolicyEdit : public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent=0, const char* name=0); diff --git a/lib/widgets/propeditor/pspinbox.h b/lib/widgets/propeditor/pspinbox.h index 3b6da02a..ecb73907 100644 --- a/lib/widgets/propeditor/pspinbox.h +++ b/lib/widgets/propeditor/pspinbox.h @@ -31,7 +31,7 @@ namespace PropertyLib{ */ class PSpinBox: public PropertyWidget{ Q_OBJECT - TQ_OBJECT + public: PSpinBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/pstringlistedit.h b/lib/widgets/propeditor/pstringlistedit.h index 7e651e43..85b2ecc7 100644 --- a/lib/widgets/propeditor/pstringlistedit.h +++ b/lib/widgets/propeditor/pstringlistedit.h @@ -35,7 +35,7 @@ namespace PropertyLib{ class PStringListEdit: public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PStringListEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/psymbolcombo.h b/lib/widgets/propeditor/psymbolcombo.h index adb88e78..52750fa1 100644 --- a/lib/widgets/propeditor/psymbolcombo.h +++ b/lib/widgets/propeditor/psymbolcombo.h @@ -34,7 +34,7 @@ namespace PropertyLib{ */ class PSymbolCombo: public PropertyWidget{ Q_OBJECT - TQ_OBJECT + public: PSymbolCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); diff --git a/lib/widgets/propeditor/purledit.h b/lib/widgets/propeditor/purledit.h index 396b16ba..88435a40 100644 --- a/lib/widgets/propeditor/purledit.h +++ b/lib/widgets/propeditor/purledit.h @@ -39,7 +39,7 @@ namespace PropertyLib{ class PUrlEdit : public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: #ifndef PURE_QT enum Mode {File = KFile::File,Directory = KFile::Directory}; diff --git a/lib/widgets/propeditor/pyesnobutton.h b/lib/widgets/propeditor/pyesnobutton.h index 412d167d..bb899186 100644 --- a/lib/widgets/propeditor/pyesnobutton.h +++ b/lib/widgets/propeditor/pyesnobutton.h @@ -32,7 +32,7 @@ namespace PropertyLib{ class PYesNoButton : public PropertyWidget { Q_OBJECT - TQ_OBJECT + public: PYesNoButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); diff --git a/lib/widgets/propeditor/qeditlistbox.h b/lib/widgets/propeditor/qeditlistbox.h index 2750623b..b57c454e 100644 --- a/lib/widgets/propeditor/qeditlistbox.h +++ b/lib/widgets/propeditor/qeditlistbox.h @@ -45,7 +45,7 @@ class QEditListBoxPrivate; class QEditListBox : public TQGroupBox { Q_OBJECT - TQ_OBJECT + TQ_PROPERTY( TQStringList items READ items WRITE setItems ) diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h index 35eef4f1..b97bb3c9 100644 --- a/lib/widgets/qcomboview.h +++ b/lib/widgets/qcomboview.h @@ -41,7 +41,7 @@ in the same way as TQComboBox and have similar API. class TQ_EXPORT QComboView : public TQWidget { Q_OBJECT - TQ_OBJECT + Q_ENUMS( Policy ) TQ_PROPERTY( bool editable READ editable WRITE setEditable ) // TQ_PROPERTY( int count READ count ) diff --git a/lib/widgets/resizablecombo.h b/lib/widgets/resizablecombo.h index ecaa2058..4852f3dc 100644 --- a/lib/widgets/resizablecombo.h +++ b/lib/widgets/resizablecombo.h @@ -37,7 +37,7 @@ Used to place resizable KComboBox onto toolbars. */ class ResizableCombo: public TQWidget{ Q_OBJECT - TQ_OBJECT + public: ResizableCombo(KComboView *view, TQWidget *parent = 0, const char *name = 0); |