summaryrefslogtreecommitdiffstats
path: root/kdevdesigner/shared
diff options
context:
space:
mode:
Diffstat (limited to 'kdevdesigner/shared')
-rw-r--r--kdevdesigner/shared/parser.cpp10
-rw-r--r--kdevdesigner/shared/ui2uib.cpp20
-rw-r--r--kdevdesigner/shared/uib.h2
-rw-r--r--kdevdesigner/shared/widgetdatabase.cpp12
4 files changed, 22 insertions, 22 deletions
diff --git a/kdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp
index 03dc57a7..1ba246bd 100644
--- a/kdevdesigner/shared/parser.cpp
+++ b/kdevdesigner/shared/parser.cpp
@@ -38,9 +38,9 @@ public:
TQString Parser::cleanArgs( const TQString &func )
{
TQString slot( func );
- int begin = slot.tqfind( "(" ) + 1;
+ int begin = slot.find( "(" ) + 1;
TQString args = slot.mid( begin );
- args = args.left( args.tqfind( ")" ) );
+ args = args.left( args.find( ")" ) );
TQStringList lst = TQStringList::split( ',', args );
TQString res = slot.left( begin );
for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
@@ -48,13 +48,13 @@ TQString Parser::cleanArgs( const TQString &func )
res += ",";
TQString arg = *it;
int pos = 0;
- if ( ( pos = arg.tqfind( "&" ) ) != -1 ) {
+ if ( ( pos = arg.find( "&" ) ) != -1 ) {
arg = arg.left( pos + 1 );
- } else if ( ( pos = arg.tqfind( "*" ) ) != -1 ) {
+ } else if ( ( pos = arg.find( "*" ) ) != -1 ) {
arg = arg.left( pos + 1 );
} else {
arg = arg.simplifyWhiteSpace();
- if ( ( pos = arg.tqfind( ':' ) ) != -1 )
+ if ( ( pos = arg.find( ':' ) ) != -1 )
arg = arg.left( pos ).simplifyWhiteSpace() + ":" + arg.mid( pos + 1 ).simplifyWhiteSpace();
TQStringList l = TQStringList::split( ' ', arg );
if ( l.count() == 2 ) {
diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp
index 7e56dfa1..d4645eaa 100644
--- a/kdevdesigner/shared/ui2uib.cpp
+++ b/kdevdesigner/shared/ui2uib.cpp
@@ -164,7 +164,7 @@ public:
int insert() { return next++; }
void setName( int no, const TQString& name );
- int tqfind( const TQString& name, int deflt = -1 ) const;
+ int find( const TQString& name, int deflt = -1 ) const;
int count() const { return next; }
private:
@@ -181,10 +181,10 @@ void UibIndexMap::setName( int no, const TQString& name )
}
}
-int UibIndexMap::tqfind( const TQString& name, int deflt ) const
+int UibIndexMap::find( const TQString& name, int deflt ) const
{
- TQMap<TQString, int>::ConstIterator no = nameMap.tqfind( name );
- if ( no == nameMap.end() || conflicts.tqcontains(name) ) {
+ TQMap<TQString, int>::ConstIterator no = nameMap.find( name );
+ if ( no == nameMap.end() || conflicts.contains(name) ) {
return deflt;
} else {
return *no;
@@ -232,7 +232,7 @@ static void packString( UibStrTable& strings, TQDataStream& out,
static void packStringSplit( UibStrTable& strings, TQDataStream& out,
const TQString& str, TQChar sep )
{
- int pos = str.tqfind( sep );
+ int pos = str.find( sep );
if ( pos == -1 )
pos = str.length();
packString( strings, out, str.left(pos) );
@@ -516,7 +516,7 @@ static int outputObject( TQMap<int, TQStringList>& buddies,
if ( tag == "action" ) {
if ( elem.tagName() == "item" || elem.tagName() == "toolbar" ) {
TQString actionName = f.attribute( "name" );
- int no = objects.tqfind( actionName );
+ int no = objects.find( actionName );
if ( no != -1 ) {
out << (TQ_UINT8) Object_ActionRef;
packUInt16( out, no );
@@ -756,7 +756,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
while ( !f.isNull() ) {
if ( f.tagName() == "tabstop" ) {
TQString widgetName = f.firstChild().toText().data();
- int no = objects.tqfind( widgetName );
+ int no = objects.find( widgetName );
if ( no != -1 )
packUInt16( out2, no );
}
@@ -791,7 +791,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
while ( a != buddies.end() ) {
TQStringList::ConstIterator b = (*a).begin();
while ( b != (*a).end() ) {
- int no = objects.tqfind( *b );
+ int no = objects.find( *b );
if ( no != -1 ) {
packUInt16( out2, a.key() );
packUInt16( out2, no );
@@ -822,8 +822,8 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
}
TQString language = f.attribute( "language", "C++" );
- int senderNo = objects.tqfind( argMap["sender"], widgetNo );
- int receiverNo = objects.tqfind( argMap["receiver"], widgetNo );
+ int senderNo = objects.find( argMap["sender"], widgetNo );
+ int receiverNo = objects.find( argMap["receiver"], widgetNo );
TQString signal = UibHack::normalize( argMap["signal"] );
TQString slot = UibHack::normalize( argMap["slot"] );
diff --git a/kdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h
index 07607328..9f2090f7 100644
--- a/kdevdesigner/shared/uib.h
+++ b/kdevdesigner/shared/uib.h
@@ -108,7 +108,7 @@ inline int UibStrTable::insertCString( const char *cstr )
inline int UibStrTable::insertString( const TQString& str )
{
- if ( str.tqcontains('\0') || str[0] == TQChar(0x7f) ) {
+ if ( str.contains('\0') || str[0] == TQChar(0x7f) ) {
int nextPos = table.size();
out << (TQ_UINT8) 0x7f;
out << str;
diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp
index 1950ddbb..80e8c131 100644
--- a/kdevdesigner/shared/widgetdatabase.cpp
+++ b/kdevdesigner/shared/widgetdatabase.cpp
@@ -764,7 +764,7 @@ TQString WidgetDatabase::createWidgetName( int id )
n = "Layout";
if ( n[ 0 ] == 'Q' && n[ 1 ].lower() != n[ 1 ] )
n = n.mid( 1 );
- int colonColon = n.tqfindRev( "::" );
+ int colonColon = n.findRev( "::" );
if ( colonColon != -1 )
n = n.mid( colonColon + 2 );
@@ -783,14 +783,14 @@ int WidgetDatabase::idFromClassName( const TQString &name )
setupDataBase( -1 );
if ( name.isEmpty() )
return 0;
- int *i = className2Id->tqfind( name );
+ int *i = className2Id->find( name );
if ( i )
return *i;
if ( name == "FormWindow" )
return idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING );
#ifdef UIC
setupDataBase( -2 );
- i = className2Id->tqfind( name );
+ i = className2Id->find( name );
if ( i )
return *i;
#endif
@@ -799,7 +799,7 @@ int WidgetDatabase::idFromClassName( const TQString &name )
bool WidgetDatabase::hasWidget( const TQString &name )
{
- return className2Id->tqfind( name ) != 0;
+ return className2Id->find( name ) != 0;
}
WidgetDatabaseRecord *WidgetDatabase::at( int index )
@@ -832,7 +832,7 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r )
TQString WidgetDatabase::widgetGroup( const TQString &g )
{
- if ( wGroups->tqfind( g.ascii() ) == -1 )
+ if ( wGroups->find( g.ascii() ) == -1 )
wGroups->append( g.ascii() );
return g;
}
@@ -866,7 +866,7 @@ int WidgetDatabase::numWidgetGroups()
bool WidgetDatabase::isGroupVisible( const TQString &g )
{
setupDataBase( -1 );
- return invisibleGroups->tqfind( g.ascii() ) == -1;
+ return invisibleGroups->find( g.ascii() ) == -1;
}
int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r )
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-29 21:17:55 +0000