summaryrefslogtreecommitdiffstats
path: root/libkdepim
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-24 07:08:32 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-24 07:08:32 +0000
commita21c1c9b1dca09b9ab3a56d60e6f4c7a253689f8 (patch)
tree3359e2a90e87b53193c6ded445569016204e1c12 /libkdepim
parent084c86a81820f17db9eee7362120586199008e27 (diff)
downloadtdepim-a21c1c9b1dca09b9ab3a56d60e6f4c7a253689f8.tar.gz
tdepim-a21c1c9b1dca09b9ab3a56d60e6f4c7a253689f8.zip
Fix a number of runtime object identification problems which led to an even larger array of minor glitches
NOTE: kdevelop and kdewebdev still need to be fully repaired git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkdepim')
-rw-r--r--libkdepim/designerfields.cpp58
-rw-r--r--libkdepim/kcmdesignerfields.cpp14
2 files changed, 36 insertions, 36 deletions
diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp
index 5569c2587..bb5b8c258 100644
--- a/libkdepim/designerfields.cpp
+++ b/libkdepim/designerfields.cpp
@@ -63,16 +63,16 @@ void DesignerFields::initGUI( const TQString &uiFile )
tqlayout->addWidget( wdg );
- TQObjectList *list = wdg->queryList( "TQWidget" );
+ TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectListIt it( *list );
TQStringList allowedTypes;
- allowedTypes << "TQLineEdit"
- << "TQTextEdit"
- << "TQSpinBox"
- << "TQCheckBox"
- << "TQComboBox"
- << "QDateTimeEdit"
+ 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
<< "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" ) )
+ if ( it.current()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
connect( it.current(), TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SIGNAL( modified() ) );
- else if ( it.current()->inherits( "TQSpinBox" ) )
+ else if ( it.current()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) )
connect( it.current(), TQT_SIGNAL( valueChanged( int ) ),
TQT_SIGNAL( modified() ) );
- else if ( it.current()->inherits( "TQCheckBox" ) )
+ else if ( it.current()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) )
connect( it.current(), TQT_SIGNAL( toggled( bool ) ),
TQT_SIGNAL( modified() ) );
- else if ( it.current()->inherits( "TQComboBox" ) )
+ else if ( it.current()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
connect( it.current(), TQT_SIGNAL( activated( const TQString& ) ),
TQT_SIGNAL( modified() ) );
- else if ( it.current()->inherits( "QDateTimeEdit" ) )
+ else if ( it.current()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) )
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" ) )
+ else if ( it.current()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
connect( it.current(), TQT_SIGNAL( textChanged() ),
TQT_SIGNAL( modified() ) );
@@ -143,13 +143,13 @@ 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" ) ) {
+ if ( widIt.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( widIt.data() );
wdg->setText( TQString::null );
- } else if ( widIt.data()->inherits( "TQSpinBox" ) ) {
+ } else if ( widIt.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( widIt.data() );
wdg->setValue( wdg->minValue() );
- } else if ( widIt.data()->inherits( "TQCheckBox" ) ) {
+ } else if ( widIt.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( widIt.data() );
wdg->setChecked( false );
} else if ( widIt.data()->inherits( "QDateTimeEdit" ) ) {
@@ -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::tqcurrentDate() );
- } else if ( widIt.data()->inherits( "TQComboBox" ) ) {
+ } else if ( widIt.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
TQComboBox *wdg = static_cast<TQComboBox*>( widIt.data() );
wdg->setCurrentItem( 0 );
- } else if ( widIt.data()->inherits( "TQTextEdit" ) ) {
+ } else if ( widIt.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) {
TQTextEdit *wdg = static_cast<TQTextEdit*>( widIt.data() );
wdg->setText( TQString::null );
}
@@ -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" ) ) {
+ if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( it.data() );
wdg->setText( value );
- } else if ( it.data()->inherits( "TQSpinBox" ) ) {
+ } else if ( it.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( it.data() );
wdg->setValue( value.toInt() );
- } else if ( it.data()->inherits( "TQCheckBox" ) ) {
+ } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() );
wdg->setChecked( value == "true" || value == "1" );
- } else if ( it.data()->inherits( "QDateTimeEdit" ) ) {
+ } else if ( it.data()->inherits( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( 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" ) ) {
+ } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
TQComboBox *wdg = static_cast<TQComboBox*>( it.data() );
wdg->setCurrentText( value );
- } else if ( it.data()->inherits( "TQTextEdit" ) ) {
+ } else if ( it.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) {
TQTextEdit *wdg = static_cast<TQTextEdit*>( it.data() );
wdg->setText( value );
}
@@ -210,13 +210,13 @@ 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" ) ) {
+ if ( it.data()->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( it.data() );
value = wdg->text();
- } else if ( it.data()->inherits( "TQSpinBox" ) ) {
+ } else if ( it.data()->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( it.data() );
value = TQString::number( wdg->value() );
- } else if ( it.data()->inherits( "TQCheckBox" ) ) {
+ } else if ( it.data()->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( it.data() );
value = ( wdg->isChecked() ? "true" : "false" );
} else if ( it.data()->inherits( "QDateTimeEdit" ) ) {
@@ -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" ) ) {
+ } else if ( it.data()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
TQComboBox *wdg = static_cast<TQComboBox*>( it.data() );
value = wdg->currentText();
- } else if ( it.data()->inherits( "TQTextEdit" ) ) {
+ } else if ( it.data()->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) {
TQTextEdit *wdg = static_cast<TQTextEdit*>( it.data() );
value = wdg->text();
}
diff --git a/libkdepim/kcmdesignerfields.cpp b/libkdepim/kcmdesignerfields.cpp
index 159356934..bda4aa7d0 100644
--- a/libkdepim/kcmdesignerfields.cpp
+++ b/libkdepim/kcmdesignerfields.cpp
@@ -70,16 +70,16 @@ class PageItem : public QCheckListItem
TQImage img = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin );
mPreview = img;
- TQObjectList *list = wdg->queryList( "TQWidget" );
+ TQObjectList *list = wdg->queryList( TQWIDGET_OBJECT_NAME_STRING );
TQObjectListIt it( *list );
TQMap<TQString, TQString> allowedTypes;
- 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( "QDateTimeEdit", i18n( "Date & Time" ) );
+ 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( "KLineEdit", i18n( "Text" ) );
allowedTypes.insert( "KDateTimeWidget", i18n( "Date & Time" ) );
allowedTypes.insert( "KDatePicker", i18n( "Date" ) );