From a21c1c9b1dca09b9ab3a56d60e6f4c7a253689f8 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 24 Feb 2011 07:08:32 +0000
Subject: 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
---
kaddressbook/customfieldswidget.cpp | 36 +++++++++++------------
kalarm/lib/label.cpp | 2 +-
kalarm/lib/spinbox.cpp | 2 +-
kalarm/lib/spinbox2.cpp | 4 +--
kdgantt/KDGanttViewSubwidgets.cpp | 2 +-
kmail/kmfoldertree.cpp | 2 +-
kmail/kmheaders.cpp | 2 +-
knode/headerview.cpp | 2 +-
knode/kncollectionview.cpp | 2 +-
knode/kncomposer.cpp | 14 ++++-----
libkdepim/designerfields.cpp | 58 ++++++++++++++++++-------------------
libkdepim/kcmdesignerfields.cpp | 14 ++++-----
12 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index 3d992be1e..44b0294ac 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -227,13 +227,13 @@ void FieldWidget::clearFields()
{
FieldRecordList::ConstIterator fieldIt;
for ( fieldIt = mFieldList.begin(); fieldIt != mFieldList.end(); ++fieldIt ) {
- if ( (*fieldIt).mWidget->isA( "TQLineEdit" ) ) {
+ if ( (*fieldIt).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( (*fieldIt).mWidget );
wdg->setText( TQString() );
- } else if ( (*fieldIt).mWidget->isA( "TQSpinBox" ) ) {
+ } else if ( (*fieldIt).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( (*fieldIt).mWidget );
wdg->setValue( 0 );
- } else if ( (*fieldIt).mWidget->isA( "TQCheckBox" ) ) {
+ } else if ( (*fieldIt).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( (*fieldIt).mWidget );
wdg->setChecked( true );
} else if ( (*fieldIt).mWidget->isA( "QDateEdit" ) ) {
@@ -265,13 +265,13 @@ void FieldWidget::loadContact( KABC::Addressee *addr )
FieldRecordList::ConstIterator fieldIt;
for ( fieldIt = mFieldList.begin(); fieldIt != mFieldList.end(); ++fieldIt ) {
if ( (*fieldIt).mIdentifier == name ) {
- if ( (*fieldIt).mWidget->isA( "TQLineEdit" ) ) {
+ if ( (*fieldIt).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( (*fieldIt).mWidget );
wdg->setText( value );
- } else if ( (*fieldIt).mWidget->isA( "TQSpinBox" ) ) {
+ } else if ( (*fieldIt).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( (*fieldIt).mWidget );
wdg->setValue( value.toInt() );
- } else if ( (*fieldIt).mWidget->isA( "TQCheckBox" ) ) {
+ } else if ( (*fieldIt).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( (*fieldIt).mWidget );
wdg->setChecked( value == "true" || value == "1" );
} else if ( (*fieldIt).mWidget->isA( "QDateEdit" ) ) {
@@ -294,22 +294,22 @@ void FieldWidget::setReadOnly( bool readOnly )
FieldRecordList::ConstIterator it;
for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) {
TQString value;
- if ( (*it).mWidget->isA( "TQLineEdit" ) ) {
+ if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( (*it).mWidget );
wdg->setReadOnly(readOnly);
- } else if ( (*it).mWidget->isA( "TQSpinBox" ) ) {
+ } else if ( (*it).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( (*it).mWidget );
wdg->setEnabled( !readOnly );
- } else if ( (*it).mWidget->isA( "TQCheckBox" ) ) {
+ } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( (*it).mWidget );
wdg->setEnabled( !readOnly );
- } else if ( (*it).mWidget->isA( "TQDateEdit" ) ) {
+ } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) {
TQDateEdit *wdg = static_cast<TQDateEdit*>( (*it).mWidget );
wdg->setEnabled( !readOnly );
- } else if ( (*it).mWidget->isA( "TQTimeEdit" ) ) {
+ } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) {
TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*it).mWidget );
wdg->setEnabled( !readOnly );
- } else if ( (*it).mWidget->isA( "TQDateTimeEdit" ) ) {
+ } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) {
TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*it).mWidget );
wdg->setEnabled( !readOnly );
}
@@ -321,13 +321,13 @@ void FieldWidget::storeContact( KABC::Addressee *addr )
FieldRecordList::ConstIterator it;
for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) {
TQString value;
- if ( (*it).mWidget->isA( "TQLineEdit" ) ) {
+ if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
TQLineEdit *wdg = static_cast<TQLineEdit*>( (*it).mWidget );
value = wdg->text();
- } else if ( (*it).mWidget->isA( "TQSpinBox" ) ) {
+ } else if ( (*it).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) {
TQSpinBox *wdg = static_cast<TQSpinBox*>( (*it).mWidget );
value = TQString::number( wdg->value() );
- } else if ( (*it).mWidget->isA( "TQCheckBox" ) ) {
+ } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
TQCheckBox *wdg = static_cast<TQCheckBox*>( (*it).mWidget );
value = ( wdg->isChecked() ? "true" : "false" );
} else if ( (*it).mWidget->isA( "QDateEdit" ) ) {
@@ -523,9 +523,9 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const
retval.append( (*it).mTitle );
TQString type = "text";
- if ( (*it).mWidget->isA( "TQSpinBox" ) ) {
+ if ( (*it).mWidget->isA( TQSPINBOX_OBJECT_NAME_STRING ) ) {
type = "integer";
- } else if ( (*it).mWidget->isA( "TQCheckBox" ) ) {
+ } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) {
type = "boolean";
} else if ( (*it).mWidget->isA( "QDateEdit" ) ) {
type = "date";
@@ -533,7 +533,7 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const
type = "time";
} else if ( (*it).mWidget->isA( "QDateTimeEdit" ) ) {
type = "datetime";
- } else if ( (*it).mWidget->isA( "TQLineEdit" ) ) {
+ } else if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) {
type = "text";
}
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index 92f07402a..ad6fd7832 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -56,7 +56,7 @@ void Label::setBuddy(TQWidget* bud)
{
while (w->focusProxy())
w = w->focusProxy();
- if (!w->inherits("TQRadioButton"))
+ if (!w->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING))
w = 0;
}
if (!w)
diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp
index 42d91a914..8ae5962a2 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -56,7 +56,7 @@ void SpinBox::init()
// Find the spin widgets which are part of the spin boxes, in order to
// handle their shift-button presses.
- TQObjectList* spinwidgets = queryList("TQSpinWidget", 0, false, true);
+ TQObjectList* spinwidgets = queryList(TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true);
TQSpinWidget* spin = (TQSpinWidget*)spinwidgets->getFirst();
if (spin)
spin->installEventFilter(this); // handle shift-button presses
diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
index db74cc595..8b3faa706 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -291,7 +291,7 @@ void SpinBox2::getMetrics() const
wGap = 0;
// Make style-specific adjustments for a better appearance
- if (style().inherits("TQMotifPlusStyle"))
+ if (style().inherits(TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING))
{
xSpinbox = 0; // show the edit control left border
wGap = 2; // leave a space to the right of the left-hand pair of spin buttons
@@ -403,7 +403,7 @@ SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* parent, c
// Find the spin widget which is part of the spin box, in order to
// pass on its shift-button presses.
- TQObjectList* spinwidgets = spinbox->queryList("TQSpinWidget", 0, false, true);
+ TQObjectList* spinwidgets = spinbox->queryList(TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true);
mSpinWidget = (SpinBox*)spinwidgets->getFirst();
delete spinwidgets;
}
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index daabcb593..b6dabe2be 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -3213,7 +3213,7 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi
myMyContentsHeight = 0;
_showItemAddPopupMenu = false;
- TQObject *scrollViewTimer = child( "scrollview scrollbar timer", "TQTimer", false );
+ TQObject *scrollViewTimer = child( "scrollview scrollbar timer", TQTIMER_OBJECT_NAME_STRING, false );
Q_ASSERT( scrollViewTimer );
if ( scrollViewTimer ) {
disconnect( scrollViewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollBars() ) );
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 115c638e6..86dab4126 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -1754,7 +1754,7 @@ bool KMFolderTree::eventFilter( TQObject *o, TQEvent *e )
{
if ( e->type() == TQEvent::MouseButtonPress &&
static_cast<TQMouseEvent*>(e)->button() == RightButton &&
- o->isA("TQHeader") )
+ o->isA(TQHEADER_OBJECT_NAME_STRING) )
{
mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
return true;
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 06fc89360..5afc9d811 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -237,7 +237,7 @@ bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e )
{
if ( e->type() == TQEvent::MouseButtonPress &&
static_cast<TQMouseEvent*>(e)->button() == RightButton &&
- o->isA("TQHeader") )
+ o->isA(TQHEADER_OBJECT_NAME_STRING) )
{
// if we currently only show one of either sender/receiver column
// modify the popup text in the way, that it displays the text of the other of the two
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index 0c2e06220..be497e6dc 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -549,7 +549,7 @@ bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e)
// right click on header
if ( e->type() == TQEvent::MouseButtonPress &&
static_cast<TQMouseEvent*>(e)->button() == RightButton &&
- o->isA("TQHeader") )
+ o->isA(TQHEADER_OBJECT_NAME_STRING) )
{
mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
return true;
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index 3bbb52377..40cce7741 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -430,7 +430,7 @@ bool KNCollectionView::eventFilter(TQObject *o, TQEvent *e)
// header popup menu
if ( e->type() == TQEvent::MouseButtonPress &&
static_cast<TQMouseEvent*>(e)->button() == RightButton &&
- o->isA("TQHeader") )
+ o->isA(TQHEADER_OBJECT_NAME_STRING) )
{
mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() );
return true;
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index 533ad3568..aabb8e669 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -437,7 +437,7 @@ void KNComposer::slotUndo()
if (fw->inherits("KEdit"))
((TQMultiLineEdit*)fw)->undo();
- else if (fw->inherits("TQLineEdit"))
+ else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
((TQLineEdit*)fw)->undo();
}
@@ -448,7 +448,7 @@ void KNComposer::slotRedo()
if (fw->inherits("KEdit"))
((TQMultiLineEdit*)fw)->redo();
- else if (fw->inherits("TQLineEdit"))
+ else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
((TQLineEdit*)fw)->redo();
}
@@ -459,7 +459,7 @@ void KNComposer::slotCut()
if (fw->inherits("KEdit"))
((TQMultiLineEdit*)fw)->cut();
- else if (fw->inherits("TQLineEdit"))
+ else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
((TQLineEdit*)fw)->cut();
else kdDebug(5003) << "wrong focus widget" << endl;
}
@@ -471,7 +471,7 @@ void KNComposer::slotCopy()
if (fw->inherits("KEdit"))
((TQMultiLineEdit*)fw)->copy();
- else if (fw->inherits("TQLineEdit"))
+ else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
((TQLineEdit*)fw)->copy();
else kdDebug(5003) << "wrong focus widget" << endl;
@@ -485,7 +485,7 @@ void KNComposer::slotPaste()
if (fw->inherits("KEdit"))
((TQMultiLineEdit*)fw)->paste();
- else if (fw->inherits("TQLineEdit"))
+ else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
((TQLineEdit*)fw)->paste();
else kdDebug(5003) << "wrong focus widget" << endl;
}
@@ -495,9 +495,9 @@ void KNComposer::slotSelectAll()
TQWidget* fw = tqfocusWidget();
if (!fw) return;
- if (fw->inherits("TQLineEdit"))
+ if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
((TQLineEdit*)fw)->selectAll();
- else if (fw->inherits("TQMultiLineEdit"))
+ else if (fw->inherits(TQMULTILINEEDIT_OBJECT_NAME_STRING))
((TQMultiLineEdit*)fw)->selectAll();
}
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" ) );
--
cgit v1.2.1