diff options
Diffstat (limited to 'libtdepim')
-rw-r--r-- | libtdepim/cfgc/example.cfg | 4 | ||||
-rw-r--r-- | libtdepim/designerfields.cpp | 62 | ||||
-rw-r--r-- | libtdepim/kcmdesignerfields.cpp | 14 |
3 files changed, 40 insertions, 40 deletions
diff --git a/libtdepim/cfgc/example.cfg b/libtdepim/cfgc/example.cfg index 18c7b8b15..6b07152aa 100644 --- a/libtdepim/cfgc/example.cfg +++ b/libtdepim/cfgc/example.cfg @@ -27,12 +27,12 @@ </entry> </group> <group name="MyOptions"> - <entry type=TQSTRING_OBJECT_NAME_STRING> + <entry type="TQString"> <name>MyString</name> <label>This is a string</label> <default>Default String</default> </entry> - <entry type=TQSTRINGLIST_OBJECT_NAME_STRING> + <entry type="TQStringList"> <name>MyStringList</name> <default>up,down</default> </entry> diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp index c30d19866..71089c917 100644 --- a/libtdepim/designerfields.cpp +++ b/libtdepim/designerfields.cpp @@ -63,16 +63,16 @@ void DesignerFields::initGUI( const TQString &uiFile ) layout->addWidget( wdg ); - TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = wdg->queryList( "TQWidget" ); TQObjectListIt it( *list ); TQStringList allowedTypes; - allowedTypes << TQLINEEDIT_OBJECT_NAME_STRING - << TQTEXTEDIT_OBJECT_NAME_STRING - << TQSPINBOX_OBJECT_NAME_STRING - << TQCHECKBOX_OBJECT_NAME_STRING - << TQCOMBOBOX_OBJECT_NAME_STRING - << TQDATETIMEEDIT_OBJECT_NAME_STRING + allowedTypes << "TQLineEdit" + << "TQTextEdit" + << "TQSpinBox" + << "TQCheckBox" + << "TQComboBox" + << "TQDateTimeEdit" << "KLineEdit" << "KDateTimeWidget" << "KDatePicker"; @@ -87,19 +87,19 @@ void DesignerFields::initGUI( const TQString &uiFile ) if ( !name.isEmpty() ) mWidgets.insert( name, widget ); - if ( it.current()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) + if ( it.current()->inherits( "TQLineEdit" ) ) connect( it.current(), TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) + else if ( it.current()->inherits( "TQSpinBox" ) ) connect( it.current(), TQT_SIGNAL( valueChanged( int ) ), TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) + else if ( it.current()->inherits( "TQCheckBox" ) ) connect( it.current(), TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) + else if ( it.current()->inherits( "TQComboBox" ) ) connect( it.current(), TQT_SIGNAL( activated( const TQString& ) ), TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) + else if ( it.current()->inherits( "TQDateTimeEdit" ) ) connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ), TQT_SIGNAL( modified() ) ); else if ( it.current()->inherits( "KDateTimeWidget" ) ) @@ -108,7 +108,7 @@ void DesignerFields::initGUI( const TQString &uiFile ) else if ( it.current()->inherits( "KDatePicker" ) ) connect( it.current(), TQT_SIGNAL( dateChanged( TQDate ) ), TQT_SIGNAL( modified() ) ); - else if ( it.current()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) + else if ( it.current()->inherits( "TQTextEdit" ) ) connect( it.current(), TQT_SIGNAL( textChanged() ), TQT_SIGNAL( modified() ) ); @@ -143,16 +143,16 @@ void DesignerFields::load( DesignerFields::Storage *storage ) TQMap<TQString, TQWidget *>::ConstIterator widIt; for ( widIt = mWidgets.begin(); widIt != mWidgets.end(); ++widIt ) { TQString value; - if ( widIt.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + if ( widIt.data()->inherits( "TQLineEdit" ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( widIt.data() ); wdg->setText( TQString() ); - } else if ( widIt.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) { + } else if ( widIt.data()->inherits( "TQSpinBox" ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( widIt.data() ); wdg->setValue( wdg->minValue() ); - } else if ( widIt.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( widIt.data()->inherits( "TQCheckBox" ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( widIt.data() ); wdg->setChecked( false ); - } else if ( widIt.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( widIt.data()->inherits( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( widIt.data() ); wdg->setDateTime( TQDateTime::currentDateTime() ); } else if ( widIt.data()->inherits( "KDateTimeWidget" ) ) { @@ -161,10 +161,10 @@ void DesignerFields::load( DesignerFields::Storage *storage ) } else if ( widIt.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( widIt.data() ); wdg->setDate( TQDate::currentDate() ); - } else if ( widIt.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + } else if ( widIt.data()->inherits( "TQComboBox" ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( widIt.data() ); wdg->setCurrentItem( 0 ); - } else if ( widIt.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) { + } else if ( widIt.data()->inherits( "TQTextEdit" ) ) { TQTextEdit *wdg = static_cast<TQTextEdit*>( widIt.data() ); wdg->setText( TQString() ); } @@ -176,16 +176,16 @@ void DesignerFields::load( DesignerFields::Storage *storage ) TQMap<TQString, TQWidget *>::ConstIterator it = mWidgets.find( *it2 ); if ( it != mWidgets.end() ) { - if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + if ( it.data()->inherits( "TQLineEdit" ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( it.data() ); wdg->setText( value ); - } else if ( it.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQSpinBox" ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( it.data() ); wdg->setValue( value.toInt() ); - } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQCheckBox" ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() ); wdg->setChecked( value == "true" || value == "1" ); - } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() ); wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); } else if ( it.data()->inherits( "KDateTimeWidget" ) ) { @@ -194,10 +194,10 @@ void DesignerFields::load( DesignerFields::Storage *storage ) } else if ( it.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( it.data() ); wdg->setDate( TQDate::fromString( value, Qt::ISODate ) ); - } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQComboBox" ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( it.data() ); wdg->setCurrentText( value ); - } else if ( it.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQTextEdit" ) ) { TQTextEdit *wdg = static_cast<TQTextEdit*>( it.data() ); wdg->setText( value ); } @@ -210,16 +210,16 @@ void DesignerFields::save( DesignerFields::Storage *storage ) TQMap<TQString, TQWidget*>::Iterator it; for ( it = mWidgets.begin(); it != mWidgets.end(); ++it ) { TQString value; - if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) { + if ( it.data()->inherits( "TQLineEdit" ) ) { TQLineEdit *wdg = static_cast<TQLineEdit*>( it.data() ); value = wdg->text(); - } else if ( it.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQSpinBox" ) ) { TQSpinBox *wdg = static_cast<TQSpinBox*>( it.data() ); value = TQString::number( wdg->value() ); - } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQCheckBox" ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() ); value = ( wdg->isChecked() ? "true" : "false" ); - } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( it.data() ); value = wdg->dateTime().toString( Qt::ISODate ); } else if ( it.data()->inherits( "KDateTimeWidget" ) ) { @@ -228,10 +228,10 @@ void DesignerFields::save( DesignerFields::Storage *storage ) } else if ( it.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast<KDatePicker*>( it.data() ); value = wdg->date().toString( Qt::ISODate ); - } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQComboBox" ) ) { TQComboBox *wdg = static_cast<TQComboBox*>( it.data() ); value = wdg->currentText(); - } else if ( it.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) { + } else if ( it.data()->inherits( "TQTextEdit" ) ) { TQTextEdit *wdg = static_cast<TQTextEdit*>( it.data() ); value = wdg->text(); } diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 9156452c1..02a985b7a 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -70,16 +70,16 @@ class PageItem : public TQCheckListItem TQImage img = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin ); mPreview = img; - TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING ); + TQObjectList *list = wdg->queryList( "TQWidget" ); TQObjectListIt it( *list ); TQMap<TQString, TQString> allowedTypes; - allowedTypes.insert( TQLINEEDIT_OBJECT_NAME_STRING, i18n( "Text" ) ); - allowedTypes.insert( TQTEXTEDIT_OBJECT_NAME_STRING, i18n( "Text" ) ); - allowedTypes.insert( TQSPINBOX_OBJECT_NAME_STRING, i18n( "Numeric Value" ) ); - allowedTypes.insert( TQCHECKBOX_OBJECT_NAME_STRING, i18n( "Boolean" ) ); - allowedTypes.insert( TQCOMBOBOX_OBJECT_NAME_STRING, i18n( "Selection" ) ); - allowedTypes.insert( TQDATETIMEEDIT_OBJECT_NAME_STRING, i18n( "Date & Time" ) ); + allowedTypes.insert( "TQLineEdit", i18n( "Text" ) ); + allowedTypes.insert( "TQTextEdit", i18n( "Text" ) ); + allowedTypes.insert( "TQSpinBox", i18n( "Numeric Value" ) ); + allowedTypes.insert( "TQCheckBox", i18n( "Boolean" ) ); + allowedTypes.insert( "TQComboBox", i18n( "Selection" ) ); + allowedTypes.insert( "TQDateTimeEdit", i18n( "Date & Time" ) ); allowedTypes.insert( "KLineEdit", i18n( "Text" ) ); allowedTypes.insert( "KDateTimeWidget", i18n( "Date & Time" ) ); allowedTypes.insert( "KDatePicker", i18n( "Date" ) ); |