summaryrefslogtreecommitdiffstats
path: root/kommander/editor/metadatabase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kommander/editor/metadatabase.cpp')
-rw-r--r--kommander/editor/metadatabase.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp
index 839160da..93a998d0 100644
--- a/kommander/editor/metadatabase.cpp
+++ b/kommander/editor/metadatabase.cpp
@@ -26,7 +26,7 @@
#include <tqapplication.h>
#include <tqobject.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqptrdict.h>
#include <tqobjectlist.h>
#include <tqstrlist.h>
@@ -38,7 +38,7 @@
#include <tqdatetime.h>
#include <tqfile.h>
#include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <stdlib.h>
@@ -147,14 +147,14 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
if ( doUpdate &&
( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) {
doUpdate = false;
- setPropertyChanged( o, "tqalignment", changed ||
+ setPropertyChanged( o, "alignment", changed ||
isPropertyChanged( o, "hAlign" ) ||
isPropertyChanged( o, "vAlign" ) ||
isPropertyChanged( o, "wordwrap" ) );
doUpdate = true;
}
- if ( doUpdate && property == "tqalignment" ) {
+ if ( doUpdate && property == "alignment" ) {
doUpdate = false;
setPropertyChanged( o, "hAlign", changed );
setPropertyChanged( o, "vAlign", changed );
@@ -269,10 +269,10 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
}
r->spacing = spacing;
- TQLayout * tqlayout = 0;
- WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
- if ( tqlayout )
- tqlayout->setSpacing( spacing );
+ TQLayout * layout = 0;
+ WidgetFactory::layoutType( (TQWidget*)o, layout );
+ if ( layout )
+ layout->setSpacing( spacing );
}
int MetaDataBase::spacing( TQObject *o )
@@ -305,12 +305,12 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
}
r->margin = margin;
- TQLayout * tqlayout = 0;
- WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
+ TQLayout * layout = 0;
+ WidgetFactory::layoutType( (TQWidget*)o, layout );
if ( margin < 1 )
margin = 1;
- if ( tqlayout )
- tqlayout->setMargin( margin );
+ if ( layout )
+ layout->setMargin( margin );
}
int MetaDataBase::margin( TQObject *o )
@@ -465,12 +465,12 @@ void MetaDataBase::doConnections( TQObject *o )
delete l;
}
TQString s = "2""%1";
- s = s.tqarg( conn.signal.data() );
+ s = s.arg( conn.signal.data() );
TQString s2 = "1""%1";
- s2 = s2.tqarg( conn.slot.data() );
+ s2 = s2.arg( conn.slot.data() );
- TQStrList signalList = sender->tqmetaObject()->signalNames( true );
- TQStrList slotList = receiver->tqmetaObject()->slotNames( true );
+ TQStrList signalList = sender->metaObject()->signalNames( true );
+ TQStrList slotList = receiver->metaObject()->slotNames( true );
// avoid warnings
if ( signalList.find( conn.signal ) == -1 ||
@@ -647,13 +647,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
}
if ( !onlyCustom ) {
- TQStrList slotList = o->tqmetaObject()->slotNames( true );
+ TQStrList slotList = o->metaObject()->slotNames( true );
if ( slotList.find( slot ) != -1 )
return true;
if ( o->inherits( "FormWindow" ) ) {
o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
- slotList = o->tqmetaObject()->slotNames( true );
+ slotList = o->metaObject()->slotNames( true );
if ( slotList.find( slot ) != -1 )
return true;
}
@@ -934,7 +934,7 @@ MetaDataBase::CustomWidget::CustomWidget()
className = "MyCustomWidget";
includeFile = "mywidget.h";
includePolicy = Local;
- tqsizeHint = TQSize( -1, -1 );
+ sizeHint = TQSize( -1, -1 );
pixmap = new TQPixmap( PixmapChooser::loadPixmap( "customwidget.xpm" ) );
id = -1;
sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@@ -946,7 +946,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
className = w.className;
includeFile = w.includeFile;
includePolicy = w.includePolicy;
- tqsizeHint = w.tqsizeHint;
+ sizeHint = w.sizeHint;
if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap );
else
@@ -991,7 +991,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
className = w.className;
includeFile = w.includeFile;
includePolicy = w.includePolicy;
- tqsizeHint = w.tqsizeHint;
+ sizeHint = w.sizeHint;
if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap );
else
@@ -1006,7 +1006,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
{
- TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( true );
+ TQStrList sigList = TQWidget::staticMetaObject()->signalNames( true );
if ( sigList.find( signal ) != -1 )
return true;
for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) {
@@ -1018,7 +1018,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
{
- TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( true );
+ TQStrList slotList = TQWidget::staticMetaObject()->slotNames( true );
if ( slotList.find( normalizeSlot( slot ) ) != -1 )
return true;
@@ -1031,7 +1031,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const
{
- TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( true );
+ TQStrList propList = TQWidget::staticMetaObject()->propertyNames( true );
if ( propList.find( prop ) != -1 )
return true;