summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/kformula/symbolaction.cpp2
-rw-r--r--lib/kofficecore/KoDocument.cpp2
-rw-r--r--lib/kofficecore/KoSpeaker.cpp28
-rw-r--r--lib/kofficeui/KoSelectAction.cpp4
-rw-r--r--lib/kofficeui/KoTemplateChooseDia.cpp2
-rw-r--r--lib/kofficeui/KoTooluButton.cpp4
-rw-r--r--lib/kofficeui/kcoloractions.cpp2
-rw-r--r--lib/kofficeui/tkcoloractions.cpp2
-rw-r--r--lib/koproperty/editors/spinbox.cpp8
-rw-r--r--lib/kotext/KoTextView.cpp6
-rw-r--r--lib/kross/api/qtobject.cpp2
11 files changed, 31 insertions, 31 deletions
diff --git a/lib/kformula/symbolaction.cpp b/lib/kformula/symbolaction.cpp
index 8fe3d8f8..08c5ac7b 100644
--- a/lib/kformula/symbolaction.cpp
+++ b/lib/kformula/symbolaction.cpp
@@ -159,7 +159,7 @@ void SymbolAction::updateItems( int id )
TQWidget *w = container( id );
if ( w->inherits( "TDEToolBar" ) ) {
TQWidget *r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) );
- if ( r->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
+ if ( r->inherits( "TQComboBox" ) ) {
TQComboBox *cb = static_cast<TQComboBox*>( r );
cb->clear();
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index b8dbea81..e465ce77 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -182,7 +182,7 @@ public:
virtual void resizeEvent( TQResizeEvent * )
{
- TQObject *wid = child( 0, TQWIDGET_OBJECT_NAME_STRING );
+ TQObject *wid = child( 0, "TQWidget" );
if ( wid )
TQT_TQWIDGET(wid)->setGeometry( 0, 0, width(), height() );
}
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index 6bd950da..d85a6995 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -230,7 +230,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
// Handle widgets that have multiple parts.
- if ( w->inherits(TQMENUBAR_OBJECT_NAME_STRING) ) {
+ if ( w->inherits("TQMenuBar") ) {
TQMenuBar* menuBar = dynamic_cast<TQMenuBar *>(w);
if (pos == TQPoint()) {
for (uint i = 0; i < menuBar->count(); ++i)
@@ -245,7 +245,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
text = menuBar->text(id);
}
else
- if (w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQPopupMenu")) {
TQPopupMenu* popupMenu = dynamic_cast<TQPopupMenu *>(w);
if (pos == TQPoint()) {
for (uint i = 0; i < popupMenu->count(); ++i)
@@ -259,7 +259,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
text = popupMenu->text(id);
}
else
- if (w->inherits(TQTABBAR_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQTabBar")) {
TQTabBar* tabBar = dynamic_cast<TQTabBar *>(w);
TQTab* tab = 0;
if (pos == TQPoint())
@@ -272,7 +272,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
}
}
else
- if (w->inherits(TQLISTVIEW_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQListView")) {
TQListView* lv = dynamic_cast<TQListView *>(w);
TQListViewItem* item = 0;
if (pos == TQPoint())
@@ -287,7 +287,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
}
}
else
- if (w->inherits(TQLISTBOX_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQListBox")) {
TQListBox* lb = dynamic_cast<TQListBox *>(w);
// qt docs say coordinates are in "on-screen" coordinates. What does that mean?
TQListBoxItem* item = 0;
@@ -301,7 +301,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
}
}
else
- if (w->inherits(TQICONVIEW_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQIconView")) {
TQIconView* iv = dynamic_cast<TQIconView *>(w);
TQIconViewItem* item = 0;
if (pos == TQPoint())
@@ -314,7 +314,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
}
}
else
- if (w->inherits(TQTABLE_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQTable")) {
TQTable* tbl = dynamic_cast<TQTable *>(w);
int row = -1;
int col = -1;
@@ -332,7 +332,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
}
}
else
- if (w->inherits(TQGRIDVIEW_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQGridView")) {
TQGridView* gv = dynamic_cast<TQGridView *>(w);
// TODO: TQGridView does not have a "current" row or column. Don't think they can even get focus?
int row = -1;
@@ -366,22 +366,22 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
if (d->m_cancelSpeakWidget) return true;
// Handle simple, single-part widgets.
- if ( w->inherits(TQBUTTON_OBJECT_NAME_STRING) )
+ if ( w->inherits("TQButton") )
text = dynamic_cast<TQButton *>(w)->text();
else
- if (w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING))
+ if (w->inherits("TQComboBox"))
text = dynamic_cast<TQComboBox *>(w)->currentText();
else
- if (w->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+ if (w->inherits("TQLineEdit"))
text = dynamic_cast<TQLineEdit *>(w)->text();
else
- if (w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING))
+ if (w->inherits("TQTextEdit"))
text = dynamic_cast<TQTextEdit *>(w)->text();
else
- if (w->inherits(TQLABEL_OBJECT_NAME_STRING))
+ if (w->inherits("TQLabel"))
text = dynamic_cast<TQLabel *>(w)->text();
else
- if (w->inherits(TQGROUPBOX_OBJECT_NAME_STRING)) {
+ if (w->inherits("TQGroupBox")) {
// TODO: Should calculate this number from font size?
if (w->mapFromGlobal(pos).y() < 30)
text = dynamic_cast<TQGroupBox *>(w)->title();
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 95238764..0558c512 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -90,7 +90,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
if (kapp && !kapp->authorizeTDEAction(name()))
return -1;
kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
- if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+ if ( widget->inherits("TQPopupMenu") )
{
TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
int id;
@@ -144,7 +144,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
return containerCount() - 1;
}
- else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
+ else if ( widget->inherits( "TQMenuBar" ) )
{
TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 044df16a..c42ff001 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -357,7 +357,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
d->m_filedialog->reparent( widgetbase , point );
//d->m_filedialog->setOperationMode( KFileDialog::Opening);
- TQObjectList *l = d->m_filedialog->queryList( TQPUSHBUTTON_OBJECT_NAME_STRING );
+ TQObjectList *l = d->m_filedialog->queryList( "TQPushButton" );
TQObjectListIt childit( *l );
TQObject *obj;
while ( (obj = childit.current()) != 0 ) {
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 1cd5e1c6..0d24cd16 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -309,7 +309,7 @@ void KoColorPanel::mousePressEvent( TQMouseEvent* e )
void KoColorPanel::mouseReleaseEvent( TQMouseEvent* )
{
- if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+ if ( isVisible() && parentWidget() && parentWidget()->inherits( "TQPopupMenu" ) )
parentWidget()->close();
emit colorSelected( mapToColor( m_pressedPos ) );
}
@@ -425,7 +425,7 @@ void KoColorPanel::keyPressEvent( TQKeyEvent* e )
e->ignore();
}
else if ( e->key() == TQt::Key_Return ) {
- if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+ if ( isVisible() && parentWidget() && parentWidget()->inherits( "TQPopupMenu" ) )
parentWidget()->close();
emit colorSelected( mapToColor( m_focusPosition ) );
}
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index aec1aab2..d34c2392 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -237,7 +237,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
if (kapp && !kapp->authorizeTDEAction(name()))
return -1;
- if ( w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+ if ( w->inherits("TQPopupMenu") )
{
TQPopupMenu* menu = static_cast<TQPopupMenu*>( w );
int id;
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index d2476d62..cf55a84a 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -165,7 +165,7 @@ void TTDESelectColorAction::updatePixmap()
updatePixmap(static_cast<TTDEToolBarButton*>(r));
}
}
- else if(w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) {
+ else if(w->inherits("TQPopupMenu") ) {
TQPixmap pix =iconSet(TDEIcon::Small).pixmap(TQIconSet::Automatic,TQIconSet::Active);
if ( pix.isNull() )
return;
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index 4743f570..4d9266a8 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -39,7 +39,7 @@ IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntE
editor()->setAlignment(TQt::AlignLeft);
installEventFilter(editor());
installEventFilter(this);
- TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
+ TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true );
TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first()));
if (spin)
spin->installEventFilter(this);
@@ -154,7 +154,7 @@ IntEdit::slotValueChanged(int)
void
IntEdit::updateSpinWidgets()
{
- TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
+ TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true );
TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first()));
if (spin) {
spin->setUpEnabled(!isReadOnly());
@@ -182,7 +182,7 @@ DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double va
editor()->setAlignment(TQt::AlignLeft);
installEventFilter(editor());
installEventFilter(this);
- TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
+ TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true );
TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first()));
if (spin)
spin->installEventFilter(this);
@@ -307,7 +307,7 @@ DoubleEdit::slotValueChanged(double)
void
DoubleEdit::updateSpinWidgets()
{
- TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
+ TQObjectList *spinwidgets = queryList( "TQSpinWidget", 0, false, true );
TQSpinWidget* spin = static_cast<TQSpinWidget*>(TQT_TQWIDGET(spinwidgets->first()));
if (spin) {
spin->setUpEnabled(!isReadOnly());
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index f6cdf4c4..b7608827 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -1122,13 +1122,13 @@ TQPtrList<TDEAction> KoTextView::dataToolActionList(TDEInstance * instance, cons
// Any tool that works on plain text is relevant
TQValueList<KDataToolInfo> tools;
- tools +=KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", instance );
+ tools +=KDataToolInfo::query( "TQString", "text/plain", instance );
// Add tools that work on a single word if that is the case
if ( m_singleWord )
{
_singleWord = true;
- tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "application/x-singleword", instance );
+ tools += KDataToolInfo::query( "TQString", "application/x-singleword", instance );
}
// Maybe one day we'll have tools that use libkotext (or qt3's qrt), to act on formatted text
tools += KDataToolInfo::query( "KoTextString", "application/x-qrichtext", instance );
@@ -1169,7 +1169,7 @@ void KoTextView::slotToolActivated( const KDataToolInfo & info, const TQString &
if ( !info.mimeTypes().contains( mimetype ) )
{
mimetype = "text/plain";
- datatype = TQSTRING_OBJECT_NAME_STRING;
+ datatype = "TQString";
}
// If unsupported (and if we have a single word indeed), try application/x-singleword
if ( !info.mimeTypes().contains( mimetype ) && m_singleWord )
diff --git a/lib/kross/api/qtobject.cpp b/lib/kross/api/qtobject.cpp
index 631c9943..8f0819aa 100644
--- a/lib/kross/api/qtobject.cpp
+++ b/lib/kross/api/qtobject.cpp
@@ -112,7 +112,7 @@ TQUObject* QtObject::toTQUObject(const TQString& signature, List::Ptr arguments)
// Fill parameters.
uint argcount = arguments ? arguments->count() : 0;
for(uint i = 0; i < paramcount; i++) {
- if(paramlist[i].find(TQSTRING_OBJECT_NAME_STRING) >= 0) {
+ if(paramlist[i].find("TQString") >= 0) {
const TQString s = (argcount > i) ? Variant::toString(arguments->item(i)) : TQString();
//krossdebug(TQString("EventSlot::toTQUObject s=%1").arg(s));
static_TQUType_TQString.set( &(uo[i + 1]), s );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 02:09:59 +0000