diff options
Diffstat (limited to 'kexi')
166 files changed, 592 insertions, 592 deletions
diff --git a/kexi/3rdparty/kexisql/src/btree.c b/kexi/3rdparty/kexisql/src/btree.c index 3a79a6240..a257011ed 100644 --- a/kexi/3rdparty/kexisql/src/btree.c +++ b/kexi/3rdparty/kexisql/src/btree.c @@ -47,7 +47,7 @@ ** the file really is a valid BTree database, a pointer to a list of unused ** pages in the file, and some meta information. The root of the first ** BTree begins on page 2 of the file. (Pages are numbered beginning with -** 1, not 0.) Thus a minimum database tqcontains 2 pages. +** 1, not 0.) Thus a minimum database contains 2 pages. */ #include "sqliteInt.h" #include "pager.h" @@ -128,7 +128,7 @@ static const char zMagicHeader[] = /* ** The first page of the database file contains a magic header string -** to identify the file as an SQLite database file. It also tqcontains +** to identify the file as an SQLite database file. It also contains ** a pointer to the first free page of the file. Page 2 contains the ** root of the principle BTree. The file might contain other BTrees ** rooted on pages above 2. diff --git a/kexi/3rdparty/kexisql/src/btree_rb.c b/kexi/3rdparty/kexisql/src/btree_rb.c index 8d905ef0b..afb2c5084 100644 --- a/kexi/3rdparty/kexisql/src/btree_rb.c +++ b/kexi/3rdparty/kexisql/src/btree_rb.c @@ -768,7 +768,7 @@ static int memRbtreeInsert( memcpy(pData, pDataInput, nData); /* Move the cursor to a node near the key to be inserted. If the key already - * exists in the table, then (match == 0). In this case we can just tqreplace + * exists in the table, then (match == 0). In this case we can just replace * the data associated with the entry, we don't need to manipulate the tree. * * If there is no exact match, then the cursor points at what would be either diff --git a/kexi/3rdparty/kexisql/src/encode.c b/kexi/3rdparty/kexisql/src/encode.c index 3e14e641b..899901b52 100644 --- a/kexi/3rdparty/kexisql/src/encode.c +++ b/kexi/3rdparty/kexisql/src/encode.c @@ -67,7 +67,7 @@ ** (2) Copy each input character into the output buffer, one by ** one, adding the offset value as you copy. ** -** (3) If the value of an input character plus offset is 0x00, tqreplace +** (3) If the value of an input character plus offset is 0x00, replace ** that one character by the two-character sequence 0x01 0x01. ** If the sum is 0x01, replace it with 0x01 0x02. If the sum ** is 0x27, replace it with 0x01 0x03. @@ -101,7 +101,7 @@ */ /* -** Encode a binary buffer "in" of size n bytes so that it tqcontains +** Encode a binary buffer "in" of size n bytes so that it contains ** no instances of characters '\'' or '\000'. The output is ** null-terminated and can be used as a string value in an INSERT ** or UPDATE statement. Use sqlite_decode_binary() to convert the @@ -231,7 +231,7 @@ int main(int argc, char **argv){ } for(j=0; out[j]; j++){ if( out[j]=='\'' ){ - printf(" ERROR tqcontains (')\n"); + printf(" ERROR contains (')\n"); exit(1); } } diff --git a/kexi/3rdparty/kexisql/src/insert.c b/kexi/3rdparty/kexisql/src/insert.c index 8c303573a..e8d5e567c 100644 --- a/kexi/3rdparty/kexisql/src/insert.c +++ b/kexi/3rdparty/kexisql/src/insert.c @@ -541,7 +541,7 @@ insert_cleanup: /* ** Generate code to do a constraint check prior to an INSERT or an UPDATE. ** -** When this routine is called, the stack tqcontains (from bottom to top) +** When this routine is called, the stack contains (from bottom to top) ** the following values: ** ** 1. The recno of the row to be updated before the update. This diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c index fc0f91e2d..79eb15e5b 100644 --- a/kexi/3rdparty/kexisql/src/os.c +++ b/kexi/3rdparty/kexisql/src/os.c @@ -172,7 +172,7 @@ static unsigned int elapse; ** ** If you close a file descriptor that points to a file that has locks, ** all locks on that file that are owned by the current process are -** released. To work around this problem, each OsFile structure tqcontains +** released. To work around this problem, each OsFile structure contains ** a pointer to an openCnt structure. There is one openCnt structure ** per open inode, which means that multiple OsFiles can point to a single ** openCnt. When an attempt is made to close an OsFile, if there are diff --git a/kexi/3rdparty/kexisql/src/pager.c b/kexi/3rdparty/kexisql/src/pager.c index 566c778c3..0ce24086e 100644 --- a/kexi/3rdparty/kexisql/src/pager.c +++ b/kexi/3rdparty/kexisql/src/pager.c @@ -1920,7 +1920,7 @@ int sqlitepager_overwrite(Pager *pPager, Pgno pgno, void *pData){ ** a transaction then removed from the freelist during a later part ** of the same transaction and reused for some other purpose. When it ** is first added to the freelist, this routine is called. When reused, -** the dont_rollback() routine is called. But because the page tqcontains +** the dont_rollback() routine is called. But because the page contains ** critical data, we still need to be sure it gets rolled back in spite ** of the dont_rollback() call. */ diff --git a/kexi/3rdparty/kexisql/src/select.c b/kexi/3rdparty/kexisql/src/select.c index 28136e76e..0dde6d2e4 100644 --- a/kexi/3rdparty/kexisql/src/select.c +++ b/kexi/3rdparty/kexisql/src/select.c @@ -1707,7 +1707,7 @@ static int flattenSubquery( ** the FROM clause of the outer query. Before doing this, remember ** the cursor number for the original outer query FROM element in ** iParent. The iParent cursor will never be used. Subsequent code - ** will scan expressions looking for iParent references and tqreplace + ** will scan expressions looking for iParent references and replace ** those references with expressions that resolve to the subquery FROM ** elements we are now copying in. */ diff --git a/kexi/3rdparty/kexisql/src/sqlite.h b/kexi/3rdparty/kexisql/src/sqlite.h index 4264cc1b0..dd227cd00 100644 --- a/kexi/3rdparty/kexisql/src/sqlite.h +++ b/kexi/3rdparty/kexisql/src/sqlite.h @@ -828,7 +828,7 @@ int sqlite_rekey( ); /* -** Encode a binary buffer "in" of size n bytes so that it tqcontains +** Encode a binary buffer "in" of size n bytes so that it contains ** no instances of characters '\'' or '\000'. The output is ** null-terminated and can be used as a string value in an INSERT ** or UPDATE statement. Use sqlite_decode_binary() to convert the diff --git a/kexi/3rdparty/kexisql/src/tclsqlite.c b/kexi/3rdparty/kexisql/src/tclsqlite.c index 7256eafeb..fdc2f5e88 100644 --- a/kexi/3rdparty/kexisql/src/tclsqlite.c +++ b/kexi/3rdparty/kexisql/src/tclsqlite.c @@ -999,7 +999,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ ** DBNAME that is used to control that connection. The database ** connection is deleted when the DBNAME command is deleted. ** -** The second argument is the name of the directory that tqcontains +** The second argument is the name of the directory that contains ** the sqlite database that is to be accessed. ** ** For testing purposes, we also support the following: diff --git a/kexi/3rdparty/kexisql/src/vdbe.c b/kexi/3rdparty/kexisql/src/vdbe.c index 6ac810587..9f31e9cf6 100644 --- a/kexi/3rdparty/kexisql/src/vdbe.c +++ b/kexi/3rdparty/kexisql/src/vdbe.c @@ -233,7 +233,7 @@ static int hardDynamicify(Mem *pStack){ } /* -** An ephemeral string value (signified by the MEM_Ephem flag) tqcontains +** An ephemeral string value (signified by the MEM_Ephem flag) contains ** a pointer to a dynamically allocated string where some other entity ** is responsible for deallocating that string. Because the stack entry ** does not control the string, it might be deleted without the stack @@ -4151,8 +4151,8 @@ case OP_FileOpen: { ** Read a single line of input from the open file (the file opened using ** FileOpen). If we reach end-of-file, jump immediately to P2. If ** we are able to get another line, split the line apart using P3 as -** a delimiter. There should be P1 fields. If the input line tqcontains -** more than P1 fields, ignore the excess. If the input line tqcontains +** a delimiter. There should be P1 fields. If the input line contains +** more than P1 fields, ignore the excess. If the input line contains ** fewer than P1 fields, assume the remaining fields contain NULLs. ** ** Input ends if a line consists of just "\.". A field containing only diff --git a/kexi/3rdparty/kexisql/src/vdbeInt.h b/kexi/3rdparty/kexisql/src/vdbeInt.h index 3daa74c3b..79b6b51a5 100644 --- a/kexi/3rdparty/kexisql/src/vdbeInt.h +++ b/kexi/3rdparty/kexisql/src/vdbeInt.h @@ -161,7 +161,7 @@ struct sqlite_func { /* ** An Agg structure describes an Aggregator. Each Agg consists of -** zero or more Aggregator elements (AggElem). Each AggElem tqcontains +** zero or more Aggregator elements (AggElem). Each AggElem contains ** a key and one or more values. The values are used in processing ** aggregate functions in a SELECT. The key is used to implement ** the GROUP BY clause of a select. diff --git a/kexi/3rdparty/kexisql/src/where.c b/kexi/3rdparty/kexisql/src/where.c index 58b6e3d0d..bb6a7f4f6 100644 --- a/kexi/3rdparty/kexisql/src/where.c +++ b/kexi/3rdparty/kexisql/src/where.c @@ -302,7 +302,7 @@ static void disableTerm(WhereLevel *pLevel, Expr **ppExpr){ /* ** Generate the beginning of the loop used for WHERE clause processing. -** The return value is a pointer to an (opaque) structure that tqcontains +** The return value is a pointer to an (opaque) structure that contains ** information needed to terminate the loop. Later, the calling routine ** should invoke sqliteWhereEnd() with the return value of this function ** in order to complete the WHERE clause processing. diff --git a/kexi/3rdparty/kexisql/tool/lemon.c b/kexi/3rdparty/kexisql/tool/lemon.c index 84f73d170..a0eef8104 100644 --- a/kexi/3rdparty/kexisql/tool/lemon.c +++ b/kexi/3rdparty/kexisql/tool/lemon.c @@ -298,7 +298,7 @@ char *Strsafe(); void Strsafe_init(/* void */); int Strsafe_insert(/* char * */); -char *Strsafe_tqfind(/* char * */); +char *Strsafe_find(/* char * */); /* Routines for handling symbols of the grammar */ @@ -306,7 +306,7 @@ struct symbol *Symbol_new(); int Symbolcmpp(/* struct symbol **, struct symbol ** */); void Symbol_init(/* void */); int Symbol_insert(/* struct symbol *, char * */); -struct symbol *Symbol_tqfind(/* char * */); +struct symbol *Symbol_find(/* char * */); struct symbol *Symbol_Nth(/* int */); int Symbol_count(/* */); struct symbol **Symbol_arrayof(/* */); @@ -317,14 +317,14 @@ int Configcmp(/* struct config *, struct config * */); struct state *State_new(); void State_init(/* void */); int State_insert(/* struct state *, struct config * */); -struct state *State_tqfind(/* struct config * */); +struct state *State_find(/* struct config * */); struct state **State_arrayof(/* */); /* Routines used for efficiency in Configlist_add */ void Configtable_init(/* void */); int Configtable_insert(/* struct config * */); -struct config *Configtable_tqfind(/* struct config * */); +struct config *Configtable_find(/* struct config * */); void Configtable_clear(/* int(*)(struct config *) */); /****************** From the file "action.c" *******************************/ /* @@ -510,7 +510,7 @@ struct lemon *lemp; /* Find the start symbol */ if( lemp->start ){ - sp = Symbol_tqfind(lemp->start); + sp = Symbol_find(lemp->start); if( sp==0 ){ ErrorMsg(lemp->filename,0, "The specified start symbol \"%s\" is not \ @@ -571,7 +571,7 @@ struct lemon *lemp; bp = Configlist_basis(); /* Get a state with the same basis */ - stp = State_tqfind(bp); + stp = State_find(bp); if( stp ){ /* A state with the same basis already exists! Copy all the follow-set ** propagation links from the state under construction into the @@ -755,7 +755,7 @@ struct lemon *lemp; /* Add the accepting token */ if( lemp->start ){ - sp = Symbol_tqfind(lemp->start); + sp = Symbol_find(lemp->start); if( sp==0 ) sp = lemp->rule->lhs; }else{ sp = lemp->rule->lhs; @@ -933,7 +933,7 @@ int dot; /* Index into the RHS of the rule where the dot goes */ assert( currentend!=0 ); model.rp = rp; model.dot = dot; - cfp = Configtable_tqfind(&model); + cfp = Configtable_find(&model); if( cfp==0 ){ cfp = newconfig(); cfp->rp = rp; @@ -961,7 +961,7 @@ int dot; assert( currentend!=0 ); model.rp = rp; model.dot = dot; - cfp = Configtable_tqfind(&model); + cfp = Configtable_find(&model); if( cfp==0 ){ cfp = newconfig(); cfp->rp = rp; @@ -3470,7 +3470,7 @@ char *y; { char *z; - z = Strsafe_tqfind(y); + z = Strsafe_find(y); if( z==0 && (z=malloc( strlen(y)+1 ))!=0 ){ strcpy(z,y); Strsafe_insert(z); @@ -3581,7 +3581,7 @@ char *data; /* Return a pointer to data assigned to the given key. Return NULL ** if no such key. */ -char *Strsafe_tqfind(key) +char *Strsafe_find(key) char *key; { int h; @@ -3605,7 +3605,7 @@ char *x; { struct symbol *sp; - sp = Symbol_tqfind(x); + sp = Symbol_find(x); if( sp==0 ){ sp = (struct symbol *)malloc( sizeof(struct symbol) ); MemoryCheck(sp); @@ -3738,7 +3738,7 @@ char *key; /* Return a pointer to data assigned to the given key. Return NULL ** if no such key. */ -struct symbol *Symbol_tqfind(key) +struct symbol *Symbol_find(key) char *key; { int h; @@ -3944,7 +3944,7 @@ struct config *key; /* Return a pointer to data assigned to the given key. Return NULL ** if no such key. */ -struct state *State_tqfind(key) +struct state *State_find(key) struct config *key; { int h; @@ -4087,7 +4087,7 @@ struct config *data; /* Return a pointer to data assigned to the given key. Return NULL ** if no such key. */ -struct config *Configtable_tqfind(key) +struct config *Configtable_find(key) struct config *key; { int h; diff --git a/kexi/3rdparty/kexisql/tool/lempar.c b/kexi/3rdparty/kexisql/tool/lempar.c index b6ffceb0d..5604fe10d 100644 --- a/kexi/3rdparty/kexisql/tool/lempar.c +++ b/kexi/3rdparty/kexisql/tool/lempar.c @@ -58,7 +58,7 @@ #define YY_NO_ACTION (YYNSTATE+YYNRULE+2) #define YY_ACCEPT_ACTION (YYNSTATE+YYNRULE+1) #define YY_ERROR_ACTION (YYNSTATE+YYNRULE) -/* Next is the action table. Each entry in this table tqcontains +/* Next is the action table. Each entry in this table contains ** ** + An integer which is the number representing the look-ahead ** token diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c index fb54c9c4a..0a2501d01 100644 --- a/kexi/3rdparty/kexisql3/src/btree.c +++ b/kexi/3rdparty/kexisql3/src/btree.c @@ -445,7 +445,7 @@ static void put4byte(unsigned char *p, u32 v){ /* ** The pointer map is a lookup table that identifies the tqparent page for ** each child page in the database file. The tqparent page is the page that -** contains a pointer to the child. Every page in the database tqcontains +** contains a pointer to the child. Every page in the database contains ** 0 or 1 tqparent pages. (In this context 'database page' refers ** to any page that is not part of the pointer map itself.) Each pointer map ** entry consists of a single byte 'type' and a 4 byte tqparent page number. @@ -3065,7 +3065,7 @@ static int allocatePage( memcpy(&pPrevTrunk->aData[0], &pTrunk->aData[0], 4); } }else{ - /* The trunk page is required by the caller but it tqcontains + /* The trunk page is required by the caller but it contains ** pointers to free-list leaves. The first leaf becomes a trunk ** page in this case. */ diff --git a/kexi/3rdparty/kexisql3/src/build.c b/kexi/3rdparty/kexisql3/src/build.c index 02faa0fe6..4fcd2bc07 100644 --- a/kexi/3rdparty/kexisql3/src/build.c +++ b/kexi/3rdparty/kexisql3/src/build.c @@ -879,7 +879,7 @@ void sqlite3AddNotNull(Parse *pParse, int onError){ ** ** This routine does a case-independent search of zType for the ** substrings in the following table. If one of the substrings is -** found, the corresponding affinity is returned. If zType tqcontains +** found, the corresponding affinity is returned. If zType contains ** more than one of the substrings, entries toward the top of ** the table take priority. For example, if zType is 'BLOBINT', ** SQLITE_AFF_INTEGER is returned. diff --git a/kexi/3rdparty/kexisql3/src/insert.c b/kexi/3rdparty/kexisql3/src/insert.c index 4cac87247..7b8735a11 100644 --- a/kexi/3rdparty/kexisql3/src/insert.c +++ b/kexi/3rdparty/kexisql3/src/insert.c @@ -720,7 +720,7 @@ insert_cleanup: /* ** Generate code to do a constraint check prior to an INSERT or an UPDATE. ** -** When this routine is called, the stack tqcontains (from bottom to top) +** When this routine is called, the stack contains (from bottom to top) ** the following values: ** ** 1. The rowid of the row to be updated before the update. This diff --git a/kexi/3rdparty/kexisql3/src/os_unix.c b/kexi/3rdparty/kexisql3/src/os_unix.c index 91ca787ed..cef00ffa8 100644 --- a/kexi/3rdparty/kexisql3/src/os_unix.c +++ b/kexi/3rdparty/kexisql3/src/os_unix.c @@ -147,7 +147,7 @@ ** ** If you close a file descriptor that points to a file that has locks, ** all locks on that file that are owned by the current process are -** released. To work around this problem, each OsFile structure tqcontains +** released. To work around this problem, each OsFile structure contains ** a pointer to an openCnt structure. There is one openCnt structure ** per open inode, which means that multiple OsFiles can point to a single ** openCnt. When an attempt is made to close an OsFile, if there are diff --git a/kexi/3rdparty/kexisql3/src/pager.c b/kexi/3rdparty/kexisql3/src/pager.c index b49a37d5b..60cb43bde 100644 --- a/kexi/3rdparty/kexisql3/src/pager.c +++ b/kexi/3rdparty/kexisql3/src/pager.c @@ -2972,7 +2972,7 @@ int sqlite3pager_overwrite(Pager *pPager, Pgno pgno, void *pData){ ** a transaction then removed from the freelist during a later part ** of the same transaction and reused for some other purpose. When it ** is first added to the freelist, this routine is called. When reused, -** the dont_rollback() routine is called. But because the page tqcontains +** the dont_rollback() routine is called. But because the page contains ** critical data, we still need to be sure it gets rolled back in spite ** of the dont_rollback() call. */ diff --git a/kexi/3rdparty/kexisql3/src/select.c b/kexi/3rdparty/kexisql3/src/select.c index fd8b41a84..13c38d509 100644 --- a/kexi/3rdparty/kexisql3/src/select.c +++ b/kexi/3rdparty/kexisql3/src/select.c @@ -2038,7 +2038,7 @@ static int flattenSubquery( ** the FROM clause of the outer query. Before doing this, remember ** the cursor number for the original outer query FROM element in ** iParent. The iParent cursor will never be used. Subsequent code - ** will scan expressions looking for iParent references and tqreplace + ** will scan expressions looking for iParent references and replace ** those references with expressions that resolve to the subquery FROM ** elements we are now copying in. */ diff --git a/kexi/3rdparty/kexisql3/src/tclsqlite.c b/kexi/3rdparty/kexisql3/src/tclsqlite.c index 4387e2f74..51bde4eec 100644 --- a/kexi/3rdparty/kexisql3/src/tclsqlite.c +++ b/kexi/3rdparty/kexisql3/src/tclsqlite.c @@ -921,7 +921,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ ** as column separators. If a column contains a null string, or the ** value of NULLINDICATOR, a NULL is inserted for the column. ** conflict-algorithm is one of the sqlite conflict algorithms: - ** rollback, abort, fail, ignore, tqreplace + ** rollback, abort, fail, ignore, replace ** On success, return the number of lines processed, not necessarily same ** as 'db changes' due to conflict-algorithm selected. ** @@ -982,10 +982,10 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ sqlite3StrICmp(zConflict, "abort" ) != 0 && sqlite3StrICmp(zConflict, "fail" ) != 0 && sqlite3StrICmp(zConflict, "ignore" ) != 0 && - sqlite3StrICmp(zConflict, "tqreplace" ) != 0 ) { + sqlite3StrICmp(zConflict, "replace" ) != 0 ) { Tcl_AppendResult(interp, "Error: \"", zConflict, "\", conflict-algorithm must be one of: rollback, " - "abort, fail, ignore, or tqreplace", 0); + "abort, fail, ignore, or replace", 0); return TCL_ERROR; } zSql = sqlite3_mprintf("SELECT * FROM '%q'", zTable); @@ -1822,7 +1822,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ ** DBNAME that is used to control that connection. The database ** connection is deleted when the DBNAME command is deleted. ** -** The second argument is the name of the directory that tqcontains +** The second argument is the name of the directory that contains ** the sqlite database that is to be accessed. ** ** For testing purposes, we also support the following: diff --git a/kexi/3rdparty/kexisql3/src/vdbe.c b/kexi/3rdparty/kexisql3/src/vdbe.c index 1b5678fd6..f46593715 100644 --- a/kexi/3rdparty/kexisql3/src/vdbe.c +++ b/kexi/3rdparty/kexisql3/src/vdbe.c @@ -103,7 +103,7 @@ int sqlite3_sort_count = 0; /* -** An ephemeral string value (signified by the MEM_Ephem flag) tqcontains +** An ephemeral string value (signified by the MEM_Ephem flag) contains ** a pointer to a dynamically allocated string where some other entity ** is responsible for deallocating that string. Because the stack entry ** does not control the string, it might be deleted without the stack @@ -508,7 +508,7 @@ int sqlite3VdbeExec( ** case statement is followed by a comment of the form "/# same as ... #/" ** that comment is used to determine the particular value of the opcode. ** -** If a comment on the same line as the "case OP_" construction tqcontains +** If a comment on the same line as the "case OP_" construction contains ** the word "no-push", then the opcode is guarenteed not to grow the ** vdbe stack when it is executed. See function opcode() in ** vdbeaux.c for details. diff --git a/kexi/3rdparty/kexisql3/src/vdbeInt.h b/kexi/3rdparty/kexisql3/src/vdbeInt.h index dea8465b2..891742710 100644 --- a/kexi/3rdparty/kexisql3/src/vdbeInt.h +++ b/kexi/3rdparty/kexisql3/src/vdbeInt.h @@ -160,7 +160,7 @@ typedef struct Mem Mem; #define MEM_Agg 0x0400 /* Mem.z points to an agg function context */ -/* A VdbeFunc is just a FuncDef (defined in sqliteInt.h) that tqcontains +/* A VdbeFunc is just a FuncDef (defined in sqliteInt.h) that contains ** additional information about auxiliary information bound to arguments ** of the function. This is used to implement the sqlite3_get_auxdata() ** and sqlite3_set_auxdata() APIs. The "auxdata" is some auxiliary data diff --git a/kexi/3rdparty/kexisql3/src/vdbeaux.c b/kexi/3rdparty/kexisql3/src/vdbeaux.c index 33c812bf9..1ff314d1a 100644 --- a/kexi/3rdparty/kexisql3/src/vdbeaux.c +++ b/kexi/3rdparty/kexisql3/src/vdbeaux.c @@ -186,7 +186,7 @@ static int opcodeNoPush(u8 op){ ** to grow the stack when it is executed. Otherwise, it may grow the ** stack by at most one entry. ** - ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 tqcontains + ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 contains ** one bit for opcodes 16 to 31, and so on. ** ** 16-bit bitmasks (rather than 32-bit) are specified in opcodes.h diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c index f4b8ba51a..54c8402ff 100644 --- a/kexi/3rdparty/kexisql3/src/where.c +++ b/kexi/3rdparty/kexisql3/src/where.c @@ -1284,7 +1284,7 @@ static int nTQPlan = 0; /* Next free slow in _query_plan[] */ /* ** Generate the beginning of the loop used for WHERE clause processing. -** The return value is a pointer to an opaque structure that tqcontains +** The return value is a pointer to an opaque structure that contains ** information needed to terminate the loop. Later, the calling routine ** should invoke sqlite3WhereEnd() with the return value of this function ** in order to complete the WHERE clause processing. diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index b8f6e23dd..3541e6ea2 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -139,12 +139,12 @@ void KoGlobal::createListOfLanguages() { // Extract the language tag from the directory name TQString tag = *it; - int index = tag.tqfindRev('/'); + int index = tag.findRev('/'); tag = tag.left(index); - index = tag.tqfindRev('/'); + index = tag.findRev('/'); tag = tag.mid(index+1); - if ( seenLanguages.tqfind( tag ) == seenLanguages.end() ) { + if ( seenLanguages.find( tag ) == seenLanguages.end() ) { KSimpleConfig entry(*it); entry.setGroup("KCM Locale"); @@ -166,7 +166,7 @@ void KoGlobal::createListOfLanguages() TQString KoGlobal::tagOfLanguage( const TQString & _lang) { const LanguageMap& map = self()->m_langMap; - TQMap<TQString,TQString>::ConstIterator it = map.tqfind( _lang ); + TQMap<TQString,TQString>::ConstIterator it = map.find( _lang ); if ( it != map.end() ) return *it; return TQString(); diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc index bd10e26ed..506e24e15 100644 --- a/kexi/3rdparty/kolibs/koUnit.cc +++ b/kexi/3rdparty/kolibs/koUnit.cc @@ -155,7 +155,7 @@ double KoUnit::parseValue( TQString value, double defaultVal ) if( value.isEmpty() ) return defaultVal; - int index = value.tqfind( TQRegExp( "[a-z]+$" ) ); + int index = value.find( TQRegExp( "[a-z]+$" ) ); if ( index == -1 ) return value.toDouble(); diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp index 4efb6d7b7..24cd08e83 100644 --- a/kexi/core/kexi.cpp +++ b/kexi/core/kexi.cpp @@ -335,7 +335,7 @@ void KEXI_UNFINISHED(const TQString& feature_name, const TQString& extra_text) else { TQString feature_name_(feature_name); msg = i18n("\"%1\" function is not available for version %2 of %3 application.") - .tqarg(feature_name_.tqreplace("&","")) + .tqarg(feature_name_.replace("&","")) .tqarg(KEXI_VERSION_STRING) .tqarg(KEXI_APP_NAME); } diff --git a/kexi/core/kexiactioncategories.cpp b/kexi/core/kexiactioncategories.cpp index b3cd1c066..03c09433b 100644 --- a/kexi/core/kexiactioncategories.cpp +++ b/kexi/core/kexiactioncategories.cpp @@ -89,7 +89,7 @@ void ActionCategories::addAction(const char* name, int categories, KexiPart::ObjectTypes supportedObjectType5, KexiPart::ObjectTypes supportedObjectType6, KexiPart::ObjectTypes supportedObjectType7, KexiPart::ObjectTypes supportedObjectType8) { - ActionInternal * a = d->actions.tqfind( name ); + ActionInternal * a = d->actions.find( name ); if (a) { a->categories |= categories; } @@ -127,7 +127,7 @@ void ActionCategories::addAction(const char* name, int categories, void ActionCategories::setAllObjectTypesSupported(const char* name, bool set) { - ActionInternal * a = d->actions.tqfind( name ); + ActionInternal * a = d->actions.find( name ); if (a) a->allObjectTypesAreSupported = set; else @@ -136,14 +136,14 @@ void ActionCategories::setAllObjectTypesSupported(const char* name, bool set) int ActionCategories::actionCategories(const char* name) const { - const ActionInternal * a = d->actions.tqfind( name ); + const ActionInternal * a = d->actions.find( name ); return a ? a->categories : 0; } bool ActionCategories::actionSupportsObjectType(const char* name, KexiPart::ObjectTypes objectType) const { - const ActionInternal * a = d->actions.tqfind( name ); + const ActionInternal * a = d->actions.find( name ); if (a && a->allObjectTypesAreSupported) return true; - return (a && a->supportedObjectTypes) ? a->supportedObjectTypes->tqcontains(objectType) : false; + return (a && a->supportedObjectTypes) ? a->supportedObjectTypes->contains(objectType) : false; } diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp index 7f5f42f93..4b77b9ef2 100644 --- a/kexi/core/kexiactionproxy.cpp +++ b/kexi/core/kexiactionproxy.cpp @@ -269,7 +269,7 @@ void KexiActionProxy::addActionProxyChild( KexiActionProxy* child ) void KexiActionProxy::takeActionProxyChild( KexiActionProxy* child ) { - if (m_sharedActionChildren.tqfindRef( child ) != -1) + if (m_sharedActionChildren.findRef( child ) != -1) m_sharedActionChildren.take(); } diff --git a/kexi/core/kexiblobbuffer.cpp b/kexi/core/kexiblobbuffer.cpp index d1f78c4a9..a4c57791c 100644 --- a/kexi/core/kexiblobbuffer.cpp +++ b/kexi/core/kexiblobbuffer.cpp @@ -193,7 +193,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::insertPixmap(const KURL& url) return KexiBLOBBuffer::Handle(); } //! @todo what about searching by filename only and then compare data? - Item * item = d->itemsByURL.tqfind(url.prettyURL()); + Item * item = d->itemsByURL.find(url.prettyURL()); if (item) return KexiBLOBBuffer::Handle(item); @@ -212,14 +212,14 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::insertPixmap(const KURL& url) return KexiBLOBBuffer::Handle(); } TQFileInfo fi(url.fileName()); - TQString caption(fi.baseName().tqreplace('_', " ").simplifyWhiteSpace()); + TQString caption(fi.baseName().replace('_', " ").simplifyWhiteSpace()); item = new Item(data, ++d->maxId, /*!stored*/false, url.fileName(), caption, mimeType); insertItem(item); //cache item->prettyURL = url.prettyURL(); - d->itemsByURL.tqreplace(url.prettyURL(), item); + d->itemsByURL.replace(url.prettyURL(), item); return KexiBLOBBuffer::Handle(item); } @@ -261,7 +261,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored) if (id<=0) return KexiBLOBBuffer::Handle(); if (stored) { - Item *item = d->storedItems.tqfind(id); + Item *item = d->storedItems.find(id); if (item || !d->conn) return KexiBLOBBuffer::Handle(item); //retrieve stored BLOB: @@ -314,7 +314,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored) //#endif } else - return KexiBLOBBuffer::Handle(d->inMemoryItems.tqfind(id)); + return KexiBLOBBuffer::Handle(d->inMemoryItems.find(id)); } KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id) diff --git a/kexi/core/kexidbconnectionset.cpp b/kexi/core/kexidbconnectionset.cpp index f548d82bb..d76ed3f4d 100644 --- a/kexi/core/kexidbconnectionset.cpp +++ b/kexi/core/kexidbconnectionset.cpp @@ -101,7 +101,7 @@ bool KexiDBConnectionSet::saveConnectionData(KexiDB::ConnectionData *oldData, { if (!oldData || !newData) return false; - TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( oldData ); + TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( oldData ); if (it == d->filenamesForData.constEnd() || it.data().isEmpty()) return false; const TQString filename( it.data() ); @@ -115,7 +115,7 @@ bool KexiDBConnectionSet::saveConnectionData(KexiDB::ConnectionData *oldData, void KexiDBConnectionSet::removeConnectionDataInternal(KexiDB::ConnectionData *data) { - TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( data ); + TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( data ); const TQString filename( it.data() ); d->filenamesForData.remove(data); d->dataForFilenames.remove(filename); @@ -126,7 +126,7 @@ bool KexiDBConnectionSet::removeConnectionData(KexiDB::ConnectionData *data) { if (!data) return false; - TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( data ); + TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( data ); if (it == d->filenamesForData.constEnd() || it.data().isEmpty()) return false; TQFile file( it.data() ); @@ -173,7 +173,7 @@ TQString KexiDBConnectionSet::fileNameForConnectionData(KexiDB::ConnectionData * { if (!data) return TQString(); - TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( data ); + TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( data ); return (it == d->filenamesForData.constEnd()) ? TQString() : it.data(); } diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp index 8cd8fc0e2..005754612 100644 --- a/kexi/core/kexipartmanager.cpp +++ b/kexi/core/kexipartmanager.cpp @@ -81,7 +81,7 @@ Manager::lookup() if (!Kexi::tempShowScripts() && mime=="kexi/script") continue; //</TEMP> - int idx = sl_order.tqfindIndex( ptr->library() ); + int idx = sl_order.findIndex( ptr->library() ); if (idx!=-1) ordered.insert(idx, ptr); else //add to end @@ -254,11 +254,11 @@ Manager::checkProject(KexiDB::Connection *conn) KexiDB::FieldList *fl = ts->subList("p_id", "p_name", "p_mime", "p_url"); if (!fl) return false; - if (!parts_found.tqcontains("kexi/table")) { + if (!parts_found.contains("kexi/table")) { if (!conn->insertRecord(*fl, TQVariant(1), TQVariant("Tables"), TQVariant("kexi/table"), TQVariant("http://"))) return false; } - if (!parts_found.tqcontains("kexi/query")) { + if (!parts_found.contains("kexi/query")) { if (!conn->insertRecord(*fl, TQVariant(2), TQVariant("Queries"), TQVariant("kexi/query"), TQVariant("http://"))) return false; } diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp index 7a2d9367d..159de7506 100644 --- a/kexi/core/kexiproject.cpp +++ b/kexi/core/kexiproject.cpp @@ -664,7 +664,7 @@ KexiProject::item(int identifier) { KexiPart::ItemDict *dict; for (TQIntDictIterator<KexiPart::ItemDict> it(d->itemDictsCache); (dict = it.current()); ++it) { - KexiPart::Item *item = dict->tqfind(identifier); + KexiPart::Item *item = dict->find(identifier); if (item) return item; } diff --git a/kexi/core/kexisearchandreplaceiface.h b/kexi/core/kexisearchandreplaceiface.h index f581de34e..0101c7ce2 100644 --- a/kexi/core/kexisearchandreplaceiface.h +++ b/kexi/core/kexisearchandreplaceiface.h @@ -78,10 +78,10 @@ class KEXICORE_EXPORT KexiSearchAndReplaceViewInterface bool promptOnReplace : 1; }; - /*! Sets up data for tqfind/replace dialog, based on view's data model. + /*! Sets up data for find/replace dialog, based on view's data model. \a columnNames should contain column name, \a columnCaptions should contain column captions, and \a currentColumnName should beset to current column's name. - Implementation should set up values and return true if tqfind/replace dialog should be filled. */ + Implementation should set up values and return true if find/replace dialog should be filled. */ virtual bool setupFindAndReplace(TQStringList& columnNames, TQStringList& columnCaptions, TQString& currentColumnName) = 0; @@ -90,7 +90,7 @@ class KEXICORE_EXPORT KexiSearchAndReplaceViewInterface \return true if value has been found, false if value has not been found, and cancelled if there is nothing to find or there is no data to search in. If \a next is true, "find next" is performed, else "find previous" is performed. */ - virtual tristate tqfind(const TQVariant& valueToFind, + virtual tristate find(const TQVariant& valueToFind, const KexiSearchAndReplaceViewInterface::Options& options, bool next) = 0; /*! Finds \a valueToFind within the view and replaces with \a replacement diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index a98ac5a6c..aabba3e22 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -119,7 +119,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a setActionAvailable(action_name, avail); if (avail) { - d->enablers.tqreplace(action_name, fw); + d->enablers.replace(action_name, fw); } else { d->enablers.take(action_name); diff --git a/kexi/data/kde34compat/sqlite.magic b/kexi/data/kde34compat/sqlite.magic index 4e43a7fe5..a31592fb1 100644 --- a/kexi/data/kde34compat/sqlite.magic +++ b/kexi/data/kde34compat/sqlite.magic @@ -1,2 +1,2 @@ -0 string **\ This\ file\ tqcontains\ an\ SQLite application/x-sqlite2 +0 string **\ This\ file\ contains\ an\ SQLite application/x-sqlite2 0 string SQLite\ format\ 3 application/x-sqlite3 diff --git a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html index 16195281a..9d74be252 100644 --- a/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html +++ b/kexi/doc/handbook/html.tmp/05_04_00_form_designing.html @@ -387,7 +387,7 @@ For each widget inserted into the form, there are settings for size policy avail <br><img src="img/05_04_09_size_policy_properties.png"> <br>A group of properties for defining a widget's size policy<br><br> -This group of properties tqcontains: +This group of properties contains: <ul> <li><b>Horizontal Size Policy</b> defining horizontal size of the widget,</li> <li><b>Vertical Size Policy</b> defining vertical size of the widget,</li> diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index c08e44e6d..c23190691 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -127,7 +127,7 @@ PropertyCommand::unexecute() WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widg); TQWidget *subWidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widg; - if (-1!=subWidget->tqmetaObject()->tqfindProperty( m_property, true )) + if (-1!=subWidget->tqmetaObject()->findProperty( m_property, true )) subWidget->setProperty(m_property, it.data()); } diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index a9942d1ce..2b6d5eb72 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -174,7 +174,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) if(((mev->state() == ControlButton) || (mev->state() == ShiftButton)) && (!FormManager::self()->isInserting())) // multiple selection mode { - if(m_form->selectedWidgets()->tqfindRef(m_moving) != -1) // widget is already selected + if(m_form->selectedWidgets()->findRef(m_moving) != -1) // widget is already selected { if(m_form->selectedWidgets()->count() > 1) // we remove it from selection unSelectWidget(m_moving); @@ -191,7 +191,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) } else if((m_form->selectedWidgets()->count() > 1))//&& (!m_form->manager()->isInserting())) // more than one widget selected { - if(m_form->selectedWidgets()->tqfindRef(m_moving) == -1) // widget is not selected, it becomes the only selected widget + if(m_form->selectedWidgets()->findRef(m_moving) == -1) // widget is not selected, it becomes the only selected widget setSelectedWidget(m_moving, false, (mev->button() == Qt::RightButton)); // If the widget is already selected, we do nothing (to ease widget moving, etc.) } @@ -353,7 +353,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) // try to find the widget which was clicked last and should be edited if(m_form->selectedWidgets()->count() == 1) w = m_form->selectedWidgets()->first(); - else if(m_form->selectedWidgets()->tqfindRef(m_moving) != -1) + else if(m_form->selectedWidgets()->findRef(m_moving) != -1) w = m_moving; else w = m_form->selectedWidgets()->last(); @@ -411,7 +411,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) ObjectTreeList *list = item->tqparent()->tqchildren(); if(list->count() == 1) return true; - int index = list->tqfindRef(item); + int index = list->findRef(item); if(kev->key() == Key_BackTab){ if(index == 0) // go back to the last item diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index 15011e50f..ff7a2562a 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -625,7 +625,7 @@ ContainerFactory::previewWidget(const TQCString &classname, TQWidget *widget, KF { TQWidgetStack *stack = ((TQWidgetStack*)widget); KFormDesigner::ObjectTreeItem *tree = container->form()->objectTree()->lookup(widget->name()); - if(!tree->modifiedProperties()->tqcontains("frameShape")) + if(!tree->modifiedProperties()->contains("frameShape")) stack->setFrameStyle(TQFrame::NoFrame); } else if(classname == "HBox") diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index 086212839..32c557b39 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -972,7 +972,7 @@ StdWidgetFactory::setPropertyOptions( KFormDesigner::WidgetPropertySet& buf, con Q_UNUSED( info ); Q_UNUSED( w ); - if (buf.tqcontains("indent")) { + if (buf.contains("indent")) { buf["indent"].setOption("min", -1); buf["indent"].setOption("minValueText", i18n("default indent value", "default")); } diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 6acf139cb..e8b25c844 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -176,7 +176,7 @@ Form::commonParentContainer(WidgetList *wlist) // Creates a list of all widget parents for(TQWidget *w = wlist->first(); w; w = wlist->next()) { - if(list->tqfindRef(w->parentWidget()) == -1) + if(list->findRef(w->parentWidget()) == -1) list->append(w->parentWidget()); } @@ -465,14 +465,14 @@ Form::addWidgetToTabStops(ObjectTreeItem *it) // For composed widgets, we check if one of the child can have focus for(TQObjectListIterator chIt(clo); chIt.current(); ++chIt) { if(chIt.current()->isWidgetType()) {//TQ_TabFocus flag will be checked later! - if(d->tabstops.tqfindRef(it) == -1) { + if(d->tabstops.findRef(it) == -1) { d->tabstops.append(it); return; } } } } - else if(d->tabstops.tqfindRef(it) == -1) // not yet in the list + else if(d->tabstops.findRef(it) == -1) // not yet in the list d->tabstops.append(it); } diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index dbfdc10a9..639b4a831 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -324,7 +324,7 @@ FormIO::loadFormFromDom(Form *form, TQWidget *container, TQDomDocument &inBuf) } //update format version information uint ver = 1; //the default - if (form->headerProperties()->tqcontains("version")) { + if (form->headerProperties()->contains("version")) { bool ok; uint v = (*form->headerProperties())["version"].toUInt(&ok); if (ok) @@ -369,7 +369,7 @@ FormIO::loadFormFromDom(Form *form, TQWidget *container, TQDomDocument &inBuf) kdDebug() << "FormIO::loadFormFromDom ERROR : no ObjectTreeItem " << endl; continue; } - const int index = form->tabStops()->tqfindRef(item); + const int index = form->tabStops()->findRef(item); /* Compute a real destination index: "a number of not found items so far". */ const int realIndex = i - itemsNotFound; if((index != -1) && (index != realIndex)) // the widget is not in the same place, so we move it @@ -406,10 +406,10 @@ FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, con WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w); TQWidget *subwidget = w; bool addSubwidgetFlag = false; - int propertyId = w->tqmetaObject()->tqfindProperty(name, true); + int propertyId = w->tqmetaObject()->findProperty(name, true); if (propertyId == -1 && subpropIface && subpropIface->subwidget()) { // try property from subwidget subwidget = subpropIface->subwidget(); - propertyId = subpropIface->subwidget()->tqmetaObject()->tqfindProperty(name, true); + propertyId = subpropIface->subwidget()->tqmetaObject()->findProperty(name, true); addSubwidgetFlag = true; } if(propertyId == -1) @@ -865,7 +865,7 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name) } else if(type == "pixmap") { - if(m_savePixmapsInline || !m_currentForm || !m_currentItem || !m_currentForm->pixmapCollection()->tqcontains(text)) + if(m_savePixmapsInline || !m_currentForm || !m_currentItem || !m_currentForm->pixmapCollection()->contains(text)) return loadImage(tag.ownerDocument(), text); else { @@ -880,7 +880,7 @@ FormIO::readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name) { WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(obj); TQObject *subobject = (subpropIface && subpropIface->subwidget()) ? TQT_TQOBJECT(subpropIface->subwidget()) : obj; - const int count = subobject->tqmetaObject()->tqfindProperty(name.latin1(), true); + const int count = subobject->tqmetaObject()->findProperty(name.latin1(), true); const TQMetaProperty *meta = count!=-1 ? subobject->tqmetaObject()->property(count, true) : 0; if (meta) { @@ -1025,9 +1025,9 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument & { tqlayout = domDoc.createElement("temp"); savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget()); - if(item->modifiedProperties()->tqcontains("layoutMargin")) + if(item->modifiedProperties()->contains("layoutMargin")) savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin()); - if(item->modifiedProperties()->tqcontains("layoutSpacing")) + if(item->modifiedProperties()->contains("layoutSpacing")) savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing()); tclass.appendChild(tqlayout); } @@ -1261,7 +1261,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqpar = dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w; for(TQValueList<TQCString>::ConstIterator it = list.constBegin(); it != endIt; ++it) { - if(subwidget->tqmetaObject()->tqfindProperty(*it, true) != -1) + if(subwidget->tqmetaObject()->findProperty(*it, true) != -1) item->addModifiedProperty(*it, subwidget->property(*it)); } @@ -1376,7 +1376,7 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl } } // If the object doesn't have this property, we let the Factory handle it (maybe a special property) - else if(subwidget->tqmetaObject()->tqfindProperty(name.latin1(), true) == -1) + else if(subwidget->tqmetaObject()->findProperty(name.latin1(), true) == -1) { if(w->className() == TQString::tqfromLatin1("CustomWidget")) item->storeUnknownProperty(node); @@ -1611,7 +1611,7 @@ FormIO::loadImage(TQDomDocument domDoc, const TQString& name) ba[2] = ( len & 0x0000ff00 ) >> 8; ba[3] = ( len & 0x000000ff ); TQByteArray baunzip = tqUncompress(ba, baSize); - pix.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.tqfind('.')).latin1() ); + pix.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')).latin1() ); } else pix.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format.latin1() ); diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 4004fcd4f..66948abb1 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -328,7 +328,7 @@ FormManager::stopInsert() TQT_TQWIDGET(o)->unsetCursor(); #if 0 if( ((TQWidget*)o)->ownCursor()) { - TQMap<TQObject*,TQCursor>::ConstIterator curIt( form->d->cursors.tqfind(o) ); + TQMap<TQObject*,TQCursor>::ConstIterator curIt( form->d->cursors.find(o) ); if (curIt!=form->d->cursors.constEnd()) TQT_TQWIDGET(o)->setCursor( *curIt ); // ((TQWidget*)o)->setCursor( (*(form->d->cursors))[o->name()] ) ; @@ -437,7 +437,7 @@ FormManager::stopCreatingConnection() { TQWidget *w = (TQWidget*)o; if( w->ownCursor()) { - TQMap<TQObject*,TQCursor>::ConstIterator curIt( form->d->cursors.tqfind(o) ); + TQMap<TQObject*,TQCursor>::ConstIterator curIt( form->d->cursors.find(o) ); if (curIt!=form->d->cursors.constEnd()) TQT_TQWIDGET(o)->setCursor( *curIt ); } @@ -595,7 +595,7 @@ FormManager::deleteForm(Form *form) { if (!form) return; - if(m_forms.tqfind(form) == -1) + if(m_forms.find(form) == -1) m_preview.remove(form); else m_forms.remove(form); @@ -898,7 +898,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu separatorNeeded = true; // We create the buddy menu - if(!multiple && w->inherits(TQLABEL_OBJECT_NAME_STRING) && ((TQLabel*)w)->text().tqcontains("&") && (((TQLabel*)w)->textFormat() != RichText)) + if(!multiple && w->inherits(TQLABEL_OBJECT_NAME_STRING) && ((TQLabel*)w)->text().contains("&") && (((TQLabel*)w)->textFormat() != RichText)) { if (separatorNeeded) m_popup->insertSeparator(); @@ -1103,7 +1103,7 @@ FormManager::createLayout(int layoutType) if(list->count() == 1) { ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name()); - if(!item || !item->container() || !m_propSet->tqcontains("tqlayout")) + if(!item || !item->container() || !m_propSet->contains("tqlayout")) return; (*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType); return; @@ -1493,7 +1493,7 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple ) WidgetList *wlist = form->selectedWidgets(); bool fontEnabled = false; for (WidgetListIterator it(*wlist); it.current(); ++it) { - if (-1 != it.current()->tqmetaObject()->tqfindProperty("font", true)) { + if (-1 != it.current()->tqmetaObject()->findProperty("font", true)) { fontEnabled = true; break; } diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp index f9dad43a7..a00fbcbb2 100644 --- a/kexi/formeditor/objecttree.cpp +++ b/kexi/formeditor/objecttree.cpp @@ -80,7 +80,7 @@ ObjectTreeItem::addModifiedProperty(const TQCString &property, const TQVariant & if(property == "name") return; - if(!m_props.tqcontains(property)) { + if(!m_props.contains(property)) { m_props.insert(property, oldValue); kdDebug() << "ObjectTree::adModProperty(): Added this property in the list: " << property << " oldValue: " << oldValue << endl; } @@ -91,7 +91,7 @@ ObjectTreeItem::addSubproperty(const TQCString &property, const TQVariant& value { if (!m_subprops) m_subprops = new TQMap<TQString, TQVariant>(); - if (!m_props.tqcontains(property)) + if (!m_props.contains(property)) m_subprops->insert( property, value ); } @@ -113,7 +113,7 @@ ObjectTreeItem::setPixmapName(const TQCString &property, const TQString &name) TQString ObjectTreeItem::pixmapName(const TQCString &property) { - if(m_pixmapNames.tqcontains(property)) + if(m_pixmapNames.contains(property)) return m_pixmapNames[property]; return TQString(); } diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp index 4f2584465..e6802d81d 100644 --- a/kexi/formeditor/objecttreeview.cpp +++ b/kexi/formeditor/objecttreeview.cpp @@ -280,7 +280,7 @@ ObjectTreeView::slotSelectionChanged() { ObjectTreeViewItem *it = static_cast<ObjectTreeViewItem*>(item); TQWidget *w = it->objectTree()->widget(); - if(w && (m_form->selectedWidgets()->tqfindRef(w) == -1)) + if(w && (m_form->selectedWidgets()->findRef(w) == -1)) m_form->setSelectedWidget(w, true, true); } if (hadFocus) diff --git a/kexi/formeditor/scripting/scriptIO.h b/kexi/formeditor/scripting/scriptIO.h index 9261d75c8..f384fade3 100644 --- a/kexi/formeditor/scripting/scriptIO.h +++ b/kexi/formeditor/scripting/scriptIO.h @@ -41,7 +41,7 @@ class ScriptIO public: /*! Save the evnts of a form. Creates an \<events\> tag, and then one \<event\> tag for each event. - Each event tqcontains \<sender\> and \<receiver\> tags, with attributes depending on event type. */ + Each event contains \<sender\> and \<receiver\> tags, with attributes depending on event type. */ static bool saveFormEvents(TQDomNode &parentNode, FormScript *script); /*! Reads the \<events\> tag (\a parentNode), then creates and fills a FormScript object linked to this \a form. The new FormScript object is then added to ScriptManager list.*/ diff --git a/kexi/formeditor/utils.cpp b/kexi/formeditor/utils.cpp index f80c2c27a..6ce4bcaef 100644 --- a/kexi/formeditor/utils.cpp +++ b/kexi/formeditor/utils.cpp @@ -88,7 +88,7 @@ void KFormDesigner::setRecursiveCursor(TQWidget *w, Form *form) { ObjectTreeItem *tree = form->objectTree()->lookup(w->name()); - if(tree && ((tree->modifiedProperties()->tqcontains("cursor")) || !tree->tqchildren()->isEmpty()) + if(tree && ((tree->modifiedProperties()->contains("cursor")) || !tree->tqchildren()->isEmpty()) && !w->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING) ) //fix weird behaviour return; // if the user has set a cursor for this widget or this is a container, don't change it diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index f26661ab2..3e0458b95 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -100,7 +100,7 @@ void WidgetInfo::addAlternateClassName(const TQCString& alternateName, bool over bool WidgetInfo::isOverriddenClassName(const TQCString& alternateName) const { - return m_overriddenAlternateNames && (m_overriddenAlternateNames->tqfind(alternateName) != 0); + return m_overriddenAlternateNames && (m_overriddenAlternateNames->find(alternateName) != 0); } void WidgetInfo::setAutoSyncForProperty(const char *propertyName, tristate flag) @@ -121,7 +121,7 @@ void WidgetInfo::setAutoSyncForProperty(const char *propertyName, tristate flag) tristate WidgetInfo::autoSyncForProperty(const char *propertyName) const { - char* flag = m_propertiesWithDisabledAutoSync ? m_propertiesWithDisabledAutoSync->tqfind(propertyName) : 0; + char* flag = m_propertiesWithDisabledAutoSync ? m_propertiesWithDisabledAutoSync->find(propertyName) : 0; if (!flag) return cancelled; return flag==(char*)1 ? true : false; @@ -134,12 +134,12 @@ void WidgetInfo::setCustomTypeForProperty(const char *propertyName, int type) if (!m_customTypesForProperty) { m_customTypesForProperty = new TQMap<TQCString,int>(); } - m_customTypesForProperty->tqreplace(propertyName, type); + m_customTypesForProperty->replace(propertyName, type); } int WidgetInfo::customTypeForProperty(const char *propertyName) const { - if (!m_customTypesForProperty || !m_customTypesForProperty->tqcontains(propertyName)) + if (!m_customTypesForProperty || !m_customTypesForProperty->contains(propertyName)) return KoProperty::Auto; return (*m_customTypesForProperty)[propertyName]; } @@ -253,7 +253,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text, //copy properties if available WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(w); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : w; - if (-1!=m_editor->tqmetaObject()->tqfindProperty("margin", true) && -1!=subwidget->tqmetaObject()->tqfindProperty("margin", true)) + if (-1!=m_editor->tqmetaObject()->findProperty("margin", true) && -1!=subwidget->tqmetaObject()->findProperty("margin", true)) m_editor->setProperty("margin", subwidget->property("margin")); //#endif //js m_handles = new ResizeHandleSet(w, container->form(), true); @@ -520,7 +520,7 @@ WidgetFactory::changeProperty(const char *name, const TQVariant &value, Form *fo else { WidgetPropertySet *set = KFormDesigner::FormManager::self()->propertySet(); - if(set->tqcontains(name)) + if(set->contains(name)) (*set)[name] = value; } } diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index ac663f8bf..3d8607baa 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -173,20 +173,20 @@ WidgetLibrary::loadFactoryWidgets(WidgetFactory *f) // TQStringList l = TQStringList::split("|", w->alternateClassName()); TQValueList<TQCString>::ConstIterator endIt = l.constEnd(); for(TQValueList<TQCString>::ConstIterator it = l.constBegin(); it != endIt; ++it) { - WidgetInfo *widgetForClass = d->widgets.tqfind( *it ); + WidgetInfo *widgetForClass = d->widgets.find( *it ); if (!widgetForClass || (widgetForClass && !widgetForClass->isOverriddenClassName(*it))) { //insert a widgetinfo, if: //1) this class has no alternate class assigned yet, or //2) this class has alternate class assigned but without 'override' flag - d->widgets.tqreplace( *it, w); + d->widgets.replace( *it, w); } -/* WidgetInfo *widgetForClass = d->alternateWidgets.tqfind(*it); +/* WidgetInfo *widgetForClass = d->alternateWidgets.find(*it); if (!widgetForClass || (widgetForClass && !widgetForClass->isOverriddenClassName(*it))) { //insert a widgetinfo, if: //1) this class has no alternate class assigned yet, or //2) this class has alternate class assigned but without 'override' flag - d->alternateWidgets.tqreplace(*it, w); + d->alternateWidgets.replace(*it, w); }*/ } } @@ -249,7 +249,7 @@ WidgetLibrary::loadFactories() //collect information about classes to be hidden if (f->m_hiddenClasses) { for (TQAsciiDictIterator<char> it2(*f->m_hiddenClasses); it2.current(); ++it2) { - d->hiddenClasses.tqreplace( it2.currentKey(), (char*)1 ); + d->hiddenClasses.replace( it2.currentKey(), (char*)1 ); } } } @@ -453,7 +453,7 @@ TQString WidgetLibrary::displayName(const TQCString &classname) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(wi) return wi->name(); @@ -465,7 +465,7 @@ WidgetLibrary::savingName(const TQCString &classname) { loadFactories(); TQString s; - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(wi && !wi->savingName().isEmpty()) return wi->savingName(); @@ -476,7 +476,7 @@ TQString WidgetLibrary::namePrefix(const TQCString &classname) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(wi) return wi->namePrefix(); @@ -501,7 +501,7 @@ TQCString WidgetLibrary::classNameForAlternate(const TQCString &classname) { loadFactories(); - if(d->widgets.tqfind(classname)) + if(d->widgets.find(classname)) return classname; WidgetInfo *wi = d->widgets[classname]; @@ -517,7 +517,7 @@ TQString WidgetLibrary::includeFileName(const TQCString &classname) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(wi) return wi->includeFileName(); @@ -528,7 +528,7 @@ TQString WidgetLibrary::iconName(const TQCString &classname) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(wi) return wi->pixmap(); @@ -539,7 +539,7 @@ bool WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if (!wi) return false; @@ -555,7 +555,7 @@ bool WidgetLibrary::readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w, ObjectTreeItem *item) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if (!wi) return false; if (wi->factory()->readSpecialProperty(classname, node, w, item)) @@ -587,7 +587,7 @@ WidgetLibrary::isPropertyVisible(const TQCString &classname, TQWidget *w, } loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if (!wi) return false; if (!d->showAdvancedProperties && d->advancedProperties[ property ]) { @@ -613,7 +613,7 @@ TQValueList<TQCString> WidgetLibrary::autoSaveProperties(const TQCString &classname) { loadFactories(); - WidgetInfo *wi = d->widgets.tqfind(classname); + WidgetInfo *wi = d->widgets.find(classname); if(!wi) return TQValueList<TQCString>(); TQValueList<TQCString> lst; @@ -628,7 +628,7 @@ WidgetInfo* WidgetLibrary::widgetInfoForClassName(const char* classname) { loadFactories(); - return d->widgets.tqfind(classname); + return d->widgets.find(classname); } WidgetFactory* diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index 55bd4c60c..bd150e45f 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -126,9 +126,9 @@ WidgetPropertySet::property(const TQCString &name) } bool -WidgetPropertySet::tqcontains(const TQCString &property) +WidgetPropertySet::contains(const TQCString &property) { - return d->set.tqcontains(property); + return d->set.contains(property); } KoProperty::Set* @@ -195,7 +195,7 @@ WidgetPropertySet::setSelectedWidget(TQWidget *w, bool add, bool forceReload, bo } // don't add a widget twice - if(!forceReload && d->widgets.tqcontains(TQGuardedPtr<TQWidget>(w))) { + if(!forceReload && d->widgets.contains(TQGuardedPtr<TQWidget>(w))) { kdWarning() << "WidgetPropertySet::setSelectedWidget() Widget is already selected" << endl; return; } @@ -309,7 +309,7 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) const TQMetaProperty *subMeta = // special case - subproperty subpropIface ? subpropIface->findMetaSubproperty(it.current()) : 0; const TQMetaProperty *meta = subMeta ? subMeta - : w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty(*it, true), true); + : w->tqmetaObject()->property( w->tqmetaObject()->findProperty(*it, true), true); if (!meta) continue; const char* propertyName = meta->name(); @@ -317,14 +317,14 @@ WidgetPropertySet::createPropertiesForWidget(TQWidget *w) WidgetInfo *subwinfo = form->library()->widgetInfoForClassName(subwidget->className()); // kdDebug() << "$$$ " << subwidget->className() << endl; - if(subwinfo && meta->designable(subwidget) && !d->set.tqcontains(propertyName)) { + if(subwinfo && meta->designable(subwidget) && !d->set.contains(propertyName)) { //! \todo add another list for property description TQString desc( d->propCaption[meta->name()] ); //! \todo change i18n if (desc.isEmpty()) //try to get property description from factory desc = form->library()->propertyDescForName(subwinfo, propertyName); - modifiedPropertiesIt = modifiedProperties->tqfind(propertyName); + modifiedPropertiesIt = modifiedProperties->find(propertyName); const bool oldValueExists = modifiedPropertiesIt!=modifiedProperties->constEnd(); if(meta->isEnumType()) { @@ -411,12 +411,12 @@ void WidgetPropertySet::updatePropertyValue(ObjectTreeItem *tree, const char *property, const TQMetaProperty *meta) { const char *propertyName = meta ? meta->name() : property; - if (!d->set.tqcontains(propertyName)) + if (!d->set.contains(propertyName)) return; KoProperty::Property p( d->set[propertyName] ); //! \todo what about set properties, and lists properties - TQMap<TQString, TQVariant>::ConstIterator it( tree->modifiedProperties()->tqfind(propertyName) ); + TQMap<TQString, TQVariant>::ConstIterator it( tree->modifiedProperties()->find(propertyName) ); if (it != tree->modifiedProperties()->constEnd()) { blockSignals(true); if(meta && meta->isEnumType()) { @@ -485,7 +485,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert return; TQCString property = p.name(); - if (0==property.tqfind("this:")) + if (0==property.find("this:")) return; //starts with magical prefix: it's a "meta" prop. TQVariant value = p.value(); @@ -608,7 +608,7 @@ WidgetPropertySet::createPropertyCommandsInDesignMode(TQWidget* widget, // CommandGroup *group = new CommandGroup(commandName); for(TQMap<TQCString, TQVariant>::ConstIterator it = propValues.constBegin(); it != endIt; ++it) { - if (!d->set.tqcontains(it.key())) { + if (!d->set.contains(it.key())) { kdWarning() << "WidgetPropertySet::createPropertyCommandsInDesignMode(): \"" <<it.key()<<"\" property not found"<<endl; continue; } @@ -621,7 +621,7 @@ WidgetPropertySet::createPropertyCommandsInDesignMode(TQWidget* widget, else { WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>(widget); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : widget; - if (-1 != subwidget->tqmetaObject()->tqfindProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) { + if (-1 != subwidget->tqmetaObject()->findProperty(it.key(), true) && subwidget->property(it.key())!=it.data()) { ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(widget->name()); if (tree) tree->addModifiedProperty(it.key(), subwidget->property(it.key())); @@ -711,15 +711,15 @@ WidgetPropertySet::slotPropertyReset(KoProperty::Set& set, KoProperty::Property& // for(TQWidget *w = d->widgets.first(); w; w = d->widgets.next()) { foreach(TQGuardedWidgetList::ConstIterator, it, d->widgets) { ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup((*it)->name()); - if(tree->modifiedProperties()->tqcontains(property.name())) - (*it)->setProperty(property.name(), tree->modifiedProperties()->tqfind(property.name()).data()); + if(tree->modifiedProperties()->contains(property.name())) + (*it)->setProperty(property.name(), tree->modifiedProperties()->find(property.name()).data()); } } void WidgetPropertySet::slotWidgetDestroyed() { -// if(d->widgets.tqcontains(TQGuardedPtr<const TQWidget>( dynamic_cast<const TQWidget*>(sender()) ))) { +// if(d->widgets.contains(TQGuardedPtr<const TQWidget>( dynamic_cast<const TQWidget*>(sender()) ))) { //only clear this set if it contains the destroyed widget foreach(TQGuardedWidgetList::ConstIterator, it, d->widgets) { if (dynamic_cast<const TQWidget*>(sender()) == *it) { @@ -735,7 +735,7 @@ WidgetPropertySet::eventFilter(TQObject *o, TQEvent *ev) if(d->widgets.count() > 0 && o == d->widgets.first() && d->widgets.count() < 2) { if((ev->type() == TQEvent::Resize) || (ev->type() == TQEvent::Move)) { - if(!d->set.tqcontains("geometry")) + if(!d->set.contains("geometry")) return false; if(d->set["geometry"].value() == o->property("geometry")) // to avoid infinite recursion return false; @@ -785,15 +785,15 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid ObjectTreeItem *tree = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(widget->name()); bool isTopLevel = KFormDesigner::FormManager::self()->isTopLevel(widget); - if(possibleValues.tqfind("AlignHCenter")!=possibleValues.constEnd()) { + if(possibleValues.find("AlignHCenter")!=possibleValues.constEnd()) { // Create the horizontal tqalignment property - if(keys.tqfind("AlignHCenter")!=keys.constEnd() || keys.tqfind("AlignCenter")!=keys.constEnd()) + if(keys.find("AlignHCenter")!=keys.constEnd() || keys.find("AlignCenter")!=keys.constEnd()) value = "AlignHCenter"; - else if(keys.tqfind("AlignRight")!=keys.constEnd()) + else if(keys.find("AlignRight")!=keys.constEnd()) value = "AlignRight"; - else if(keys.tqfind("AlignLeft")!=keys.constEnd()) + else if(keys.find("AlignLeft")!=keys.constEnd()) value = "AlignLeft"; - else if(keys.tqfind("AlignJustify")!=keys.constEnd()) + else if(keys.find("AlignJustify")!=keys.constEnd()) value = "AlignJustify"; else value = "AlignAuto"; @@ -810,12 +810,12 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid list.clear(); } - if(possibleValues.tqfind("AlignTop")!=possibleValues.constEnd()) + if(possibleValues.find("AlignTop")!=possibleValues.constEnd()) { // Create the ver tqalignment property - if(keys.tqfind("AlignTop")!=keys.constEnd()) + if(keys.find("AlignTop")!=keys.constEnd()) value = "AlignTop"; - else if(keys.tqfind("AlignBottom")!=keys.constEnd()) + else if(keys.find("AlignBottom")!=keys.constEnd()) value = "AlignBottom"; else value = "AlignVCenter"; @@ -831,7 +831,7 @@ WidgetPropertySet::createAlignProperty(const TQMetaProperty *meta, TQWidget *wid updatePropertyValue(tree, "vAlign"); } - if(possibleValues.tqfind("WordBreak")!=possibleValues.constEnd() + if(possibleValues.find("WordBreak")!=possibleValues.constEnd() // && isPropertyVisible("wordbreak", false, subwidget->className()) // && !subWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) /* TQLineEdit doesn't support 'word break' is this generic enough?*/ ) { @@ -855,17 +855,17 @@ WidgetPropertySet::saveAlignProperty(const TQString &property) return; TQStrList list; - if( d->set.tqcontains("hAlign") ) + if( d->set.contains("hAlign") ) list.append( d->set["hAlign"].value().toCString() ); - if( d->set.tqcontains("vAlign") ) + if( d->set.contains("vAlign") ) list.append( d->set["vAlign"].value().toCString() ); - if( d->set.tqcontains("wordbreak") && d->set["wordbreak"].value().toBool() ) + if( d->set.contains("wordbreak") && d->set["wordbreak"].value().toBool() ) list.append("WordBreak"); WidgetWithSubpropertiesInterface* subpropIface = dynamic_cast<WidgetWithSubpropertiesInterface*>( (TQWidget*)d->widgets.first() ); TQWidget *subwidget = (subpropIface && subpropIface->subwidget()) ? subpropIface->subwidget() : (TQWidget*)d->widgets.first(); - int count = subwidget->tqmetaObject()->tqfindProperty("tqalignment", true); + int count = subwidget->tqmetaObject()->findProperty("tqalignment", true); const TQMetaProperty *meta = subwidget->tqmetaObject()->property(count, true); subwidget->setProperty("tqalignment", meta->keysToValue(list)); @@ -1106,14 +1106,14 @@ WidgetPropertySet::createValueList(WidgetInfo *winfo, const TQStringList &list) void WidgetPropertySet::addPropertyCaption(const TQCString &property, const TQString &caption) { - if(!d->propCaption.tqcontains(property)) + if(!d->propCaption.contains(property)) d->propCaption[property] = caption; } void WidgetPropertySet::addValueCaption(const TQCString &value, const TQString &caption) { - if(!d->propValCaption.tqcontains(value)) + if(!d->propValCaption.contains(value)) d->propValCaption[value] = caption; } diff --git a/kexi/formeditor/widgetpropertyset.h b/kexi/formeditor/widgetpropertyset.h index d330e4edf..cc403ef0f 100644 --- a/kexi/formeditor/widgetpropertyset.h +++ b/kexi/formeditor/widgetpropertyset.h @@ -53,7 +53,7 @@ class KFORMEDITOR_EXPORT WidgetPropertySet : public TQObject KoProperty::Property& property(const TQCString &name); - bool tqcontains(const TQCString &property); + bool contains(const TQCString &property); /*! i18n function used by factories to add new property caption. Should be called on Factory creation. */ diff --git a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp index 83904aa72..0bbb958c0 100644 --- a/kexi/formeditor/widgetwithsubpropertiesinterface.cpp +++ b/kexi/formeditor/widgetwithsubpropertiesinterface.cpp @@ -45,8 +45,8 @@ void WidgetWithSubpropertiesInterface::setSubwidget(TQWidget *widget) const int numProperties = tqmetaObject->numProperties(); for (int i = 0; i < numProperties; i++) { const char *propertyName = tqmetaObject->property( i )->name(); - if (dynamic_cast<TQObject*>(this)->tqmetaObject()->tqfindProperty( propertyName, true )==-1 - && !addedSubproperies.tqfind( propertyName ) ) + if (dynamic_cast<TQObject*>(this)->tqmetaObject()->findProperty( propertyName, true )==-1 + && !addedSubproperies.find( propertyName ) ) { m_subproperies.append( propertyName ); addedSubproperies.insert( propertyName, (char*)1 ); @@ -70,10 +70,10 @@ TQValueList<TQCString> WidgetWithSubpropertiesInterface::subproperies() const const TQMetaProperty *WidgetWithSubpropertiesInterface::findMetaSubproperty(const char * name) const { - if (!m_subwidget || m_subproperies.tqfind(name) == m_subproperies.constEnd()) { + if (!m_subwidget || m_subproperies.find(name) == m_subproperies.constEnd()) { return 0; } - const int index = m_subwidget->tqmetaObject()->tqfindProperty( name, true ); + const int index = m_subwidget->tqmetaObject()->findProperty( name, true ); if (index==-1) return 0; return m_subwidget->tqmetaObject()->property( index, true ); @@ -81,7 +81,7 @@ const TQMetaProperty *WidgetWithSubpropertiesInterface::findMetaSubproperty(cons TQVariant WidgetWithSubpropertiesInterface::subproperty( const char * name, bool &ok ) const { - if (!m_subwidget || m_subproperies.tqfind(name) == m_subproperies.constEnd()) { + if (!m_subwidget || m_subproperies.find(name) == m_subproperies.constEnd()) { ok = false; return TQVariant(); } @@ -91,7 +91,7 @@ TQVariant WidgetWithSubpropertiesInterface::subproperty( const char * name, bool bool WidgetWithSubpropertiesInterface::setSubproperty( const char * name, const TQVariant & value ) { - if (!m_subwidget || m_subproperies.tqfind(name) == m_subproperies.end()) { + if (!m_subwidget || m_subproperies.find(name) == m_subproperies.end()) { return false; } return m_subwidget->setProperty( name, value ); diff --git a/kexi/kexidb/alter.cpp b/kexi/kexidb/alter.cpp index 5a84424e1..5386d3d6d 100644 --- a/kexi/kexidb/alter.cpp +++ b/kexi/kexidb/alter.cpp @@ -316,7 +316,7 @@ void AlterTableHandler::ChangeFieldPropertyAction::simplifyActions(ActionDictDic // Case 1. special: name1 -> name2, i.e. rename action TQString newName( newValue().toString() ); // try to find rename(newName, otherName) action - ActionBase *renameActionLikeThis = actionsLikeThis ? actionsLikeThis->tqfind( "name" ) : 0; + ActionBase *renameActionLikeThis = actionsLikeThis ? actionsLikeThis->find( "name" ) : 0; if (dynamic_cast<ChangeFieldPropertyAction*>(renameActionLikeThis)) { // 1. instead of having rename(fieldName(), newValue()) action, // let's have rename(fieldName(), otherName) action @@ -334,7 +334,7 @@ void AlterTableHandler::ChangeFieldPropertyAction::simplifyActions(ActionDictDic adict->insert(m_propertyName.latin1(), newRenameAction);*/ } else { - ActionBase *removeActionForThisField = actionsLikeThis ? actionsLikeThis->tqfind( ":remove:" ) : 0; + ActionBase *removeActionForThisField = actionsLikeThis ? actionsLikeThis->find( ":remove:" ) : 0; if (removeActionForThisField) { //if this field is going to be removed, jsut change the action's field name // and do not add a new action @@ -362,7 +362,7 @@ void AlterTableHandler::ChangeFieldPropertyAction::simplifyActions(ActionDictDic } return; } - ActionBase *removeActionForThisField = actionsLikeThis ? actionsLikeThis->tqfind( ":remove:" ) : 0; + ActionBase *removeActionForThisField = actionsLikeThis ? actionsLikeThis->find( ":remove:" ) : 0; if (removeActionForThisField) { //if this field is going to be removed, do not add a new action return; @@ -372,7 +372,7 @@ void AlterTableHandler::ChangeFieldPropertyAction::simplifyActions(ActionDictDic // becomes: [ setCaption(A, "captionB") ] // because adding this action does nothing ActionDict *nextActionsLikeThis = fieldActions[ uid() ]; //fieldName().latin1() ]; - if (!nextActionsLikeThis || !nextActionsLikeThis->tqfind( m_propertyName.latin1() )) { + if (!nextActionsLikeThis || !nextActionsLikeThis->find( m_propertyName.latin1() )) { //no such action, add this AlterTableHandler::ChangeFieldPropertyAction* newAction = new AlterTableHandler::ChangeFieldPropertyAction( *this ); @@ -608,7 +608,7 @@ void AlterTableHandler::InsertFieldAction::simplifyActions(ActionDictDict &field // Try to find actions related to this action ActionDict *actionsForThisField = fieldActions[ uid() ]; //m_field->name().latin1() ]; - ActionBase *removeActionForThisField = actionsForThisField ? actionsForThisField->tqfind( ":remove:" ) : 0; + ActionBase *removeActionForThisField = actionsForThisField ? actionsForThisField->find( ":remove:" ) : 0; if (removeActionForThisField) { //if this field is going to be removed, do not add a new action //and remove the "Remove" action @@ -1070,7 +1070,7 @@ TableSchema* AlterTableHandler::execute(const TQString& tableName, ExecutionArgu oldTable = 0;*/ // Replace the old table with the new one (oldTable will be destroyed) - if (!d->conn->alterTableName(*newTable, oldTableName, true /*tqreplace*/)) { + if (!d->conn->alterTableName(*newTable, oldTableName, true /*replace*/)) { setError(d->conn); //! @todo delete newTable... args.result = false; diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp index 830dee292..4af6cae6d 100644 --- a/kexi/kexidb/connection.cpp +++ b/kexi/kexidb/connection.cpp @@ -361,7 +361,7 @@ bool Connection::drv_databaseExists( const TQString &dbName, bool ignoreErrors ) return false; } - if (list.tqfind( dbName )==list.end()) { + if (list.find( dbName )==list.end()) { if (!ignoreErrors) setError(ERR_OBJECT_NOT_FOUND, i18n("The database \"%1\" does not exist.").tqarg(dbName)); return false; @@ -1784,12 +1784,12 @@ tristate Connection::alterTable( TableSchema& tableSchema, TableSchema& newTable empty = true; #endif if (empty) { - ok = createTable(&newTableSchema, true/*tqreplace*/); + ok = createTable(&newTableSchema, true/*replace*/); } return ok; } -bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newName, bool tqreplace) +bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newName, bool replace) { clearError(); if (&tableSchema!=d->tables[tableSchema.id()]) { @@ -1813,7 +1813,7 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam TableSchema *tableToReplace = this->tableSchema( newName ); const bool destTableExists = tableToReplace != 0; const int origID = destTableExists ? tableToReplace->id() : -1; //will be reused in the new table - if (!tqreplace && destTableExists) { + if (!replace && destTableExists) { setError(ERR_OBJECT_EXISTS, i18n("Could not rename table \"%1\" to \"%2\". Table \"%3\" already exists.") .tqarg(tableSchema.name()).tqarg(newName).tqarg(newName)); @@ -1830,7 +1830,7 @@ bool Connection::alterTableName(TableSchema& tableSchema, const TQString& newNam // drop the table replaced (with schema) if (destTableExists) { - if (!tqreplace) { + if (!replace) { return false; } if (!dropTable( newName )) { @@ -3139,7 +3139,7 @@ inline void updateRowDataWithNewValues(QuerySchema &query, RowData& data, KexiDB columnsOrderExpanded = query.columnsOrder(QuerySchema::ExpandedList); TQMap<QueryColumnInfo*,int>::ConstIterator columnsOrderExpandedIt; for (KexiDB::RowEditBuffer::DBMap::ConstIterator it=b.constBegin();it!=b.constEnd();++it) { - columnsOrderExpandedIt = columnsOrderExpanded.tqfind( it.key() ); + columnsOrderExpandedIt = columnsOrderExpanded.find( it.key() ); if (columnsOrderExpandedIt == columnsOrderExpanded.constEnd()) { KexiDBWarn << "(Connection) updateRowDataWithNewValues(): \"now also assign new value in memory\" step " "- could not find item '" << it.key()->aliasOrName() << "'" << endl; @@ -3268,7 +3268,7 @@ bool Connection::insertRow(QuerySchema &query, RowData& data, RowEditBuffer& buf QueryColumnInfo *ci = fieldsExpanded.at(i); if (ci->field && KexiDB::isDefaultValueAllowed(ci->field) && !ci->field->defaultValue().isNull() - && !b.tqcontains( ci )) + && !b.contains( ci )) { KexiDBDbg << "Connection::insertRow(): adding default value '" << ci->field->defaultValue().toString() << "' for column '" << ci->field->name() << "'" << endl; @@ -3483,7 +3483,7 @@ void Connection::registerForTableSchemaChanges(TableSchemaChangeListenerInterfac d->tableSchemaChangeListeners.insert(&schema, listeners); } //TODO: inefficient - if (listeners->tqfindRef( &listener )==-1) + if (listeners->findRef( &listener )==-1) listeners->append( &listener ); } @@ -3502,7 +3502,7 @@ void Connection::unregisterForTablesSchemaChanges(TableSchemaChangeListenerInter for (TQPtrDictIterator< TQPtrList<TableSchemaChangeListenerInterface> > it(d->tableSchemaChangeListeners); it.current(); ++it) { - if (-1!=it.current()->tqfind(&listener)) + if (-1!=it.current()->find(&listener)) it.current()->take(); } } diff --git a/kexi/kexidb/connection.h b/kexi/kexidb/connection.h index 3d4eb82cb..b06df35b2 100644 --- a/kexi/kexidb/connection.h +++ b/kexi/kexidb/connection.h @@ -566,7 +566,7 @@ class KEXI_DB_EXPORT Connection : public TQObject, public KexiDB::Object -- false is returned and ERR_OBJECT_EXISTS error is set. The schema of \a tableSchema is updated on success. \return true on success. */ - bool alterTableName(TableSchema& tableSchema, const TQString& newName, bool tqreplace = false); + bool alterTableName(TableSchema& tableSchema, const TQString& newName, bool replace = false); /*! Drops a query defined by \a querySchema. If true is returned, schema information \a querySchema is destoyed @@ -894,7 +894,7 @@ class KEXI_DB_EXPORT Connection : public TQObject, public KexiDB::Object /*! For optional reimplemenation: asks server if database \a dbName exists. This method is used internally in databaseExists(). The default implementation - calls databaseNames and checks if that list tqcontains \a dbName. If you need to + calls databaseNames and checks if that list contains \a dbName. If you need to ask the server specifically if a database exists, eg. if you can't retrieve a list of all available database names, please reimplement this method and do all needed checks. diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp index d192fe87c..da77ab72c 100644 --- a/kexi/kexidb/driver.cpp +++ b/kexi/kexidb/driver.cpp @@ -237,7 +237,7 @@ bool Driver::isKexiDBSystemObjectName( const TQString& n ) if (!n.lower().startsWith("kexi__")) return false; const TQStringList list( Connection::kexiDBSystemTableNames() ); - return list.tqfind(n.lower())!=list.constEnd(); + return list.find(n.lower())!=list.constEnd(); } bool Driver::isSystemFieldName( const TQString& n ) const @@ -255,7 +255,7 @@ TQString Driver::valueToSQL( uint ftype, const TQVariant& v ) const case Field::Text: case Field::LongText: { TQString s = v.toString(); - return escapeString(s); //TQString("'")+s.tqreplace( '"', "\\\"" ) + "'"; + return escapeString(s); //TQString("'")+s.replace( '"', "\\\"" ) + "'"; } case Field::Byte: case Field::ShortInteger: @@ -267,7 +267,7 @@ TQString Driver::valueToSQL( uint ftype, const TQVariant& v ) const if (v.type()==TQVariant::String) { //workaround for values stored as string that should be casted to floating-point TQString s(v.toString()); - return s.tqreplace(',', "."); + return s.replace(',', "."); } return v.toString(); } @@ -333,21 +333,21 @@ TQCString Driver::escapeIdentifier(const TQCString& str, int options) const needOuterQuotes = true; // ... or if it's a keyword in Kexi's SQL dialect, - else if(d->kexiSQLDict->tqfind(str)) + else if(d->kexiSQLDict->find(str)) needOuterQuotes = true; // ... or if it's a keyword in the backends SQL dialect, // (have already checked !d->driverSQLDict) - else if((options & EscapeDriver) && d->driverSQLDict->tqfind(str)) + else if((options & EscapeDriver) && d->driverSQLDict->find(str)) needOuterQuotes = true; // ... or if the identifier has a space in it... - else if(str.tqfind(' ') != -1) + else if(str.find(' ') != -1) needOuterQuotes = true; if(needOuterQuotes && (options & EscapeKexi)) { const char quote = '"'; - return quote + TQCString(str).tqreplace( quote, "\"\"" ) + quote; + return quote + TQCString(str).replace( quote, "\"\"" ) + quote; } else if (needOuterQuotes) { const char quote = beh->TQUOTATION_MARKS_FOR_IDENTIFIER.latin1(); diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index 1afcbd648..0a7ff5742 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -115,7 +115,7 @@ bool DriverManagerInternal::lookupDrivers() << ptr->property("Name").toString() << "\" service!\n -- skipped!" << endl; continue; } - if (m_services_lcase.tqcontains(srv_name.lower())) { + if (m_services_lcase.contains(srv_name.lower())) { KexiDBWarn << "DriverManagerInternal::lookupDrivers(): more than one driver named '" << srv_name.lower() << "'\n -- skipping this one!" << endl; continue; @@ -160,7 +160,7 @@ bool DriverManagerInternal::lookupDrivers() //store association of this driver with all listed mime types for (TQStringList::ConstIterator mime_it = mimes.constBegin(); mime_it!=mimes.constEnd(); ++mime_it) { TQString mime( (*mime_it).lower() ); - if (!m_services_by_mimetype.tqcontains(mime)) { + if (!m_services_by_mimetype.contains(mime)) { m_services_by_mimetype.insert(mime, ptr); } else { @@ -198,16 +198,16 @@ Driver* DriverManagerInternal::driver(const TQString& name) clearError(); KexiDBDbg << "DriverManager::driver(): loading " << name << endl; - Driver *drv = name.isEmpty() ? 0 : m_drivers.tqfind(name.latin1()); + Driver *drv = name.isEmpty() ? 0 : m_drivers.find(name.latin1()); if (drv) return drv; //cached - if (!m_services_lcase.tqcontains(name.lower())) { + if (!m_services_lcase.contains(name.lower())) { setError(ERR_DRIVERMANAGER, i18n("Could not find database driver \"%1\".").tqarg(name) ); return 0; } - KService::Ptr ptr= *(m_services_lcase.tqfind(name.lower())); + KService::Ptr ptr= *(m_services_lcase.find(name.lower())); TQString srv_name = ptr->property("X-Kexi-DriverName").toString(); KexiDBDbg << "KexiDBInterfaceManager::load(): library: "<<ptr->library()<<endl; @@ -357,8 +357,8 @@ KService::Ptr DriverManager::serviceInfo(const TQString &name) } clearError(); - if (d_int->m_services_lcase.tqcontains(name.lower())) { - return *d_int->m_services_lcase.tqfind(name.lower()); + if (d_int->m_services_lcase.contains(name.lower())) { + return *d_int->m_services_lcase.find(name.lower()); } else { setError(ERR_DRIVERMANAGER, i18n("No such driver service: \"%1\".").tqarg(name) ); return KService::Ptr(); diff --git a/kexi/kexidb/drivers/mySQL/mySQL.pro b/kexi/kexidb/drivers/mySQL/mySQL.pro index 6c443be30..5f00a4137 100644 --- a/kexi/kexidb/drivers/mySQL/mySQL.pro +++ b/kexi/kexidb/drivers/mySQL/mySQL.pro @@ -2,11 +2,11 @@ include( ../common.pro ) INCLUDEPATH += $(MYSQL_INC) $(MYSQL_INC)/mysql -tqcontains(CONFIG,debug) { +contains(CONFIG,debug) { win32:LIBS += $(MYSQL_LIB)/debug/libmysql.lib win32:QMAKE_LFLAGS += /NODEFAULTLIB:LIBCMTD.LIB } -!tqcontains(CONFIG,debug) { +!contains(CONFIG,debug) { # win32:LIBS += $(MYSQL_LIB)/opt/mysqlclient.lib win32:LIBS += $(MYSQL_LIB)/opt/libmysql.lib # win32:QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRT.LIB diff --git a/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp b/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp index 50b94ae2a..4a82df509 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp @@ -154,7 +154,7 @@ bool MySqlConnectionInternal::executeSQL(const TQString& statement) { } TQString MySqlConnectionInternal::escapeIdentifier(const TQString& str) const { - return TQString(str).tqreplace('`', "'"); + return TQString(str).replace('`', "'"); } //-------------------------------------- diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp index 9a1213b0a..4d7db1602 100644 --- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp @@ -191,9 +191,9 @@ TQCString MySqlDriver::escapeString(const TQCString& str) const //! see http://dev.mysql.com/doc/refman/5.0/en/string-syntax.html return TQCString("'")+TQCString(str) - .tqreplace( '\\', "\\\\" ) - .tqreplace( '\'', "\\''" ) - .tqreplace( '"', "\\\"" ) + .replace( '\\', "\\\\" ) + .replace( '\'', "\\''" ) + .replace( '"', "\\\"" ) + TQCString("'"); } @@ -201,11 +201,11 @@ TQCString MySqlDriver::escapeString(const TQCString& str) const * the name with single quotes. */ TQString MySqlDriver::drv_escapeIdentifier( const TQString& str) const { - return TQString(str).tqreplace('`', "'"); + return TQString(str).replace('`', "'"); } TQCString MySqlDriver::drv_escapeIdentifier( const TQCString& str) const { - return TQCString(str).tqreplace('`', "'"); + return TQCString(str).replace('`', "'"); } #include "mysqldriver.moc" diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp index 3d9162ca5..ce66a6e8e 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp @@ -150,13 +150,13 @@ TQCString pqxxSqlDriver::escapeString( const TQCString& str) const //================================================================================== // TQString pqxxSqlDriver::drv_escapeIdentifier( const TQString& str) const { - return TQString(str).tqreplace( '"', "\"\"" ); + return TQString(str).replace( '"', "\"\"" ); } //================================================================================== // TQCString pqxxSqlDriver::drv_escapeIdentifier( const TQCString& str) const { - return TQCString(str).tqreplace( '"', "\"\"" ); + return TQCString(str).replace( '"', "\"\"" ); } //================================================================================== diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp index 27f190b8e..631f3bc6c 100644 --- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp +++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp @@ -366,14 +366,14 @@ bool SQLiteConnection::isReadOnly() const } #ifdef SQLITE2 -bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool tqreplace) +bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool replace) { const TQString oldTableName = tableSchema.name(); const bool destTableExists = this->tableSchema( newName ) != 0; //1. drop the table if (destTableExists) { - if (!tqreplace) + if (!replace) return false; if (!drv_dropTable( newName )) return false; diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.h b/kexi/kexidb/drivers/sqlite/sqliteconnection.h index 922e8447a..ab80675e4 100644 --- a/kexi/kexidb/drivers/sqlite/sqliteconnection.h +++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.h @@ -109,7 +109,7 @@ class SQLiteConnection : public Connection \return true on success. More advanced server backends implement this using "ALTER TABLE .. RENAME TO". */ - virtual bool drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool tqreplace = false); + virtual bool drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool replace = false); #endif //! for drv_changeFieldProperty() diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp index c5128b63f..80276682b 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp @@ -124,12 +124,12 @@ bool SQLiteDriver::drv_isSystemFieldName( const TQString& n ) const TQString SQLiteDriver::escapeString(const TQString& str) const { - return TQString("'")+TQString(str).tqreplace( '\'', "''" ) + "'"; + return TQString("'")+TQString(str).replace( '\'', "''" ) + "'"; } TQCString SQLiteDriver::escapeString(const TQCString& str) const { - return TQCString("'")+TQCString(str).tqreplace( '\'', "''" )+"'"; + return TQCString("'")+TQCString(str).replace( '\'', "''" )+"'"; } TQString SQLiteDriver::escapeBLOB(const TQByteArray& array) const @@ -139,12 +139,12 @@ TQString SQLiteDriver::escapeBLOB(const TQByteArray& array) const TQString SQLiteDriver::drv_escapeIdentifier( const TQString& str) const { - return TQString(str).tqreplace( '"', "\"\"" ); + return TQString(str).replace( '"', "\"\"" ); } TQCString SQLiteDriver::drv_escapeIdentifier( const TQCString& str) const { - return TQCString(str).tqreplace( '"', "\"\"" ); + return TQCString(str).replace( '"', "\"\"" ); } AdminTools* SQLiteDriver::drv_createAdminTools() const diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp index ffa45c9b7..35ab8d70e 100644 --- a/kexi/kexidb/expression.cpp +++ b/kexi/kexidb/expression.cpp @@ -692,7 +692,7 @@ bool VariableExpr::validate(ParseInfo& parseInfo) /* taken from parser's addColumn(): */ KexiDBDbg << "checking variable name: " << name << endl; - int dotPos = name.tqfind('.'); + int dotPos = name.find('.'); TQString tableName, fieldName; //TODO: shall we also support db name? if (dotPos>0) { @@ -910,5 +910,5 @@ bool FunctionExpr::validate(ParseInfo& parseInfo) bool FunctionExpr::isBuiltInAggregate(const TQCString& fname) { - return builtInAggregates().tqfind(fname.upper())!=FunctionExpr_builtIns.end(); + return builtInAggregates().find(fname.upper())!=FunctionExpr_builtIns.end(); } diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp index 97c4ae588..33e9e929a 100644 --- a/kexi/kexidb/field.cpp +++ b/kexi/kexidb/field.cpp @@ -197,7 +197,7 @@ TQString Field::typeGroupString(uint typeGroup) Field::Type Field::typeForString(const TQString& typeString) { m_typeNames.init(); - TQMap<TQString,Type>::ConstIterator it = m_typeNames.str2num.tqfind(typeString.lower()); + TQMap<TQString,Type>::ConstIterator it = m_typeNames.str2num.find(typeString.lower()); if (it==m_typeNames.str2num.end()) return InvalidType; return it.data(); @@ -206,7 +206,7 @@ Field::Type Field::typeForString(const TQString& typeString) Field::TypeGroup Field::typeGroupForString(const TQString& typeGroupString) { m_typeGroupNames.init(); - TQMap<TQString,TypeGroup>::ConstIterator it = m_typeGroupNames.str2num.tqfind(typeGroupString.lower()); + TQMap<TQString,TypeGroup>::ConstIterator it = m_typeGroupNames.str2num.find(typeGroupString.lower()); if (it==m_typeGroupNames.str2num.end()) return InvalidGroup; return it.data(); @@ -646,7 +646,7 @@ TQVariant Field::customProperty(const TQCString& propertyName, { if (!m_customProperties) return defaultValue; - CustomPropertiesMap::ConstIterator it(m_customProperties->tqfind(propertyName)); + CustomPropertiesMap::ConstIterator it(m_customProperties->find(propertyName)); if (it==m_customProperties->constEnd()) return defaultValue; return it.data(); diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h index f77dba2b4..439a5cc12 100644 --- a/kexi/kexidb/fieldlist.h +++ b/kexi/kexidb/fieldlist.h @@ -79,11 +79,11 @@ class KEXI_DB_EXPORT FieldList virtual Field* field(const TQString& name); /*! \return true if this list contains given \a field. */ - inline bool hasField(const Field* field) { return m_fields.tqfindRef(field)!=-1; } + inline bool hasField(const Field* field) { return m_fields.findRef(field)!=-1; } /*! \return first occurrence of \a field in the list or -1 if this list does not contain this field. */ - inline int indexOf(const Field* field) { return m_fields.tqfindRef(field); } + inline int indexOf(const Field* field) { return m_fields.findRef(field); } /*! \return list of field names for this list. */ TQStringList names() const; diff --git a/kexi/kexidb/indexschema.cpp b/kexi/kexidb/indexschema.cpp index 4775125b8..dc01ae0eb 100644 --- a/kexi/kexidb/indexschema.cpp +++ b/kexi/kexidb/indexschema.cpp @@ -172,18 +172,18 @@ void IndexSchema::attachRelationship(Relationship *rel, bool ownedByMaster) return; if (rel->masterIndex()==this) { if (ownedByMaster) { - if (m_master_owned_rels.tqfindRef(rel)==-1) { + if (m_master_owned_rels.findRef(rel)==-1) { m_master_owned_rels.append(rel); } } else {//not owned - if (m_master_rels.tqfindRef(rel)==-1) { + if (m_master_rels.findRef(rel)==-1) { m_master_rels.append(rel); } } } else if (rel->detailsIndex()==this) { - if (m_details_rels.tqfindRef(rel)==-1) { + if (m_details_rels.findRef(rel)==-1) { m_details_rels.append(rel); } } @@ -193,7 +193,7 @@ void IndexSchema::detachRelationship(Relationship *rel) { if (!rel) return; - m_master_owned_rels.take( m_master_owned_rels.tqfindRef(rel) ); //for sanity - m_master_rels.take( m_master_rels.tqfindRef(rel) ); //for sanity - m_details_rels.take( m_details_rels.tqfindRef(rel) ); //for sanity + m_master_owned_rels.take( m_master_owned_rels.findRef(rel) ); //for sanity + m_master_rels.take( m_master_rels.findRef(rel) ); //for sanity + m_details_rels.take( m_details_rels.findRef(rel) ); //for sanity } diff --git a/kexi/kexidb/parser/parser.cpp b/kexi/kexidb/parser/parser.cpp index eeb6e39dc..2a9a0e4cb 100644 --- a/kexi/kexidb/parser/parser.cpp +++ b/kexi/kexidb/parser/parser.cpp @@ -109,7 +109,7 @@ void Parser::init() bool Parser::isReservedKeyword(const char *str) { - return d->reservedKeywords.tqfind(str); + return d->reservedKeywords.find(str); } bool diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index f64696e8f..7ed1a47bb 100644 --- a/kexi/kexidb/parser/parser_p.cpp +++ b/kexi/kexidb/parser/parser_p.cpp @@ -202,7 +202,7 @@ bool parseData(Parser *p, const char *data) Field::ListIterator it = parser->select()->fieldsIterator(); for(Field *item; (item = it.current()); ++it) { - if(tableList.tqfindRef(item->table()) == -1) + if(tableList.findRef(item->table()) == -1) { ParserError err(i18n("Field List Error"), i18n("Unknown table '%1' in field list").tqarg(item->table()->name()), ctoken, current); parser->setError(err); @@ -263,7 +263,7 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr ) #if 0 KexiDBDbg << "found variable name: " << varName << endl; - int dotPos = varName.tqfind('.'); + int dotPos = varName.find('.'); TQString tableName, fieldName; //TODO: shall we also support db name? if (dotPos>0) { diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp index f4086b3b9..57e386ee4 100644 --- a/kexi/kexidb/parser/sqlparser.cpp +++ b/kexi/kexidb/parser/sqlparser.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that tqcontains +/* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof diff --git a/kexi/kexidb/parser/sqlparser.h b/kexi/kexidb/parser/sqlparser.h index 6895e29f9..6f2b65344 100644 --- a/kexi/kexidb/parser/sqlparser.h +++ b/kexi/kexidb/parser/sqlparser.h @@ -27,7 +27,7 @@ bool parseData(KexiDB::Parser *p, const char *data); Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that tqcontains +/* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp index 4fae1cf12..a82ca99a6 100644 --- a/kexi/kexidb/queryschema.cpp +++ b/kexi/kexidb/queryschema.cpp @@ -187,8 +187,8 @@ class QuerySchemaPrivate void setColumnAliasInternal(uint position, const TQCString& alias) { - columnAliases.tqreplace(position, new TQCString(alias)); - columnPositionsForAliases.tqreplace(alias, new int(position)); + columnAliases.replace(position, new TQCString(alias)); + columnPositionsForAliases.replace(alias, new int(position)); maxIndexWithAlias = TQMAX( maxIndexWithAlias, (int)position ); } @@ -245,7 +245,7 @@ class QuerySchemaPrivate for (Field::ListIterator it(query->fieldsIterator()); (f = it.current()); ++it, p++) { if (f->isExpression() && !columnAliases[p]) { //missing - for (;;) { //tqfind 1st unused + for (;;) { //find 1st unused colNum++; columnAlias = (i18n("short for 'expression' word (only latin letters, please)", "expr") + TQString::number(colNum)).latin1(); @@ -663,12 +663,12 @@ FieldList& QuerySchema::insertField(uint position, Field *field, d->asterisks.append(field); //if this is single-table asterisk, //add a table to list if doesn't exist there: - if (field->table() && (d->tables.tqfindRef(field->table())==-1)) + if (field->table() && (d->tables.findRef(field->table())==-1)) d->tables.append(field->table()); } else if (field->table()) { //add a table to list if doesn't exist there: - if (d->tables.tqfindRef(field->table())==-1) + if (d->tables.findRef(field->table())==-1) d->tables.append(field->table()); } // //visible by default @@ -918,7 +918,7 @@ void QuerySchema::addTable(TableSchema *table, const TQCString& alias) //only append table if: //-it has alias //-it has no alias but there is no such table on the list - if (alias.isEmpty() && d->tables.tqfindRef(table)!=-1) { + if (alias.isEmpty() && d->tables.findRef(table)!=-1) { const TQString& tableNameLower = table->name().lower(); const TQString& aliasLower = TQString(alias.lower()); int num = 0; @@ -960,9 +960,9 @@ TableSchema* QuerySchema::table(const TQString& tableName) const return 0; } -bool QuerySchema::tqcontains(TableSchema *table) const +bool QuerySchema::contains(TableSchema *table) const { - return d->tables.tqfindRef(table)!=-1; + return d->tables.findRef(table)!=-1; } Field* QuerySchema::findTableField(const TQString &tableOrTableAndFieldName) const @@ -1080,8 +1080,8 @@ void QuerySchema::setTableAlias(uint position, const TQCString& alias) // d->maxIndexWithTableAlias = -1; } else { - d->tableAliases.tqreplace(position, new TQCString(fixedAlias)); - d->tablePositionsForAliases.tqreplace(fixedAlias, new int(position)); + d->tableAliases.replace(position, new TQCString(fixedAlias)); + d->tablePositionsForAliases.replace(fixedAlias, new int(position)); // d->maxIndexWithTableAlias = TQMAX( d->maxIndexWithTableAlias, (int)index ); } } @@ -1164,7 +1164,7 @@ QueryColumnInfo::Vector QuerySchema::fieldsExpanded(FieldsExpandedOptions option uint uniqueListCount = 0; for (uint i=0; i<d->fieldsExpanded->count(); i++) { QueryColumnInfo *ci = (*d->fieldsExpanded)[i]; -// columnsAlreadyFoundIt = columnsAlreadyFound.tqfind(ci); +// columnsAlreadyFoundIt = columnsAlreadyFound.find(ci); // uint foundColumnIndex = -1; if (!columnsAlreadyFound[ci->aliasOrName()]) {// columnsAlreadyFoundIt==columnsAlreadyFound.constEnd()) columnsAlreadyFound.insert(ci->aliasOrName(), (char*)1); @@ -1412,7 +1412,7 @@ void QuerySchema::computeFieldsExpanded() if (!d->columnInfosByNameExpanded[ tableAndAlias ]) d->columnInfosByNameExpanded.insert( tableAndAlias, ci ); //the same for "unexpanded" list - if (columnInfosOutsideAsterisks.tqcontains(ci)) { + if (columnInfosOutsideAsterisks.contains(ci)) { if (!d->columnInfosByName[ ci->alias ]) d->columnInfosByName.insert( ci->alias, ci ); if (!d->columnInfosByName[ tableAndAlias ]) @@ -1429,7 +1429,7 @@ void QuerySchema::computeFieldsExpanded() if (!d->columnInfosByNameExpanded[ tableAndName ]) d->columnInfosByNameExpanded.insert( tableAndName, ci ); //the same for "unexpanded" list - if (columnInfosOutsideAsterisks.tqcontains(ci)) { + if (columnInfosOutsideAsterisks.contains(ci)) { if (!d->columnInfosByName[ ci->field->name() ]) d->columnInfosByName.insert( ci->field->name(), ci ); if (!d->columnInfosByName[ tableAndName ]) @@ -1453,7 +1453,7 @@ void QuerySchema::computeFieldsExpanded() lookup_list.removeRef( ci ); } else { - lookup_dict.tqreplace( key, new uint( i ) ); + lookup_dict.replace( key, new uint( i ) ); ++it; i++; } diff --git a/kexi/kexidb/queryschema.h b/kexi/kexidb/queryschema.h index 7c6821d16..6681ddd35 100644 --- a/kexi/kexidb/queryschema.h +++ b/kexi/kexidb/queryschema.h @@ -364,7 +364,7 @@ class KEXI_DB_EXPORT QuerySchema : public FieldList, public SchemaData TableSchema* table(const TQString& tableName) const; /*! \return true if the query uses \a table. */ - bool tqcontains(TableSchema *table) const; + bool contains(TableSchema *table) const; /*! Convenience function. \return table field by searching through all tables in this query. diff --git a/kexi/kexidb/relationship.cpp b/kexi/kexidb/relationship.cpp index bcb6ec898..a7796207b 100644 --- a/kexi/kexidb/relationship.cpp +++ b/kexi/kexidb/relationship.cpp @@ -80,7 +80,7 @@ void Relationship::createIndices( QuerySchema *query, Field *field1, Field *fiel return; } // if (!query->hasField(field1) && !query->hasField(field2)) { - if (!query->tqcontains(field1->table()) || !query->tqcontains(field2->table())) { + if (!query->contains(field1->table()) || !query->contains(field2->table())) { KexiDBWarn << "Relationship::addRelationship(): fields do not belong to this query" << endl; return; } diff --git a/kexi/kexidb/roweditbuffer.cpp b/kexi/kexidb/roweditbuffer.cpp index ba1bb7d58..40d2b04dd 100644 --- a/kexi/kexidb/roweditbuffer.cpp +++ b/kexi/kexidb/roweditbuffer.cpp @@ -50,7 +50,7 @@ const TQVariant* RowEditBuffer::at( QueryColumnInfo& ci, bool useDefaultValueIfP KexiDBWarn << "RowEditBuffer::at(QueryColumnInfo&): not db-aware buffer!" << endl; return 0; } - *m_dbBufferIt = m_dbBuffer->tqfind( &ci ); + *m_dbBufferIt = m_dbBuffer->find( &ci ); TQVariant* result = 0; if (*m_dbBufferIt!=m_dbBuffer->end()) result = &(*m_dbBufferIt).data(); @@ -74,7 +74,7 @@ const TQVariant* RowEditBuffer::at( Field& f ) const KexiDBWarn << "RowEditBuffer::at(Field&): this is db-aware buffer!" << endl; return 0; } - *m_simpleBufferIt = m_simpleBuffer->tqfind( f.name() ); + *m_simpleBufferIt = m_simpleBuffer->find( f.name() ); if (*m_simpleBufferIt==m_simpleBuffer->constEnd()) return 0; return &(*m_simpleBufferIt).data(); @@ -86,7 +86,7 @@ const TQVariant* RowEditBuffer::at( const TQString& fname ) const KexiDBWarn << "RowEditBuffer::at(Field&): this is db-aware buffer!" << endl; return 0; } - *m_simpleBufferIt = m_simpleBuffer->tqfind( fname ); + *m_simpleBufferIt = m_simpleBuffer->find( fname ); if (*m_simpleBufferIt==m_simpleBuffer->constEnd()) return 0; return &(*m_simpleBufferIt).data(); diff --git a/kexi/kexidb/roweditbuffer.h b/kexi/kexidb/roweditbuffer.h index 438e525eb..568d5dafb 100644 --- a/kexi/kexidb/roweditbuffer.h +++ b/kexi/kexidb/roweditbuffer.h @@ -113,7 +113,7 @@ public: //! Useful only for db-aware buffer: \return true if the value available as //! at( ci ) is obtained from column's default value inline bool hasDefaultValueAt( QueryColumnInfo& ci ) const { - return m_defaultValuesDbBuffer->tqcontains(&ci) && (*m_defaultValuesDbBuffer)[ &ci ]; + return m_defaultValuesDbBuffer->contains(&ci) && (*m_defaultValuesDbBuffer)[ &ci ]; } inline const SimpleMap simpleBuffer() { return *m_simpleBuffer; } diff --git a/kexi/kexidb/tableschema.cpp b/kexi/kexidb/tableschema.cpp index b794f2730..d78efa090 100644 --- a/kexi/kexidb/tableschema.cpp +++ b/kexi/kexidb/tableschema.cpp @@ -374,7 +374,7 @@ Field* TableSchema::anyNonPKField() if (!d->anyNonPKField) { Field *f; Field::ListIterator it(m_fields); - it.toLast(); //from the end (higher chances to tqfind) + it.toLast(); //from the end (higher chances to find) for (; (f = it.current()); --it) { if (!f->isPrimaryKey() && (!m_pkey || !m_pkey->hasField(f))) break; @@ -393,7 +393,7 @@ bool TableSchema::setLookupFieldSchema( const TQString& fieldName, LookupFieldSc return false; } if (lookupFieldSchema) - d->lookupFields.tqreplace( f, lookupFieldSchema ); + d->lookupFields.replace( f, lookupFieldSchema ); else { delete d->lookupFields[f]; d->lookupFields.remove( f ); @@ -426,7 +426,7 @@ const TQPtrVector<LookupFieldSchema>& TableSchema::lookupFieldsList() d->lookupFieldsList.resize( d->lookupFields.count() ); uint i = 0; for (Field::ListIterator it(m_fields); it.current(); ++it) { - TQMap<const Field*, LookupFieldSchema*>::ConstIterator itMap = d->lookupFields.tqfind( it.current() ); + TQMap<const Field*, LookupFieldSchema*>::ConstIterator itMap = d->lookupFields.find( it.current() ); if (itMap != d->lookupFields.constEnd()) { d->lookupFieldsList.insert( i, itMap.data() ); i++; diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index 36267b1fa..d3d1361c0 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -59,7 +59,7 @@ static void initList() const uint tg = KexiDB::Field::typeGroup( t ); TypeGroupList list; TQStringList name_list, str_list; - if (KexiDB_typeCache->tlist.tqfind( tg )!=KexiDB_typeCache->tlist.end()) { + if (KexiDB_typeCache->tlist.find( tg )!=KexiDB_typeCache->tlist.end()) { list = KexiDB_typeCache->tlist[ tg ]; name_list = KexiDB_typeCache->nlist[ tg ]; str_list = KexiDB_typeCache->slist[ tg ]; @@ -584,7 +584,7 @@ bool KexiDB::splitToTableAndFieldParts(const TQString& string, TQString& tableName, TQString& fieldName, SplitToTableAndFieldPartsOptions option) { - const int id = string.tqfind('.'); + const int id = string.find('.'); if (option & SetFieldNameIfNoTableName && id==-1) { tableName = TQString(); fieldName = string; @@ -613,7 +613,7 @@ TQString KexiDB::formatNumberForVisibleDecimalPlaces(double value, int decimalPl i--; if (s[i]=='.') //remove '.' i--; - s = s.left(i+1).tqreplace('.', KGlobal::locale()->decimalSymbol()); + s = s.left(i+1).replace('.', KGlobal::locale()->decimalSymbol()); return s; } if (decimalPlaces == 0) @@ -671,13 +671,13 @@ bool KexiDB::isBuiltinTableFieldProperty( const TQCString& propertyName ) //! @todo always update this when new builtins appear! #undef ADD } - return KexiDB_builtinFieldProperties->tqfind( propertyName ); + return KexiDB_builtinFieldProperties->find( propertyName ); } bool KexiDB::setFieldProperties( Field& field, const TQMap<TQCString, TQVariant>& values ) { TQMapConstIterator<TQCString, TQVariant> it; - if ( (it = values.tqfind("type")) != values.constEnd() ) { + if ( (it = values.find("type")) != values.constEnd() ) { if (!setIntToFieldType(field, *it)) return false; } @@ -690,50 +690,50 @@ bool KexiDB::setFieldProperties( Field& field, const TQMap<TQCString, TQVariant> uint constraints = field.constraints(); bool ok = true; - if ( (it = values.tqfind("primaryKey")) != values.constEnd() ) + if ( (it = values.find("primaryKey")) != values.constEnd() ) SET_BOOLEAN_FLAG(PrimaryKey, (*it).toBool()); - if ( (it = values.tqfind("indexed")) != values.constEnd() ) + if ( (it = values.find("indexed")) != values.constEnd() ) SET_BOOLEAN_FLAG(Indexed, (*it).toBool()); - if ( (it = values.tqfind("autoIncrement")) != values.constEnd() + if ( (it = values.find("autoIncrement")) != values.constEnd() && KexiDB::Field::isAutoIncrementAllowed(field.type()) ) SET_BOOLEAN_FLAG(AutoInc, (*it).toBool()); - if ( (it = values.tqfind("unique")) != values.constEnd() ) + if ( (it = values.find("unique")) != values.constEnd() ) SET_BOOLEAN_FLAG(Unique, (*it).toBool()); - if ( (it = values.tqfind("notNull")) != values.constEnd() ) + if ( (it = values.find("notNull")) != values.constEnd() ) SET_BOOLEAN_FLAG(NotNull, (*it).toBool()); - if ( (it = values.tqfind("allowEmpty")) != values.constEnd() ) + if ( (it = values.find("allowEmpty")) != values.constEnd() ) SET_BOOLEAN_FLAG(NotEmpty, !(*it).toBool()); field.setConstraints( constraints ); uint options = 0; - if ( (it = values.tqfind("unsigned")) != values.constEnd()) { + if ( (it = values.find("unsigned")) != values.constEnd()) { options |= KexiDB::Field::Unsigned; if (!(*it).toBool()) options ^= KexiDB::Field::Unsigned; } field.setOptions( options ); - if ( (it = values.tqfind("name")) != values.constEnd()) + if ( (it = values.find("name")) != values.constEnd()) field.setName( (*it).toString() ); - if ( (it = values.tqfind("caption")) != values.constEnd()) + if ( (it = values.find("caption")) != values.constEnd()) field.setCaption( (*it).toString() ); - if ( (it = values.tqfind("description")) != values.constEnd()) + if ( (it = values.find("description")) != values.constEnd()) field.setDescription( (*it).toString() ); - if ( (it = values.tqfind("length")) != values.constEnd()) + if ( (it = values.find("length")) != values.constEnd()) field.setLength( (*it).isNull() ? 0/*default*/ : (*it).toUInt(&ok) ); if (!ok) return false; - if ( (it = values.tqfind("precision")) != values.constEnd()) + if ( (it = values.find("precision")) != values.constEnd()) field.setPrecision( (*it).isNull() ? 0/*default*/ : (*it).toUInt(&ok) ); if (!ok) return false; - if ( (it = values.tqfind("defaultValue")) != values.constEnd()) + if ( (it = values.find("defaultValue")) != values.constEnd()) field.setDefaultValue( *it ); - if ( (it = values.tqfind("width")) != values.constEnd()) + if ( (it = values.find("width")) != values.constEnd()) field.setWidth( (*it).isNull() ? 0/*default*/ : (*it).toUInt(&ok) ); if (!ok) return false; - if ( (it = values.tqfind("visibleDecimalPlaces")) != values.constEnd() + if ( (it = values.find("visibleDecimalPlaces")) != values.constEnd() && KexiDB::supportsVisibleDecimalPlacesProperty(field.type()) ) field.setVisibleDecimalPlaces( (*it).isNull() ? -1/*default*/ : (*it).toInt(&ok) ); if (!ok) @@ -773,7 +773,7 @@ bool KexiDB::isExtendedTableFieldProperty( const TQCString& propertyName ) ADD("displayWidget"); #undef ADD } - return KexiDB_extendedProperties->tqfind( propertyName ); + return KexiDB_extendedProperties->find( propertyName ); } bool KexiDB::setFieldProperty( Field& field, const TQCString& propertyName, const TQVariant& value ) @@ -924,7 +924,7 @@ TQVariant KexiDB::loadPropertyValueFromDom( const TQDomNode& node ) return TQCString(text.latin1()); } else if (valueType == "number") { // integer or double - if (text.tqfind('.')!=-1) { + if (text.find('.')!=-1) { double val = text.toDouble(&ok); if (ok) return val; diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp index e09df22a6..46e62b7b3 100644 --- a/kexi/kexiutils/identifier.cpp +++ b/kexi/kexiutils/identifier.cpp @@ -37,9 +37,9 @@ bool KexiUtils::isIdentifier(const TQString& s) TQString KexiUtils::string2FileName(const TQString &s) { TQString fn( s.simplifyWhiteSpace() ); - fn.tqreplace(' ',"_"); fn.tqreplace('$',"_"); - fn.tqreplace('\\',"-"); fn.tqreplace('/',"-"); - fn.tqreplace(':',"-"); fn.tqreplace('*',"-"); + fn.replace(' ',"_"); fn.replace('$',"_"); + fn.replace('\\',"-"); fn.replace('/',"-"); + fn.replace(':',"-"); fn.replace('*',"-"); return fn; } @@ -59,7 +59,7 @@ TQString KexiUtils::string2Identifier(const TQString &s) if (id.isEmpty()) return TQString(); r.reserve(id.length()); - id.tqreplace(' ',"_"); + id.replace(' ',"_"); TQChar c = id[0]; TQString add; bool wasUnderscore = false; diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp index 6b3e26dc6..7a1ab0f7a 100644 --- a/kexi/kexiutils/utils.cpp +++ b/kexi/kexiutils/utils.cpp @@ -237,7 +237,7 @@ TQMap<TQString,TQString> KexiUtils::deserializeMap(const TQString& string) TQString KexiUtils::stringToFileName(const TQString& string) { TQString _string(string); - _string.tqreplace(TQRegExp("[\\\\/:\\*?\"<>|]"), " "); + _string.replace(TQRegExp("[\\\\/:\\*?\"<>|]"), " "); return _string.simplifyWhiteSpace(); } diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index d74749589..6f451aefe 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -110,11 +110,11 @@ KexiFindDialog::~KexiFindDialog() } void KexiFindDialog::setActions( KAction *findnext, KAction *findprev, - KAction *tqreplace, KAction *replaceall ) + KAction *replace, KAction *replaceall ) { d->findnextAction = findnext; d->findprevAction = findprev; - d->replaceAction = tqreplace; + d->replaceAction = replace; d->replaceallAction = replaceall; d->accels.clear(); d->setActionAndAccel(d->findnextAction, this, TQT_SIGNAL(findNext())); @@ -172,7 +172,7 @@ void KexiFindDialog::setCurrentLookInColumnName(const TQString& columnName) else if (columnName == "(field)") index = 1; else { - index = d->lookInColumnNames.tqfindIndex( columnName ); + index = d->lookInColumnNames.findIndex( columnName ); if (index == -1) { kdWarning() << TQString("KexiFindDialog::setCurrentLookInColumn(%1) column name not found on the list") .tqarg(columnName) << endl; diff --git a/kexi/main/kexifinddialog.h b/kexi/main/kexifinddialog.h index 9d0bf088c..4cf55e537 100644 --- a/kexi/main/kexifinddialog.h +++ b/kexi/main/kexifinddialog.h @@ -42,7 +42,7 @@ class KexiFindDialog : public KexiFindDialogBase //! Sets actions that receive button clicks and shortcuts within the dialog. Should be called once. void setActions( KAction *findnext, KAction *findprev, - KAction *tqreplace, KAction *replaceall ); + KAction *replace, KAction *replaceall ); //! Shows the dialog as a modal dialog. virtual void show(); @@ -86,14 +86,14 @@ class KexiFindDialog : public KexiFindDialogBase void setCurrentLookInColumnName(const TQString& columnName); /*! Sets or clears replace mode. - For replace mode 'prompt or tqreplace' option is visible. */ + For replace mode 'prompt or replace' option is visible. */ void setReplaceMode(bool set); /*! Sets object name for caption, so for example it will be set to i18n("Find \"Persons\"")). */ void setObjectNameForCaption(const TQString& name); - /*! Enables of disables the tqfind/tqreplace/replace all buttons. + /*! Enables of disables the find/replace/replace all buttons. This is used if for the current context the dialog could not be used. If \a enable is false, object name for caption is cleared using setObjectNameForCaption() too. */ diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui index 6eea74536..8ffc254d3 100644 --- a/kexi/main/kexifinddialogbase.ui +++ b/kexi/main/kexifinddialogbase.ui @@ -82,7 +82,7 @@ <enum>WheelFocus</enum> </property> <property name="text"> - <string>Prompt on tqreplace</string> + <string>Prompt on replace</string> </property> <property name="checked"> <bool>true</bool> diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 795ddd537..a14ebfbb9 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -693,21 +693,21 @@ void KexiMainWindowImpl::initActions() d->action_edit_redo->setWhatsThis(i18n("Reverts the most recent undo action.")); #if 0 //old - d->action_edit_tqfind = createSharedAction( KStdAction::Find, "edit_tqfind"); + d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); d->action_edit_findnext = createSharedAction( KStdAction::FindNext, "edit_findnext"); d->action_edit_findprev = createSharedAction( KStdAction::FindPrev, "edit_findprevious"); -//! @todo d->action_edit_paste = createSharedAction( KStdAction::Replace, "edit_tqreplace"); +//! @todo d->action_edit_paste = createSharedAction( KStdAction::Replace, "edit_replace"); #endif - d->action_edit_tqfind = KStdAction::find( - TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), actionCollection(), "edit_tqfind" ); -// d->action_edit_tqfind = createSharedAction( KStdAction::Find, "edit_tqfind"); + d->action_edit_find = KStdAction::find( + TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), actionCollection(), "edit_find" ); +// d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find"); d->action_edit_findnext = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext"); d->action_edit_findprev = KStdAction::findPrev( TQT_TQOBJECT(this), TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious"); - d->action_edit_tqreplace = 0; -//! @todo d->action_edit_tqreplace = KStdAction::tqreplace( + d->action_edit_replace = 0; +//! @todo d->action_edit_replace = KStdAction::replace( //! TQT_TQOBJECT(this), TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); d->action_edit_replace_all = 0; //! @todo d->action_edit_replace_all = new KAction( i18n("Replace All"), "", 0, @@ -1005,7 +1005,7 @@ void KexiMainWindowImpl::initActions() acat->addAction("edit_edititem", Kexi::PartItemActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType); - acat->addAction("edit_tqfind", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, + acat->addAction("edit_find", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); acat->addAction("edit_findnext", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, @@ -1014,7 +1014,7 @@ void KexiMainWindowImpl::initActions() acat->addAction("edit_findprevious", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); - acat->addAction("edit_tqreplace", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, + acat->addAction("edit_replace", Kexi::GlobalActionCategory|Kexi::WindowActionCategory, KexiPart::TableObjectType, KexiPart::QueryObjectType, KexiPart::FormObjectType); acat->addAction("edit_paste_special_data_table", Kexi::GlobalActionCategory); @@ -2323,7 +2323,7 @@ void KexiMainWindowImpl::updateCustomPropertyPanelTabs( curDialogPart->setupCustomPropertyPanelTabs(d->propEditorTabWidget, this); //restore current page number for this part - if (d->recentlySelectedPropertyPanelPages.tqcontains( curDialogPart )) { + if (d->recentlySelectedPropertyPanelPages.contains( curDialogPart )) { d->propEditorTabWidget->setCurrentPage( d->recentlySelectedPropertyPanelPages[ curDialogPart ] ); @@ -3297,7 +3297,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar d->removeDialog(dlg_id); //don't remove -KMDI will do that //also remove from 'print setup dialogs' cache, if needed int printedObjectID = 0; - if (d->pageSetupDialogItemID2dataItemID_map.tqcontains(dlg_id)) + if (d->pageSetupDialogItemID2dataItemID_map.contains(dlg_id)) printedObjectID = d->pageSetupDialogItemID2dataItemID_map[ dlg_id ]; d->pageSetupDialogs.take(printedObjectID); @@ -3798,7 +3798,7 @@ tristate KexiMainWindowImpl::removeObject( KexiPart::Item *item, bool dontAsk ) //also close 'print setup' dialog for this item, if any tristate res; // int printedObjectID = 0; -// if (d->pageSetupDialogItemID2dataItemID_map.tqcontains(item->identifier())) +// if (d->pageSetupDialogItemID2dataItemID_map.contains(item->identifier())) // printedObjectID = d->pageSetupDialogItemID2dataItemID_map[ item->identifier() ]; KexiDialogBase * pageSetupDlg = d->pageSetupDialogs[ item->identifier() ]; const bool oldInsideCloseDialog = d->insideCloseDialog; @@ -4245,7 +4245,7 @@ tristate KexiMainWindowImpl::showProjectMigrationWizard( TQString destinationDatabaseName( args["destinationDatabaseName"] ); TQString fileName, destinationConnectionShortcut, dbName; if (!destinationDatabaseName.isEmpty()) { - if (args.tqcontains("destinationConnectionShortcut")) { + if (args.contains("destinationConnectionShortcut")) { // server-based destinationConnectionShortcut = args["destinationConnectionShortcut"]; } @@ -4542,7 +4542,7 @@ void KexiMainWindowImpl::slotEditFind(bool next) KexiSearchAndReplaceViewInterface* iface = d->currentViewSupportingSearchAndReplaceInterface(); if (!iface) return; - tristate res = iface->tqfind( + tristate res = iface->find( d->findDialog()->valueToFind(), d->findDialog()->options(), next); if (~res) return; diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index cf5f44c26..974f51c77 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -105,7 +105,7 @@ public: KexiDialogBase *openedDialogFor( int identifier, PendingJobType &pendingType ) { //todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); - TQMap<int, PendingJobType>::ConstIterator it = pendingDialogs.tqfind( identifier ); + TQMap<int, PendingJobType>::ConstIterator it = pendingDialogs.find( identifier ); if (it==pendingDialogs.constEnd()) pendingType = NoJob; else @@ -140,7 +140,7 @@ public: #ifndef KEXI_NO_PENDING_DIALOGS void addItemToPendingDialogs(const KexiPart::Item* item, PendingJobType jobType) { //todo(threads) TQMutexLocker dialogsLocker( &dialogsMutex ); - pendingDialogs.tqreplace( item->identifier(), jobType ); + pendingDialogs.replace( item->identifier(), jobType ); } bool pendingDialogsExist() { @@ -322,7 +322,7 @@ void updatePropEditorDockWidthInfo() { return 0; } TQString key( TQString::number(item->identifier()) + name ); - return dynamic_cast<type*>( m_openedCustomObjectsForItem.tqfind( key.latin1() ) ); + return dynamic_cast<type*>( m_openedCustomObjectsForItem.find( key.latin1() ) ); } void addOpenedCustomObjectForItem(KexiPart::Item* item, TQObject* object, const char* name) @@ -335,16 +335,16 @@ void updatePropEditorDockWidthInfo() { if (!m_findDialog) { m_findDialog = new KexiFindDialog(wnd); m_findDialog->setActions( action_edit_findnext, action_edit_findprev, - action_edit_tqreplace, action_edit_replace_all ); + action_edit_replace, action_edit_replace_all ); /* connect(m_findDialog, TQT_SIGNAL(findNext()), action_edit_findnext, TQT_SLOT(activate())); - connect(m_findDialog, TQT_SIGNAL(tqfind()), wnd, TQT_SLOT(slotEditFindNext())); - connect(m_findDialog, TQT_SIGNAL(tqreplace()), wnd, TQT_SLOT(slotEditReplaceNext())); + connect(m_findDialog, TQT_SIGNAL(find()), wnd, TQT_SLOT(slotEditFindNext())); + connect(m_findDialog, TQT_SIGNAL(replace()), wnd, TQT_SLOT(slotEditReplaceNext())); connect(m_findDialog, TQT_SIGNAL(replaceAll()), wnd, TQT_SLOT(slotEditReplaceAll()));*/ } return m_findDialog; } - /*! Updates the tqfind/replace dialog depending on the active view. + /*! Updates the find/replace dialog depending on the active view. Nothing is performed if the dialog is not instantiated yet or is invisible. */ void updateFindDialogContents(bool createIfDoesNotExist = false) { if (!createIfDoesNotExist && (!m_findDialog || !m_findDialog->isVisible())) @@ -461,8 +461,8 @@ void updatePropEditorDockWidthInfo() { //! edit menu KAction *action_edit_delete, *action_edit_delete_row, *action_edit_cut, *action_edit_copy, *action_edit_paste, - *action_edit_tqfind, *action_edit_findnext, *action_edit_findprev, - *action_edit_tqreplace, *action_edit_replace_all, + *action_edit_find, *action_edit_findnext, *action_edit_findprev, + *action_edit_replace, *action_edit_replace_all, *action_edit_select_all, *action_edit_undo, *action_edit_redo, *action_edit_insert_empty_row, diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index 54d977e4c..13becfc8b 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -231,7 +231,7 @@ bool KexiStartupHandler::getAutoopenObjects(KCmdLineArgs *args, const TQCString if (stripQuotes(item, obj_name)) { type_name = defaultType; } - else if ((idx = item.tqfind(':'))!=-1) { + else if ((idx = item.find(':'))!=-1) { //option with type name specified: type_name = item.left(idx).lower(); obj_name = item.mid(idx+1); diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 667c52888..ed4dcd407 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -142,21 +142,21 @@ void KexiStartupFileDialog::updateFilters() if (normalOpeningMode || normalSavingMode) { mime = KMimeType::mimeType( KexiDB::Driver::defaultFileBasedDriverMimeType() ); - if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } } if (normalOpeningMode || m_mode & SavingServerBasedDB) { mime = KMimeType::mimeType("application/x-kexiproject-shortcut"); - if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } } if (normalOpeningMode || m_mode & SavingServerBasedDB) { mime = KMimeType::mimeType("application/x-kexi-connectiondata"); - if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } @@ -165,7 +165,7 @@ void KexiStartupFileDialog::updateFilters() //! @todo hardcoded for MSA: if (normalOpeningMode) { mime = KMimeType::mimeType("application/x-msaccess"); - if (mime && m_excludedMimeTypes.tqfind(mime->name())==m_excludedMimeTypes.end()) { + if (mime && m_excludedMimeTypes.find(mime->name())==m_excludedMimeTypes.end()) { filter += KexiUtils::fileDialogFilterString(mime); allfilters += mime->patterns(); } @@ -174,14 +174,14 @@ void KexiStartupFileDialog::updateFilters() foreach (TQStringList::ConstIterator, it, m_additionalMimeTypes) { if (*it == "all/allfiles") continue; - if (m_excludedMimeTypes.tqfind(*it)!=m_excludedMimeTypes.end()) + if (m_excludedMimeTypes.find(*it)!=m_excludedMimeTypes.end()) continue; filter += KexiUtils::fileDialogFilterString(*it); mime = KMimeType::mimeType(*it); allfilters += mime->patterns(); } - if (m_excludedMimeTypes.tqfind("all/allfiles")==m_excludedMimeTypes.end()) + if (m_excludedMimeTypes.find("all/allfiles")==m_excludedMimeTypes.end()) filter += KexiUtils::fileDialogFilterString("all/allfiles"); // mime = KMimeType::mimeType("all/allfiles"); // if (mime) { diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index a51cd0c4e..e716a607a 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -60,7 +60,7 @@ KexiStartupFileDialogBase::KexiStartupFileDialogBase( init(_dirName, filter, tqparent); - //tqfind "OK" button + //find "OK" button TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "OK", false ); m_okBtn = dynamic_cast<TQPushButton*>(l->first()); delete l; @@ -403,17 +403,17 @@ TQString KexiStartupFileDialogBase::currentFilter() const //TQt format: "some text (*.first *.second)" or "All (*)" //KDE format: "*.first *.second" or "*" TQString f = selectedFilter(); - if (f.tqfind('(')!=-1) - f = f.mid(f.tqfind('(')+1); - if (f.mid(f.tqfind(')')!=-1)) - f = f.left(f.tqfind(')')); + if (f.find('(')!=-1) + f = f.mid(f.find('(')+1); + if (f.mid(f.find(')')!=-1)) + f = f.left(f.find(')')); return f; } void KexiStartupFileDialogBase::setFilter(const TQString& filter) { d->kde_filters = filter; - int pos = d->kde_filters.tqfind('/'); + int pos = d->kde_filters.find('/'); // Check for an un-escaped '/', if found // interpret as a MIME filter. diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index bf20fbfb5..b97b6fcf4 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -130,7 +130,7 @@ void ImportWizard::parseArguments() if (!(*m_args)["databaseName"].isEmpty() && !(*m_args)["mimeType"].isEmpty()) { m_predefinedDatabaseName = (*m_args)["databaseName"]; m_predefinedMimeType = (*m_args)["mimeType"]; - if (m_args->tqcontains("connectionData")) { + if (m_args->contains("connectionData")) { m_predefinedConnectionData = new KexiDB::ConnectionData(); KexiDB::fromMap( KexiUtils::deserializeMap((*m_args)["connectionData"]), *m_predefinedConnectionData @@ -429,13 +429,13 @@ void ImportWizard::arriveSrcConnPage() m_setupFileBasedSrcNeeded = false; TQStringList additionalMimeTypes; /* moved - if (m_srcTypeCombo->currentText().tqcontains("Access")) { + if (m_srcTypeCombo->currentText().contains("Access")) { //! @todo tmp: hardcoded! additionalMimeTypes << "application/x-msaccess"; }*/ m_srcConn->m_fileDlg->setMode(KexiStartupFileDialog::Opening); m_srcConn->m_fileDlg->setAdditionalFilters(additionalMimeTypes); -/*moved if (m_srcTypeCombo->currentText().tqcontains("Access")) { +/*moved if (m_srcTypeCombo->currentText().contains("Access")) { //! @todo tmp: hardcoded! #ifdef TQ_WS_WIN m_srcConn->m_fileDlg->setSelectedFilter("*.mdb"); @@ -639,7 +639,7 @@ void ImportWizard::accept() // cancelButton()->setEnabled(true); */ if (m_args) { - if ((!fileBasedDstSelected() && !m_args->tqcontains("destinationConnectionShortcut")) + if ((!fileBasedDstSelected() && !m_args->contains("destinationConnectionShortcut")) || !m_openImportedProjectCheckBox->isChecked()) { //do not open dest db if used didn't want it @@ -803,7 +803,7 @@ tristate ImportWizard::import() { if (!m_sourceDBEncoding.isEmpty()) { sourceDriver->setPropertyValue( "source_database_nontqunicode_encoding", - TQVariant(m_sourceDBEncoding.upper().tqreplace(' ',"")) // "CP1250", not "cp 1250" + TQVariant(m_sourceDBEncoding.upper().replace(' ',"")) // "CP1250", not "cp 1250" ); } diff --git a/kexi/migration/keximigrate.cpp b/kexi/migration/keximigrate.cpp index 989a002a9..fc11d0cd1 100644 --- a/kexi/migration/keximigrate.cpp +++ b/kexi/migration/keximigrate.cpp @@ -168,7 +168,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) result->settqStatus(&drvManager); return false; } - const bool kexi__objects_exists = tables.tqfind("kexi__objects")!=tables.end(); + const bool kexi__objects_exists = tables.find("kexi__objects")!=tables.end(); TQStringList kexiDBTables; if (kexi__objects_exists) { tristate res = drv_queryStringListFromSQL( @@ -344,13 +344,13 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) if (m_migrateData->keepData) { //! @todo check detailed "copy forms/blobs/tables" flags here when we add them // Copy data for "kexi__objectdata" as well, if available in the source db - if (tables.tqfind("kexi__objectdata")!=tables.end()) + if (tables.find("kexi__objectdata")!=tables.end()) m_tableSchemas.append(destConn->tableSchema("kexi__objectdata")); // Copy data for "kexi__blobs" as well, if available in the source db - if (tables.tqfind("kexi__blobs")!=tables.end()) + if (tables.find("kexi__blobs")!=tables.end()) m_tableSchemas.append(destConn->tableSchema("kexi__blobs")); // Copy data for "kexi__fields" as well, if available in the source db - if (tables.tqfind("kexi__fields")!=tables.end()) + if (tables.find("kexi__fields")!=tables.end()) m_tableSchemas.append(destConn->tableSchema("kexi__fields")); } @@ -371,7 +371,7 @@ bool KexiMigrate::performImport(Kexi::ObjecttqStatus* result) } kdDebug() << "Copying data for table: " << tname << endl; TQString originalTableName; - if (kexiDBTables.tqfind(tname)==kexiDBTables.end()) + if (kexiDBTables.find(tname)==kexiDBTables.end()) //caption is equal to the original name originalTableName = ts.current()->caption().isEmpty() ? tname : ts.current()->caption(); else diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 8cd26c3c4..2c0ce6cdb 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -112,7 +112,7 @@ bool MigrateManagerInternal::lookupDrivers() << ptr->property("Name").toString() << "\" service!\n -- skipped!" << endl; continue; } - if (m_services_lcase.tqcontains(srv_name.lower())) { + if (m_services_lcase.contains(srv_name.lower())) { continue; } @@ -152,7 +152,7 @@ bool MigrateManagerInternal::lookupDrivers() TQString drvType = ptr->property("X-Kexi-MigrationDriverType").toString().lower(); if (drvType=="file") { if (!mime.isEmpty()) { - if (!m_services_by_mimetype.tqcontains(mime)) { + if (!m_services_by_mimetype.contains(mime)) { m_services_by_mimetype.insert(mime, ptr); } else { @@ -183,16 +183,16 @@ KexiMigrate* MigrateManagerInternal::driver(const TQString& name) clearError(); KexiDBDbg << "MigrationrManagerInternal::migrationDriver(): loading " << name << endl; - KexiMigrate *drv = name.isEmpty() ? 0 : m_drivers.tqfind(name.latin1()); + KexiMigrate *drv = name.isEmpty() ? 0 : m_drivers.find(name.latin1()); if (drv) return drv; //cached - if (!m_services_lcase.tqcontains(name.lower())) { + if (!m_services_lcase.contains(name.lower())) { setError(ERR_DRIVERMANAGER, i18n("Could not find import/export database driver \"%1\".").tqarg(name) ); return 0; } - KService::Ptr ptr= *(m_services_lcase.tqfind(name.lower())); + KService::Ptr ptr= *(m_services_lcase.find(name.lower())); TQString srv_name = ptr->property("X-Kexi-MigrationDriverName").toString(); KexiDBDbg << "MigrateManagerInternal::driver(): library: "<<ptr->library()<<endl; diff --git a/kexi/migration/mysql/mysqlmigrate.cpp b/kexi/migration/mysql/mysqlmigrate.cpp index 9b69350be..1ea152c66 100644 --- a/kexi/migration/mysql/mysqlmigrate.cpp +++ b/kexi/migration/mysql/mysqlmigrate.cpp @@ -417,10 +417,10 @@ KexiDB::Field::Type MySQLMigrate::examineBlobField(const TQString& table, kdDebug() << "MySQLMigrate::examineBlobField: considering " << mysqlType << endl; - if(mysqlType.tqcontains("blob", false) != 0) { + if(mysqlType.contains("blob", false) != 0) { // Doesn't matter how big it is, it's binary kexiType = KexiDB::Field::BLOB; - } else if(mysqlType.tqcontains("text", false) != 0) { + } else if(mysqlType.contains("text", false) != 0) { // All the TEXT types are too big for Kexi text. kexiType = KexiDB::Field::BLOB; } else if(fld->length < 200) { diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index 31ab61d03..9318bb5eb 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -142,7 +142,7 @@ void KActionsListViewBase::init() if (!isActionVisible((*it)->name(), actionCategories)) continue; ActionSelectorDialogListItem *pitem = new ActionSelectorDialogListItem((*it)->name(), - this, (*it)->toolTip().isEmpty() ? (*it)->text().tqreplace("&", "") : (*it)->toolTip() ); + this, (*it)->toolTip().isEmpty() ? (*it)->text().replace("&", "") : (*it)->toolTip() ); pitem->fifoSorting = false; //alpha sort pitem->setPixmap( 0, (*it)->iconSet( KIcon::Small, 16 ).pixmap( TQIconSet::Small, TQIconSet::Active ) ); if (!pitem->pixmap(0) || pitem->pixmap(0)->isNull()) @@ -278,7 +278,7 @@ class ActionToExecuteListView : public ActionsListViewBase printItem->setPixmap(0, SmallIcon("fileprint")); KAction *a = KStdAction::printPreview(0, 0, 0); item = new ActionSelectorDialogListItem("printPreview", printItem, - a->text().tqreplace("&", "").tqreplace("...", "")); + a->text().replace("&", "").replace("...", "")); item->setPixmap(0, SmallIcon(a->icon())); delete a; item = new ActionSelectorDialogListItem("pageSetup", printItem, i18n("Show Page Setup")); diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp index 3e1e5c4b0..7e5b9b857 100644 --- a/kexi/plugins/forms/kexidataprovider.cpp +++ b/kexi/plugins/forms/kexidataprovider.cpp @@ -81,7 +81,7 @@ void KexiFormDataProvider::setMainDataSourceWidget(TQWidget* mainWidget) kexipluginsdbg << obj->name() << endl; m_dataItems.append( formDataItem ); formDataItem->installListener( this ); - tmpSources.tqreplace( dataSource, (char*)1 ); + tmpSources.replace( dataSource, (char*)1 ); } delete l; //now we've got a set (unique list) of field names in tmpSources @@ -145,7 +145,7 @@ void KexiFormDataProvider::fillDuplicatedDataItems( if (!it.current()->columnInfo() || !it.current()->columnInfo()->field) continue; kdDebug() << " ** " << it.current()->columnInfo()->field->name() << endl; - it_dup = tmpDuplicatedItems.tqfind( it.current()->columnInfo()->field ); + it_dup = tmpDuplicatedItems.find( it.current()->columnInfo()->field ); uint count; if (it_dup==tmpDuplicatedItems.end()) count = 0; @@ -162,7 +162,7 @@ void KexiFormDataProvider::fillDuplicatedDataItems( } } } - if (item->columnInfo() && m_duplicatedItems->tqfind( item->columnInfo()->field )) { + if (item->columnInfo() && m_duplicatedItems->find( item->columnInfo()->field )) { for (TQPtrListIterator<KexiFormDataItemInterface> it(m_dataItems); it.current(); ++it) { if (it.current()!=item && item->columnInfo()->field == it.current()->columnInfo()->field) { kexipluginsdbg << "- setting a copy of value for item '" @@ -248,7 +248,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou const int newIndex = newIndices.at( it.data(), &ok ); if (ok && newIndex!=-1) { kexipluginsdbg << "invalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl; - newFieldNumbersForDataItems.tqreplace(it.key(), newIndex); + newFieldNumbersForDataItems.replace(it.key(), newIndex); } else { kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl; @@ -304,7 +304,7 @@ void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSou } } } - tmpUsedDataSources.tqreplace( item->dataSource().lower(), (char*)1 ); + tmpUsedDataSources.replace( item->dataSource().lower(), (char*)1 ); ++it; } m_disableFillDuplicatedDataItems = false; diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index ce11e7d98..74f9af05a 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -357,26 +357,26 @@ void KexiDataSourcePage::setDataSource(const TQCString& mimeType, const TQCStrin void KexiDataSourcePage::assignPropertySet(KoProperty::Set* propertySet) { TQCString objectName; - if (propertySet && propertySet->tqcontains("name")) + if (propertySet && propertySet->contains("name")) objectName = (*propertySet)["name"].value().toCString(); if (!objectName.isEmpty() && objectName == m_currentObjectName) return; //the same object m_currentObjectName = objectName; TQCString objectClassName; - if (propertySet && propertySet->tqcontains("this:className")) + if (propertySet && propertySet->contains("this:className")) objectClassName = (*propertySet)["this:className"].value().toCString(); /*moved if (propertySet) { TQCString iconName; TQString objectClassString; - if (propertySet->tqcontains("this:iconName")) + if (propertySet->contains("this:iconName")) iconName = (*propertySet)["this:iconName"].value().toCString(); - if (propertySet->tqcontains("this:classString")) + if (propertySet->contains("this:classString")) objectClassString = (*propertySet)["this:classString"].value().toString(); m_objectInfoLabel->setObjectName(objectName); m_objectInfoLabel->setObjectClassIcon(iconName); m_objectInfoLabel->setObjectClassName(objectClassString); - if (propertySet->tqcontains("this:className")) + if (propertySet->contains("this:className")) objectClassName = (*propertySet)["this:className"].value().toCString(); }*/ KexiPropertyEditorView::updateInfoLabelForPropertySet( @@ -396,7 +396,7 @@ void KexiDataSourcePage::assignPropertySet(KoProperty::Set* propertySet) // else { const bool multipleSelection = objectClassName=="special:multiple"; - const bool hasDataSourceProperty = propertySet && propertySet->tqcontains("dataSource") && !multipleSelection; + const bool hasDataSourceProperty = propertySet && propertySet->contains("dataSource") && !multipleSelection; if (!isForm) { //this is a widget diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index de2d85701..cd6f5ac31 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -46,7 +46,7 @@ bool KexiFormEventAction::ActionData::isEmpty() const KexiPart::Info* KexiFormEventAction::ActionData::decodeString( TQString& actionType, TQString& actionArg, bool& ok) const { - const int idx = string.tqfind(':'); + const int idx = string.find(':'); ok = false; if (idx==-1) return 0; diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp index ce9b142bd..3c76e7d9d 100644 --- a/kexi/plugins/forms/kexiformmanager.cpp +++ b/kexi/plugins/forms/kexiformmanager.cpp @@ -120,10 +120,10 @@ void KexiFormManager::setFormDataSource(const TQCString& mime, const TQCString& if (activeForm()->selectedWidget() == formWidget) { //active form is selected: just use properties system KFormDesigner::WidgetPropertySet *set = propertySet(); - if (!set || !set->tqcontains("dataSource")) + if (!set || !set->contains("dataSource")) return; (*set)["dataSource"].setValue(name); - if (set->tqcontains("dataSourceMimeType")) + if (set->contains("dataSourceMimeType")) (*set)["dataSourceMimeType"].setValue(mime); return; } @@ -159,19 +159,19 @@ void KexiFormManager::setDataSourceFieldOrExpression(const TQString& string, con // return; KFormDesigner::WidgetPropertySet *set = propertySet(); - if (!set || !set->tqcontains("dataSource")) + if (!set || !set->contains("dataSource")) return; (*set)["dataSource"].setValue(string); - if (set->tqcontains("autoCaption") && (*set)["autoCaption"].value().toBool()) { - if (set->tqcontains("fieldCaptionInternal")) + if (set->contains("autoCaption") && (*set)["autoCaption"].value().toBool()) { + if (set->contains("fieldCaptionInternal")) (*set)["fieldCaptionInternal"].setValue(caption); } if (//type!=KexiDB::Field::InvalidType && - set->tqcontains("widgetType") && (*set)["widgetType"].value().toString()=="Auto") + set->contains("widgetType") && (*set)["widgetType"].value().toString()=="Auto") { - if (set->tqcontains("fieldTypeInternal")) + if (set->contains("fieldTypeInternal")) (*set)["fieldTypeInternal"].setValue(type); } diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 3f1d3466f..e03a07791 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -466,7 +466,7 @@ KexiFormPart::slotPropertyChanged(TQWidget *w, const TQCString &name, const TQVa } if (KFormDesigner::FormManager::self()->activeForm()->widget() && name == "geometry") { //fall back to sizeInternal property.... - if (KFormDesigner::FormManager::self()->propertySet()->tqcontains("sizeInternal")) + if (KFormDesigner::FormManager::self()->propertySet()->contains("sizeInternal")) KFormDesigner::FormManager::self()->propertySet()->property("sizeInternal").setValue(TQSize(value.toRect().size())); } } diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index 057e0a33a..5996061ff 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -394,7 +394,7 @@ int KexiFormScrollView::columns() const KexiFormDataItemInterface *item = dynamic_cast<KexiFormDataItemInterface*>(dbFormWidget()->orderedDataAwareWidgets()->at( col )); if (!item) return -1; - KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.tqfind( item )); + KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.find( item )); return it!=m_fieldNumbersForDataItems.constEnd() ? it.data() : -1; }*/ @@ -421,7 +421,7 @@ bool KexiFormScrollView::columnEditable(int col) if (!item || item->isReadOnly()) return false; -// KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.tqfind( item )); +// KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.find( item )); // return KexiDataAwareObjectInterface::columnEditable( it!=m_fieldNumbersForDataItems.constEnd() ? it.data() : -1 ); return KexiDataAwareObjectInterface::columnEditable( col ); } diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h index cf2731d13..61c13a8f7 100644 --- a/kexi/plugins/forms/kexiformscrollview.h +++ b/kexi/plugins/forms/kexiformscrollview.h @@ -79,7 +79,7 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView : dbFormWidget()->orderedDataAwareWidgets()->at( col )); if (!item) return -1; - KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.tqfind( item )); + KexiFormDataItemInterfaceToIntMap::ConstIterator it(m_fieldNumbersForDataItems.find( item )); return it!=m_fieldNumbersForDataItems.constEnd() ? (int)it.data() : -1; } diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp index 3f30fff29..3b12588cc 100644 --- a/kexi/plugins/forms/kexiformview.cpp +++ b/kexi/plugins/forms/kexiformview.cpp @@ -345,7 +345,7 @@ void KexiFormView::updateValuesForSubproperties() kexipluginsdbg << "KexiFormView::loadForm(): delayed setting of the subproperty: widget=" << it.current()->widget()->name() << " prop=" << subpropIt.key() << " val=" << subpropIt.data() << endl; - const int count = subwidget->tqmetaObject()->tqfindProperty(subpropIt.key().latin1(), true); + const int count = subwidget->tqmetaObject()->findProperty(subpropIt.key().latin1(), true); const TQMetaProperty *meta = count!=-1 ? subwidget->tqmetaObject()->property(count, true) : 0; if (meta) { // Special case: the property value of type enum (set) but is saved as a string list, @@ -371,7 +371,7 @@ void KexiFormView::updateValuesForSubproperties() static void setUnsavedBLOBIdsForDataViewMode( TQWidget* widget, const TQMap<TQCString, KexiBLOBBuffer::Id_t>& unsavedLocalBLOBsByName) { - if (-1 != widget->tqmetaObject()->tqfindProperty("pixmapId")) { + if (-1 != widget->tqmetaObject()->findProperty("pixmapId")) { const KexiBLOBBuffer::Id_t blobID = unsavedLocalBLOBsByName[ widget->name() ]; if (blobID > 0) widget->setProperty("pixmapId", (uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by TQVariant - will be fixed in TQt4*/)blobID); @@ -783,7 +783,7 @@ KexiFormView::storeData(bool dontAsk) TQString originalFileName(h.originalFileName()); TQFileInfo fi(originalFileName); - TQString caption(fi.baseName().tqreplace('_', " ").simplifyWhiteSpace()); + TQString caption(fi.baseName().replace('_', " ").simplifyWhiteSpace()); if (st) { *st /* << NO, (pgsql doesn't support this):TQVariant()*/ /*id*/ @@ -1044,9 +1044,9 @@ KexiFormView::updateDataSourcePage() if (viewMode()==Kexi::DesignViewMode) { TQCString dataSourceMimeType, dataSource; KFormDesigner::WidgetPropertySet *set = KFormDesigner::FormManager::self()->propertySet(); - if (set->tqcontains("dataSourceMimeType")) + if (set->contains("dataSourceMimeType")) dataSourceMimeType = (*set)["dataSourceMimeType"].value().toCString(); - if (set->tqcontains("dataSource")) + if (set->contains("dataSource")) dataSource = (*set)["dataSource"].value().toCString(); formPart()->dataSourcePage()->setDataSource(dataSourceMimeType, dataSource); @@ -1149,7 +1149,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s group->addCommand(insertCmd, false/*don't exec twice*/); KFormDesigner::ObjectTreeItem *newWidgetItem - = form()->objectTree()->dict()->tqfind(insertCmd->widgetName()); + = form()->objectTree()->dict()->find(insertCmd->widgetName()); KexiDBAutoField* newWidget = newWidgetItem ? dynamic_cast<KexiDBAutoField*>(newWidgetItem->widget()) : 0; widgetsToSelect.append(newWidget); diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index f977a9629..f194908f7 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -211,7 +211,7 @@ void KexiDBComboBox::createEditor() void KexiDBComboBox::setLabelPosition(LabelPosition position) { if(m_subwidget) { - if (-1 != m_subwidget->tqmetaObject()->tqfindProperty("frameShape", true)) + if (-1 != m_subwidget->tqmetaObject()->findProperty("frameShape", true)) m_subwidget->setProperty("frameShape", TQVariant((int)TQFrame::NoFrame)); m_subwidget->setGeometry( editorGeometry() ); } @@ -247,7 +247,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) return; }*/ - if ( /*count() &&*/ ( !isEditable() || buttonGeometry().tqcontains( e->pos() ) ) ) { + if ( /*count() &&*/ ( !isEditable() || buttonGeometry().contains( e->pos() ) ) ) { d->buttonPressed = false; /* if ( d->usingListBox() ) { @@ -256,7 +256,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) listBox()->setCurrentItem(d->current); listBox()->blockSignals( FALSE ); popup(); - if ( arrowRect.tqcontains( e->pos() ) ) { + if ( arrowRect.contains( e->pos() ) ) { d->arrowPressed = TRUE; d->arrowDown = TRUE; tqrepaint( FALSE ); @@ -339,7 +339,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e ) } else if (e->type()==TQEvent::Enter) { if (!d->isEditable - || /*over button if editable combo*/buttonGeometry().tqcontains( TQT_TQMOUSEEVENT(e)->pos() )) + || /*over button if editable combo*/buttonGeometry().contains( TQT_TQMOUSEEVENT(e)->pos() )) { d->mouseOver = true; update(); @@ -347,7 +347,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e ) } else if (e->type()==TQEvent::MouseMove) { if (d->isEditable) { - const bool overButton = buttonGeometry().tqcontains( TQT_TQMOUSEEVENT(e)->pos() ); + const bool overButton = buttonGeometry().contains( TQT_TQMOUSEEVENT(e)->pos() ); if (overButton != d->mouseOver) { d->mouseOver = overButton; update(); @@ -370,7 +370,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e ) } } } - else if (!d->isEditable && d->subWidgetsWithDisabledEvents && d->subWidgetsWithDisabledEvents->tqfind(o)) { + else if (!d->isEditable && d->subWidgetsWithDisabledEvents && d->subWidgetsWithDisabledEvents->find(o)) { if (e->type()==TQEvent::MouseButtonPress) { // clicking the subwidget should mean the same as clicking the combo box (i.e. show the popup) if (handleMousePressEvent(TQT_TQMOUSEEVENT(e))) diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index cca955e5c..c2a705c08 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -66,7 +66,7 @@ class KexiDBForm::Private int indexOfDataItem( KexiDataItemInterface* item ) const { TQMapConstIterator<KexiDataItemInterface*, uint> indicesForDataAwareWidgetsIt( - indicesForDataAwareWidgets.tqfind(item)); + indicesForDataAwareWidgets.find(item)); if (indicesForDataAwareWidgetsIt == indicesForDataAwareWidgets.constEnd()) return -1; kexipluginsdbg << "KexiDBForm: column # for item: " @@ -342,7 +342,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) // /*! @todo d->indicesForDataAwareWidgets SHOULDNT BE UPDATED HERE BECAUSE // THERE CAN BE ALSO NON-TABSTOP DATA WIDGETS! // */ - d->indicesForDataAwareWidgets.tqreplace( + d->indicesForDataAwareWidgets.replace( dataItem, numberOfDataAwareWidgets ); numberOfDataAwareWidgets++; diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp index af539e3de..8226d3c47 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.cpp +++ b/kexi/plugins/forms/widgets/kexidblabel.cpp @@ -482,7 +482,7 @@ void KexiDBLabel::paintEvent( TQPaintEvent* e ) the shadow has to be drawn using an offset relative to the widgets border. */ - if ( !d->pixmapDirty && e->rect().tqcontains( d->shadowPosition ) && !d->shadowPixmap.isNull()) { + if ( !d->pixmapDirty && e->rect().contains( d->shadowPosition ) && !d->shadowPixmap.isNull()) { TQRect clipRect = TQRect( TQMAX( e->rect().x() - d->shadowPosition.x(), 0 ), TQMAX( e->rect().y() - d->shadowPosition.y(), 0 ), diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp index 6fcd851a0..283631c39 100644 --- a/kexi/plugins/forms/widgets/kexidbsubform.cpp +++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp @@ -79,7 +79,7 @@ KexiDBSubForm::setFormName(const TQString &name) TQStringList list; while(pw) { if(pw->isA("KexiDBSubForm")) { - if(list.tqcontains(pw->name())) { + if(list.contains(pw->name())) { //! @todo error message return; // Be sure to don't run into a endless-loop cause of recursive subforms. } diff --git a/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp b/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp index 4112bf528..7037b29a2 100644 --- a/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp +++ b/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp @@ -76,7 +76,7 @@ bool KexiCSVImportExportPart::executeCommand(KexiMainWindow* mainWin, const char KexiDB::TableOrQuerySchema tableOrQuery( mainWin->project()->dbConnection(), options.itemId); TQTextStream *stream = 0; - if (args->tqcontains("textStream")) + if (args->contains("textStream")) stream = KexiUtils::stringToPtr<TQTextStream>( (*args)["textStream"] ); return KexiCSVExport::exportData(tableOrQuery, options, -1, stream); } diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index 5af3d8edb..f33476768 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -55,12 +55,12 @@ bool Options::assign( TQMap<TQString,TQString>& args ) mode = (args["destinationType"]=="file") ? KexiCSVExport::File : KexiCSVExport::Clipboard; - if (args.tqcontains("delimiter")) + if (args.contains("delimiter")) delimiter = args["delimiter"]; else delimiter = (mode==File) ? KEXICSV_DEFAULT_FILE_DELIMITER : KEXICSV_DEFAULT_CLIPBOARD_DELIMITER; - if (args.tqcontains("textQuote")) + if (args.contains("textQuote")) textQuote = args["textQuote"]; else textQuote = (mode==File) ? KEXICSV_DEFAULT_FILE_TEXT_TQUOTE : KEXICSV_DEFAULT_CLIPBOARD_TEXT_TQUOTE; @@ -69,9 +69,9 @@ bool Options::assign( TQMap<TQString,TQString>& args ) itemId = args["itemId"].toInt(&ok); if (!ok || itemId<=0) return false; - if (args.tqcontains("forceDelimiter")) + if (args.contains("forceDelimiter")) forceDelimiter = args["forceDelimiter"]; - if (args.tqcontains("addColumnNames")) + if (args.contains("addColumnNames")) addColumnNames = (args["addColumnNames"]=="1"); return true; } @@ -193,7 +193,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, if (i>0) APPEND( delimiter ); if (hasTextQuote){ - APPEND( textQuote + fields[i]->captionOrAliasOrName().tqreplace(textQuote, escapedTextQuote) + textQuote ); + APPEND( textQuote + fields[i]->captionOrAliasOrName().replace(textQuote, escapedTextQuote) + textQuote ); } else { APPEND( fields[i]->captionOrAliasOrName() ); @@ -218,7 +218,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, continue; if (isText[real_i]) { if (hasTextQuote) - APPEND( textQuote + TQString(cursor->value(real_i).toString()).tqreplace(textQuote, escapedTextQuote) + textQuote ); + APPEND( textQuote + TQString(cursor->value(real_i).toString()).replace(textQuote, escapedTextQuote) + textQuote ); else APPEND( cursor->value(real_i).toString() ); } diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 931eab730..956681b1c 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -378,9 +378,9 @@ static TQString convertKey(const char *key, KexiCSVExport::Mode mode) { TQString _key(TQString::tqfromLatin1(key)); if (mode == KexiCSVExport::Clipboard) { - _key.tqreplace("Exporting", "Copying"); - _key.tqreplace("Export", "Copy"); - _key.tqreplace("CSVFiles", "CSVToClipboard"); + _key.replace("Exporting", "Copying"); + _key.replace("Export", "Copy"); + _key.replace("CSVFiles", "CSVToClipboard"); } return _key; } diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 3060db2a7..016012306 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -1104,7 +1104,7 @@ void KexiCSVImportDialog::setText(int row, int col, const TQString& text, bool i //! @todo what about time and float/double types and different integer subtypes? } else if (detectedType==_FP_NUMBER_TYPE) { - //tqreplace ',' with '.' + //replace ',' with '.' TQCString t(text.latin1()); const int textLen = t.length(); for (int i=0; i<textLen; i++) { @@ -1348,7 +1348,7 @@ void KexiCSVImportDialog::accept() suggestedName = KURL::fromPathOrURL(m_fname).fileName(); //remove extension if (!suggestedName.isEmpty()) { - const int idx = suggestedName.tqfindRev("."); + const int idx = suggestedName.findRev("."); if (idx!=-1) suggestedName = suggestedName.mid(0, idx ).simplifyWhiteSpace(); } @@ -1414,9 +1414,9 @@ void KexiCSVImportDialog::accept() for (uint col = 0; col < numCols; col++) colnames.append( m_table->text(0, col).lower().simplifyWhiteSpace() ); - if (colnames.tqfind(fieldName)!=colnames.end()) { + if (colnames.find(fieldName)!=colnames.end()) { int num = 1; - while (colnames.tqfind(fieldName+TQString::number(num))!=colnames.end()) + while (colnames.find(fieldName+TQString::number(num))!=colnames.end()) num++; fieldName += TQString::number(num); fieldCaption += TQString::number(num); diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp index fff0eaf5b..d2eb1df16 100644 --- a/kexi/plugins/macros/kexiactions/datatableaction.cpp +++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp @@ -93,7 +93,7 @@ namespace KexiMacro { //this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) ); } const TQString n = - namelist.tqcontains(partitem) + namelist.contains(partitem) ? partitem : namelist.count() > 0 ? namelist[0] : ""; this->setVariant(n); diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h index e9ffa9497..419e2b00d 100644 --- a/kexi/plugins/macros/kexiactions/objectnamevariable.h +++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h @@ -63,7 +63,7 @@ namespace KexiMacro { for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); - this->setVariant( (name.isNull() || ! namelist.tqcontains(name)) ? namelist[0] : name ); + this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name ); kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" tqchildren="<<namelist<<endl; } diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp index 2e43116f3..9cd2e6641 100644 --- a/kexi/plugins/macros/kexiactions/openaction.cpp +++ b/kexi/plugins/macros/kexiactions/openaction.cpp @@ -66,7 +66,7 @@ namespace KexiMacro { this->tqchildren().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); } const TQString n = - namelist.tqcontains(viewname) + namelist.contains(viewname) ? viewname : namelist.count() > 0 ? namelist[0] : ""; diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp index 4d480365a..efce73c02 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp @@ -264,7 +264,7 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, TQV Q_UNUSED(result); kdDebug() << "KexiMacroDesignView::beforeCellChanged() colnum=" << colnum << " newvalue=" << newvalue.toString() << endl; - int rowindex = d->tabledata->tqfindRef(item); + int rowindex = d->tabledata->findRef(item); if(rowindex < 0) { kdWarning() << "KexiMacroDesignView::beforeCellChanged() No such item" << endl; return; @@ -311,7 +311,7 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, TQV void KexiMacroDesignView::rowUpdated(KexiTableItem* item) { - int rowindex = d->tabledata->tqfindRef(item); + int rowindex = d->tabledata->findRef(item); kdDebug() << "KexiMacroDesignView::rowUpdated() rowindex=" << rowindex << endl; //propertySetSwitched(); //propertySetReloaded(true); @@ -452,7 +452,7 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop continue; } - if(! set.tqcontains( (*it).latin1() )) { + if(! set.contains( (*it).latin1() )) { // If there exist no such property yet, we need to add it. if(updateSet(&set, macroitem, *it)) reload = true; // we like to reload the whole set diff --git a/kexi/plugins/macros/lib/action.cpp b/kexi/plugins/macros/lib/action.cpp index db5596b42..45c03d125 100644 --- a/kexi/plugins/macros/lib/action.cpp +++ b/kexi/plugins/macros/lib/action.cpp @@ -124,12 +124,12 @@ void Action::setComment(const TQString& comment) bool Action::hasVariable(const TQString& name) const { - return d->varmap.tqcontains(name); + return d->varmap.contains(name); } KSharedPtr<Variable> Action::variable(const TQString& name) const { - return d->varmap.tqcontains(name) ? d->varmap[name] : KSharedPtr<Variable>(0); + return d->varmap.contains(name) ? d->varmap[name] : KSharedPtr<Variable>(0); } Variable::Map Action::variables() const @@ -145,10 +145,10 @@ TQStringList Action::variableNames() const void Action::setVariable(KSharedPtr<Variable> variable) { const TQString name = variable->name(); - if(! d->varmap.tqcontains(name)) { + if(! d->varmap.contains(name)) { d->varnames.append(name); } - d->varmap.tqreplace(name, variable); + d->varmap.replace(name, variable); } void Action::setVariable(const TQString& name, const TQString& text, const TQVariant& variant) @@ -161,7 +161,7 @@ void Action::setVariable(const TQString& name, const TQString& text, const TQVar void Action::removeVariable(const TQString& name) { - if(d->varmap.tqcontains(name)) { + if(d->varmap.contains(name)) { d->varmap.remove(name); d->varnames.remove(name); } diff --git a/kexi/plugins/macros/lib/context.cpp b/kexi/plugins/macros/lib/context.cpp index 6e2fb2e48..7c0b6ee87 100644 --- a/kexi/plugins/macros/lib/context.cpp +++ b/kexi/plugins/macros/lib/context.cpp @@ -100,14 +100,14 @@ Context::~Context() bool Context::hasVariable(const TQString& name) const { //Use TQMap?s contains to check if a variable with name exists - return d->variables.tqcontains(name); + return d->variables.contains(name); } //return variable with name or throw an exception if none is found in variables KSharedPtr<Variable> Context::variable(const TQString& name) const { //Use TQMap?s contains to check if a variable with name exists in context - if (d->variables.tqcontains(name)) { + if (d->variables.contains(name)) { //return it return d->variables[name]; } @@ -134,7 +134,7 @@ void Context::setVariable(const TQString& name, KSharedPtr<Variable> variable) //debuging infos kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").tqarg(name).tqarg(variable->toString()) << endl; //Use TQMap?s replace to set/replace the variable named name - d->variables.tqreplace(name, variable); + d->variables.replace(name, variable); } //return the associated Macro @@ -252,7 +252,7 @@ void Context::activateNext() } //find the macroitem from which to continue - TQValueList<KSharedPtr<MacroItem > >::ConstIterator it = d->items.tqfind(d->macroitem); + TQValueList<KSharedPtr<MacroItem > >::ConstIterator it = d->items.find(d->macroitem); if (it != d->items.constEnd()) { activate(++it); // try to continue the execution. } diff --git a/kexi/plugins/macros/lib/macroitem.cpp b/kexi/plugins/macros/lib/macroitem.cpp index 471f9660c..cf317fabf 100644 --- a/kexi/plugins/macros/lib/macroitem.cpp +++ b/kexi/plugins/macros/lib/macroitem.cpp @@ -147,7 +147,7 @@ TQVariant MacroItem::variant(const TQString& name, bool checkaction) const KSharedPtr<Variable> MacroItem::variable(const TQString& name, bool checkaction) const { - if(d->variables.tqcontains(name)) + if(d->variables.contains(name)) return d->variables[name]; if(checkaction && d->action.data()) return d->action->variable(name); @@ -179,7 +179,7 @@ bool MacroItem::setVariant(const TQString& name, const TQVariant& variant) variable = KSharedPtr<Variable>( new Variable() ); variable->setName(name); - d->variables.tqreplace(name, variable); + d->variables.replace(name, variable); } // Remember the previous value for the case we like to restore it. @@ -203,13 +203,13 @@ bool MacroItem::setVariant(const TQString& name, const TQVariant& variant) KSharedPtr<Variable> MacroItem::addVariable(const TQString& name, const TQVariant& variant) { - Q_ASSERT(! d->variables.tqcontains(name) ); + Q_ASSERT(! d->variables.contains(name) ); // Create a new Variable. KSharedPtr<Variable> variable = KSharedPtr<Variable>( new Variable() ); variable->setName(name); // Put it into the Variable-map. - d->variables.tqreplace(name, variable); + d->variables.replace(name, variable); // Set the variant of the Variable. this->setVariant(name, variant); diff --git a/kexi/plugins/macros/lib/manager.cpp b/kexi/plugins/macros/lib/manager.cpp index 0a0d59e0a..f73ddaa81 100644 --- a/kexi/plugins/macros/lib/manager.cpp +++ b/kexi/plugins/macros/lib/manager.cpp @@ -85,11 +85,11 @@ Manager::Manager(KXMLGUIClient* const xmlguiclient) kdDebug() << "Manager::Manager() Ctor" << endl; TQObject* obj = dynamic_cast<TQObject*>(xmlguiclient); if(obj) { - d->objects.tqreplace(obj->name(), obj); + d->objects.replace(obj->name(), obj); } //TESTCASE - d->objects.tqreplace("TestCase", new TQWidget()); + d->objects.replace("TestCase", new TQWidget()); } Manager::~Manager() @@ -105,7 +105,7 @@ KXMLGUIClient* Manager::guiClient() const bool Manager::hasMacro(const TQString& macroname) { - return d->macros.tqcontains(macroname); + return d->macros.contains(macroname); } KSharedPtr<Macro> Manager::getMacro(const TQString& macroname) @@ -115,7 +115,7 @@ KSharedPtr<Macro> Manager::getMacro(const TQString& macroname) void Manager::addMacro(const TQString& macroname, KSharedPtr<Macro> macro) { - d->macros.tqreplace(macroname, macro); + d->macros.replace(macroname, macro); } void Manager::removeMacro(const TQString& macroname) @@ -147,16 +147,16 @@ TQStringList Manager::actionNames() const void Manager::publishAction(KSharedPtr<Action> action) { const TQString name = action->name(); - if(! d->actions.tqcontains(name)) { + if(! d->actions.contains(name)) { d->actionnames.append(name); } - d->actions.tqreplace(name, action); + d->actions.replace(name, action); } void Manager::publishObject(const TQString& name, TQObject* object) { - Q_ASSERT(! d->objects.tqcontains(name)); - d->objects.tqreplace(name, object); + Q_ASSERT(! d->objects.contains(name)); + d->objects.replace(name, object); } TQGuardedPtr<TQObject> Manager::object(const TQString& name) const diff --git a/kexi/plugins/macros/lib/manager.h b/kexi/plugins/macros/lib/manager.h index fb332f666..ae32aad91 100644 --- a/kexi/plugins/macros/lib/manager.h +++ b/kexi/plugins/macros/lib/manager.h @@ -128,7 +128,7 @@ namespace KoMacro { * Add a new \a Macro to the list of known macros. If * there exists already a \a Macro instance with the * defined \p macroname then the already existing one - * will be tqreplace. + * will be replace. * * \param macroname The name the \a Macro will be * accessible as. diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp index 979202e84..16b938037 100644 --- a/kexi/plugins/macros/lib/metamethod.cpp +++ b/kexi/plugins/macros/lib/metamethod.cpp @@ -89,8 +89,8 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje d->object = object; d->type = type; - int startpos = d->signature.tqfind("("); - int endpos = d->signature.tqfindRev(")"); + int startpos = d->signature.find("("); + int endpos = d->signature.findRev(")"); if(startpos < 0 || startpos > endpos) { throw Exception(TQString("Invalid signature \"%1\"").tqarg(d->signature)); } @@ -103,14 +103,14 @@ MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObje d->signaturearguments = d->signature.mid(startpos + 1, endpos - startpos - 1).stripWhiteSpace(); do { - int commapos = d->signaturearguments.tqfind(","); - int starttemplatepos = d->signaturearguments.tqfind("<"); + int commapos = d->signaturearguments.find(","); + int starttemplatepos = d->signaturearguments.find("<"); if(starttemplatepos >= 0 && (commapos < 0 || starttemplatepos < commapos)) { - int endtemplatepos = d->signaturearguments.tqfind(">", starttemplatepos); + int endtemplatepos = d->signaturearguments.find(">", starttemplatepos); if(endtemplatepos <= 0) { throw Exception(TQString("No closing template-definiton in signature \"%1\"").tqarg(d->signature)); } - commapos = d->signaturearguments.tqfind(",", endtemplatepos); + commapos = d->signaturearguments.find(",", endtemplatepos); } if(commapos > 0) { diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp index a08ff33d5..29c538319 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp @@ -177,7 +177,7 @@ void XMLHandlerTests::testCorrectDomElement() // Test the Compare-method when a Variable will change, it must fail. macro->items().first()->variable("teststring")->setVariant("bla"); - isvariableok.tqreplace("teststring",false); + isvariableok.replace("teststring",false); assertMacroContentEqToXML(macro,elem,false,true,isvariableok); } @@ -568,12 +568,12 @@ void XMLHandlerTests::assertMacroContentEqToXML(const KSharedPtr<KoMacro::Macro> while ( ! varnode.isNull()) { const TQDomElement varelem = varnode.toElement(); - const KSharedPtr<KoMacro::Variable> varitem = mvariables.tqfind(varelem.attribute("name")).data(); + const KSharedPtr<KoMacro::Variable> varitem = mvariables.find(varelem.attribute("name")).data(); //3.comparison - Is the content of the Variable // in the MacroItem and and item equal? { - const bool var = *isvariableok.tqfind(varelem.attribute("name")); + const bool var = *isvariableok.find(varelem.attribute("name")); if( ! var ) { KOMACROTEST_XASSERT(varitem->variant() == TQVariant(varelem.text()), !var); kdDebug() << "The content of the Variable: " << varitem->name() diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 5be541454..be16b70d9 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -318,7 +318,7 @@ void KexiQueryDesignerGuiEditor::updateColumnsData() { //table /*! @todo what about query? */ - KexiDB::TableSchema *table = d->relations->tables()->tqfind(*it)->schema()->table(); + KexiDB::TableSchema *table = d->relations->tables()->find(*it)->schema()->table(); d->conn->registerForTableSchemaChanges(*tempData(), *table); //this table will be used item = d->tablesColumnData->createItem(); //new KexiTableItem(2); (*item)[COLUMN_ID_COLUMN]=table->name(); @@ -961,7 +961,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal( if (column) { //sorting for visible column if (column->visible) { - if (columnsOrder.tqcontains(column)) { + if (columnsOrder.contains(column)) { const int columnPosition = columnsOrder[ column ]; rowItem = d->data->at( columnPosition ); rowPropertySet = d->sets->at( columnPosition ); @@ -1018,7 +1018,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal( } } KexiDB::Field* field = 0; - if (-1 == columnNameArgument->name.tqfind('.') && query->tables()->count()==1) { + if (-1 == columnNameArgument->name.find('.') && query->tables()->count()==1) { //extreme case: only field name provided for one-table query: field = query->tables()->first()->field(columnNameArgument->name); } @@ -1374,9 +1374,9 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in //number TQString decimalSym = KGlobal::locale()->decimalSymbol(); bool ok; - int pos = str.tqfind('.'); + int pos = str.find('.'); if (pos==-1) {//second chance: local decimal symbol - pos = str.tqfind(decimalSym); + pos = str.find(decimalSym); } if (pos>=0) {//real const number const int left = str.left(pos).toInt(&ok); @@ -1440,8 +1440,8 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int //this value is entered by hand and doesn't match //any value in the combo box -- we're assuming this is an expression //-table remains null - //-tqfind "alias" in something like "alias : expr" - const int id = fieldId.tqfind(':'); + //-find "alias" in something like "alias : expr" + const int id = fieldId.find(':'); if (id>0) { alias = fieldId.left(id).stripWhiteSpace().latin1(); if (!KexiUtils::isIdentifier(alias)) { @@ -1490,7 +1490,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int KoProperty::Set *set = d->sets->findPropertySetForItem(*item); //*propertyBuffer(); if (!set) { saveOldValue = false; // no old val. - const int row = d->data->tqfindRef(item); + const int row = d->data->findRef(item); if (row<0) { result->success = false; return; @@ -1605,7 +1605,7 @@ void KexiQueryDesignerGuiEditor::slotBeforeCellChanged(KexiTableItem *item, int field = (*set)["field"].value().toString(); table = (*set)["table"].value().toString(); } - if (!str.isEmpty() && (!set || table=="*" || field.tqfind("*")!=-1)) { + if (!str.isEmpty() && (!set || table=="*" || field.find("*")!=-1)) { //asterisk found! criteria not allowed result->success = false; result->allowToDiscardChanges = true; diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 19c0e06aa..0321ff2b5 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -83,7 +83,7 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e) updateContents(it.current()->tqgeometry(y, visibleWidth(), fontMetrics())); } - if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).tqcontains(e->pos())) + if(it.current()->tqgeometry(y, visibleWidth(), fontMetrics()).contains(e->pos())) { popupHistory = it.current(); pos = y; @@ -273,12 +273,12 @@ HistoryEntry::highlight(const TQColorGroup &cg) bool dblquote = false; statement = m_statement; - statement.tqreplace("<", "<"); - statement.tqreplace(">", ">"); - statement.tqreplace("\r\n", "<br>"); //(js) first win32 specific pair - statement.tqreplace("\n", "<br>"); // now single \n - statement.tqreplace(" ", " "); - statement.tqreplace("\t", " "); + statement.replace("<", "<"); + statement.replace(">", ">"); + statement.replace("\r\n", "<br>"); //(js) first win32 specific pair + statement.replace("\n", "<br>"); // now single \n + statement.replace(" ", " "); + statement.replace("\t", " "); // getting quoting... if(!m_selected) @@ -331,7 +331,7 @@ HistoryEntry::highlight(const TQColorGroup &cg) TQRegExp keywords("\\b(SELECT|UPDATE|INSERT|DELETE|DROP|FROM|WHERE|AND|OR|NOT|NULL|JOIN|LEFT|RIGHT|ON|INTO|TABLE)\\b"); keywords.setCaseSensitive(false); - text = text.tqreplace(keywords, "<b>\\1</b>"); + text = text.replace(keywords, "<b>\\1</b>"); if(!m_error.isEmpty()) // text += ("<br>"+i18n("Error: %1").tqarg(m_error)); diff --git a/kexi/plugins/scripting/kexidb.doxyfile b/kexi/plugins/scripting/kexidb.doxyfile index 3e21f7f14..f44e82307 100644 --- a/kexi/plugins/scripting/kexidb.doxyfile +++ b/kexi/plugins/scripting/kexidb.doxyfile @@ -16,7 +16,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - tqcontains \ + contains \ represents \ a \ an \ diff --git a/kexi/plugins/scripting/kexidb/kexidbcursor.cpp b/kexi/plugins/scripting/kexidb/kexidbcursor.cpp index bb9f53df5..b1d335b66 100644 --- a/kexi/plugins/scripting/kexidb/kexidbcursor.cpp +++ b/kexi/plugins/scripting/kexidb/kexidbcursor.cpp @@ -106,8 +106,8 @@ bool KexiDBCursor::setValue(uint index, TQVariant value) } const TQ_LLONG position = m_cursor->at(); - if(! m_modifiedrecords.tqcontains(position)) - m_modifiedrecords.tqreplace(position, new Record(m_cursor)); + if(! m_modifiedrecords.contains(position)) + m_modifiedrecords.replace(position, new Record(m_cursor)); m_modifiedrecords[position]->buffer->insert(*column, value); return true; } diff --git a/kexi/plugins/scripting/kexidb/kexidbschema.cpp b/kexi/plugins/scripting/kexidb/kexidbschema.cpp index aebcbd7e8..2ac403422 100644 --- a/kexi/plugins/scripting/kexidb/kexidbschema.cpp +++ b/kexi/plugins/scripting/kexidb/kexidbschema.cpp @@ -154,20 +154,20 @@ bool KexiDBQuerySchema::setWhereExpression(const TQString& whereexpression) { TQRegExp re("[\"',]{1,1}"); while(true) { s.remove(TQRegExp("^[\\s,]+")); - int pos = s.tqfind('='); + int pos = s.find('='); if(pos < 0) break; TQString key = s.left(pos).stripWhiteSpace(); s = s.mid(pos + 1).stripWhiteSpace(); TQString value; - int sp = s.tqfind(re); + int sp = s.find(re); if(sp >= 0) { if(re.cap(0) == ",") { value = s.left(sp).stripWhiteSpace(); s = s.mid(sp+1).stripWhiteSpace(); } else { - int ep = s.tqfind(re.cap(0),sp+1); + int ep = s.find(re.cap(0),sp+1); value = s.mid(sp+1,ep-1); s = s.mid(ep + 1); } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index 39f84599a..50a875b38 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -321,7 +321,7 @@ tristate KexiScriptDesignView::storeData(bool /*dontAsk*/) TQMap<TQString, TQVariant>& options = d->scriptaction->getOptions(); TQMap<TQString, TQVariant>::ConstIterator it, end( options.constEnd() ); for( it = options.constBegin(); it != end; ++it) { - if( defoptions.tqcontains(it.key()) ) { // only remember options which the InterpreterInfo knows about... + if( defoptions.contains(it.key()) ) { // only remember options which the InterpreterInfo knows about... scriptelem.setAttribute(it.key(), it.data().toString()); } } diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py index 43fa7e255..bdec927b1 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py @@ -210,7 +210,7 @@ def runGuiApp(copycenter, name): if filename != "": self.jobfilecombobox.setCurrentText(filename) def escape(self,s): - return s.tqreplace("&", "&").tqreplace("'", "'").tqreplace("<", "<").tqreplace(">", ">").tqreplace('"', """) + return s.replace("&", "&").replace("'", "'").replace("<", "<").replace(">", ">").replace('"', """) def writeOptions(self,writer,pluginname,plugininst): print "CopyJobWidget.writeOptions" @@ -271,7 +271,7 @@ def runGuiApp(copycenter, name): def text(self, columnindex): if columnindex == 1: - if qt.QListViewItem.text(self,0).tqcontains("password"): + if qt.QListViewItem.text(self,0).contains("password"): return "*" * len(str(qt.QListViewItem.text(self,1))) return qt.QListViewItem.text(self,columnindex) return ListViewItem(pluginimpl, self.listview, parentitem, afteritem) diff --git a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py index 9febfcdd7..d0d1f0cc2 100644 --- a/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py +++ b/kexi/plugins/scripting/scripts/exportxhtml/ExportXHTML.py @@ -83,7 +83,7 @@ class HtmlExporter: def htmlescape(self, text): import string - return string.tqreplace(string.tqreplace(string.tqreplace(str(text),'&','&'),'<','<'),'>','>') + return string.replace(string.replace(string.replace(str(text),'&','&'),'<','<'),'>','>') def write(self, output, style): name = self.datasource.name() diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 2f6cd21ce..0e743bd10 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -833,7 +833,7 @@ void KexiTableDesignerView::slotBeforeCellChanged( void KexiTableDesignerView::slotRowUpdated(KexiTableItem *item) { - const int row = d->view->KexiDataAwareObjectInterface::data()->tqfindRef(item); + const int row = d->view->KexiDataAwareObjectInterface::data()->findRef(item); if (row < 0) return; @@ -1155,7 +1155,7 @@ void KexiTableDesignerView::slotAboutToDeleteRow( d->primaryKeyExists = false; if (d->addHistoryCommand_in_slotAboutToDeleteRow_enabled) { - const int row = d->view->KexiDataAwareObjectInterface::data()->tqfindRef(&item); + const int row = d->view->KexiDataAwareObjectInterface::data()->findRef(&item); KoProperty::Set *set = row >=0 ? d->sets->at(row) : 0; //set can be 0 here, what means "removing empty row" addHistoryCommand( @@ -1176,7 +1176,7 @@ KexiDB::Field * KexiTableDesignerView::buildField( const KoProperty::Set &set ) while (it!=values.end()) { const TQString propName( it.key() ); - if (d->internalPropertyNames.tqfind(propName.latin1()) || propName.startsWith("this:") + if (d->internalPropertyNames.find(propName.latin1()) || propName.startsWith("this:") || (/*sanity*/propName=="objectType" && KexiDB::Field::BLOB != KexiDB::intToFieldType( set["type"].value().toInt() ))) { TQMap<TQCString, TQVariant>::Iterator it_tmp = it; @@ -1717,7 +1717,7 @@ void KexiTableDesignerView::insertField(int row, KoProperty::Set& set, bool addC void KexiTableDesignerView::insertFieldInternal(int row, KoProperty::Set* set, //const KexiDB::Field& field, const TQString& caption, bool addCommand) { - if (set && (!set->tqcontains("type") || !set->tqcontains("caption"))) { + if (set && (!set->contains("type") || !set->contains("caption"))) { kexipluginswarn << "KexiTableDesignerView::insertField(): no 'type' or 'caption' property in set!" << endl; return; } @@ -1807,7 +1807,7 @@ void KexiTableDesignerView::changeFieldPropertyForRow( int row, return; KoProperty::Set* set = d->sets->at( row ); - if (!set || !set->tqcontains(propertyName)) + if (!set || !set->contains(propertyName)) return; KoProperty::Property &property = set->property(propertyName); if (listData) { @@ -1896,7 +1896,7 @@ void KexiTableDesignerView::changePropertyVisibility( if (row<0) return; KoProperty::Set* set = d->sets->at( row ); - if (!set || !set->tqcontains(propertyName)) + if (!set || !set->contains(propertyName)) return; KoProperty::Property &property = set->property(propertyName); diff --git a/kexi/tests/gui/finddialog/kexifinddialog.cpp b/kexi/tests/gui/finddialog/kexifinddialog.cpp index 5c3a7e4d8..5482c0727 100644 --- a/kexi/tests/gui/finddialog/kexifinddialog.cpp +++ b/kexi/tests/gui/finddialog/kexifinddialog.cpp @@ -31,7 +31,7 @@ KexiFindDialog::KexiFindDialog( bool replaceMode, TQWidget* tqparent, const char : KexiFindDialogBase(tqparent, name, modal) , m_replaceMode(true) { - m_btnFind->setIconSet(KStdGuiItem::tqfind().iconSet()); + m_btnFind->setIconSet(KStdGuiItem::find().iconSet()); m_btnClose->setIconSet(KStdGuiItem::close().iconSet()); setReplaceMode(replaceMode); m_lookIn->insertItem(i18n("(All columns)")); diff --git a/kexi/tests/gui/finddialog/kexifinddialog.h b/kexi/tests/gui/finddialog/kexifinddialog.h index a6cdc47cc..b1cd4a5c9 100644 --- a/kexi/tests/gui/finddialog/kexifinddialog.h +++ b/kexi/tests/gui/finddialog/kexifinddialog.h @@ -24,7 +24,7 @@ /*! @brief A Kexi-specific "Find text" dialog. - Also used for tqreplace. + Also used for replace. */ class KexiFindDialog : public KexiFindDialogBase { @@ -56,7 +56,7 @@ TODO TODO TODO TODO TODO TODO public slots: /*! Sets or clears replace mode. - For replace mode 'prompt or tqreplace' option is visible. + For replace mode 'prompt or replace' option is visible. */ void setReplaceMode(bool set); diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui index 568e0781e..0f2248e65 100644 --- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui +++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui @@ -206,7 +206,7 @@ <enum>WheelFocus</enum> </property> <property name="text"> - <string>Prompt on tqreplace</string> + <string>Prompt on replace</string> </property> <property name="checked"> <bool>true</bool> diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp index ba232d5fa..d02dbc9be 100644 --- a/kexi/tests/newapi/main.cpp +++ b/kexi/tests/newapi/main.cpp @@ -75,7 +75,7 @@ static KCmdLineOptions options[] = " to be buffered", 0}, { "query-params <params>", "Query parameters separated\n" "by '|' character that will be passed to query\n" - "statement to tqreplace [...] placeholders.", 0 }, + "statement to replace [...] placeholders.", 0 }, { "", " Notes:\n" "1. 'dr_prop' requires <db_name> argument.\n" "2. 'parser' test requires <db_name>,\n" @@ -136,7 +136,7 @@ int main(int argc, char** argv) RETURN(1); } test_name = args->getOption("test"); - if (!tests.tqcontains(test_name)) { + if (!tests.contains(test_name)) { kdDebug() << TQString("No such test \"%1\". Use --help.").tqarg(test_name.data()) << endl; RETURN(1); } diff --git a/kexi/tools/delete_column/kexi_delete_column b/kexi/tools/delete_column/kexi_delete_column index 2f4d8d40f..22566c618 100755 --- a/kexi/tools/delete_column/kexi_delete_column +++ b/kexi/tools/delete_column/kexi_delete_column @@ -127,7 +127,7 @@ for fname in `$ksqlite "$temp_db" \ column_order=`expr $column_order + 1` done -# 3. Copy the original database file to .old file and tqreplace +# 3. Copy the original database file to .old file and replace # the original with the new one cp "$database_name" "$database_name.old" || exit_with_error mv "$temp_db" "$database_name" || exit_with_error diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 46c7ade9a..0f8b5e02a 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -148,7 +148,7 @@ KexiBrowser::KexiBrowser(TQWidget* tqparent, KexiMainWindow *mainWin, int featur m_deleteAction = new KAction(i18n("&Delete"), "editdelete", 0/*TQt::Key_Delete*/, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), m_actions, "edit_delete"); //! @todo 1.1: just add "Delete" tooltip and what's this - m_deleteAction->setToolTip(i18n("&Delete").tqreplace("&","")); + m_deleteAction->setToolTip(i18n("&Delete").replace("&","")); m_renameAction = new KAction(i18n("&Rename"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), m_actions, "edit_rename"); @@ -370,7 +370,7 @@ KexiBrowserItem *KexiBrowser::addGroup(KexiPart::Info& info) KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item) { //part object for this item - KexiBrowserItem *tqparent = item.mimeType().isEmpty() ? 0 : m_baseItems.tqfind(item.mimeType().lower()); + KexiBrowserItem *tqparent = item.mimeType().isEmpty() ? 0 : m_baseItems.find(item.mimeType().lower()); return addItem(item, tqparent, tqparent->info()); } diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index c22c0dbbf..13e308c8a 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -120,8 +120,8 @@ void KexiDataAwareView::initActions() plugSharedAction("edit_paste", TQT_TQOBJECT(this), TQT_SLOT(paste())); m_actionClient->plugSharedAction(sharedAction("edit_paste")); //for proper shortcut -// plugSharedAction("edit_tqfind", TQT_TQOBJECT(this), TQT_SLOT(editFind())); -// m_actionClient->plugSharedAction(sharedAction("edit_tqfind")); //for proper shortcut +// plugSharedAction("edit_find", TQT_TQOBJECT(this), TQT_SLOT(editFind())); +// m_actionClient->plugSharedAction(sharedAction("edit_find")); //for proper shortcut // plugSharedAction("edit_findnext", TQT_TQOBJECT(this), TQT_SLOT(editFindNext())); // m_actionClient->plugSharedAction(sharedAction("edit_findnext")); //for proper shortcut @@ -129,13 +129,13 @@ void KexiDataAwareView::initActions() // plugSharedAction("edit_findprevious", TQT_TQOBJECT(this), TQT_SLOT(editFindPrevious())); // m_actionClient->plugSharedAction(sharedAction("edit_findprev")); //for proper shortcut -//! @todo plugSharedAction("edit_tqreplace", TQT_TQOBJECT(this), TQT_SLOT(editReplace())); -//! @todo m_actionClient->plugSharedAction(sharedAction("edit_tqreplace")); //for proper shortcut +//! @todo plugSharedAction("edit_replace", TQT_TQOBJECT(this), TQT_SLOT(editReplace())); +//! @todo m_actionClient->plugSharedAction(sharedAction("edit_replace")); //for proper shortcut -// setAvailable("edit_tqfind", true); +// setAvailable("edit_find", true); // setAvailable("edit_findnext", true); // setAvailable("edit_findprevious", true); -//! @todo setAvailable("edit_tqreplace", true); +//! @todo setAvailable("edit_replace", true); } void KexiDataAwareView::slotUpdateRowActions(int row) @@ -329,7 +329,7 @@ bool KexiDataAwareView::setupFindAndReplace(TQStringList& columnNames, TQStringL return true; } -tristate KexiDataAwareView::tqfind(const TQVariant& valueToFind, +tristate KexiDataAwareView::find(const TQVariant& valueToFind, const KexiSearchAndReplaceViewInterface::Options& options, bool next) { if (!dataAwareObject() || !dataAwareObject()->data()) @@ -338,7 +338,7 @@ tristate KexiDataAwareView::tqfind(const TQVariant& valueToFind, // const KexiDataAwareObjectInterface::FindAndReplaceOptions options(dlg->options()); /* if (res == KexiFindDialog::Find) {*/ // TQVariant valueToFind(dlg->valueToFind()); - return dataAwareObject()->tqfind( valueToFind, options, next ); + return dataAwareObject()->find( valueToFind, options, next ); /* //! @todo result... diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h index 31a43445a..98124f5ac 100644 --- a/kexi/widget/kexidataawareview.h +++ b/kexi/widget/kexidataawareview.h @@ -55,14 +55,14 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase, KexiDataAwareObjectInterface* dataAwareObject() const { return m_dataAwareObject; } - /*! Sets up data for tqfind/replace dialog, based on view's data model. + /*! Sets up data for find/replace dialog, based on view's data model. Implemented for KexiSearchAndReplaceViewInterface. */ virtual bool setupFindAndReplace(TQStringList& columnNames, TQStringList& columnCaptions, TQString& currentColumnName); /*! Finds \a valueToFind within the view. Implemented for KexiSearchAndReplaceViewInterface. */ - virtual tristate tqfind(const TQVariant& valueToFind, + virtual tristate find(const TQVariant& valueToFind, const KexiSearchAndReplaceViewInterface::Options& options, bool next); /*! Finds \a valueToFind within the view and replaces with \a replacement. diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp index 77895e246..0db52c9d1 100644 --- a/kexi/widget/kexidatasourcecombobox.cpp +++ b/kexi/widget/kexidatasourcecombobox.cpp @@ -310,7 +310,7 @@ void KexiDataSourceComboBox::slotReturnPressed(const TQString & text) changed = true; } else { - TQListBoxItem *item = listBox()->tqfindItem( text, TQt::ExactMatch ); + TQListBoxItem *item = listBox()->findItem( text, TQt::ExactMatch ); if (item) { int index = listBox()->index( item ); //if (index < d->firstTableIndex()) diff --git a/kexi/widget/kexidbdrivercombobox.cpp b/kexi/widget/kexidbdrivercombobox.cpp index 8026106d2..e083ac1c2 100644 --- a/kexi/widget/kexidbdrivercombobox.cpp +++ b/kexi/widget/kexidbdrivercombobox.cpp @@ -74,7 +74,7 @@ KexiDBDriverComboBox::~KexiDBDriverComboBox() TQString KexiDBDriverComboBox::selectedDriverName() const { - TQMapConstIterator<TQString,TQString> it( m_driversMap.tqfind( text( currentItem() ) ) ); + TQMapConstIterator<TQString,TQString> it( m_driversMap.find( text( currentItem() ) ) ); if (it==m_driversMap.constEnd()) return TQString(); return it.data(); @@ -82,7 +82,7 @@ TQString KexiDBDriverComboBox::selectedDriverName() const void KexiDBDriverComboBox::setDriverName(const TQString& driverName) { - int index = m_driverNames.tqfindIndex( driverName.lower() ); + int index = m_driverNames.findIndex( driverName.lower() ); if (index==-1) { return; } diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 82af06a39..f45faaa10 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -183,7 +183,7 @@ void KexiEditor::setHighlightMode(const TQString& highlightmodename) KTextEditor::HighlightingInterface *hl = KTextEditor::highlightingInterface( d->doc ); for(uint i = 0; i < hl->hlModeCount(); i++) { //kdDebug() << "hlmode("<<i<<"): " << hl->hlModeName(i) << endl; - if (hl->hlModeName(i).tqcontains(highlightmodename, false)) { + if (hl->hlModeName(i).contains(highlightmodename, false)) { hl->setHlMode(i); return; } diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index fcf810363..0439a178e 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -150,7 +150,7 @@ bool KexiFieldComboBox::isTableAssigned() const void KexiFieldComboBox::setFieldOrExpression(const TQString& string) { const TQString name(string); //string.stripWhiteSpace().lower()); - const int pos = name.tqfind('.'); + const int pos = name.find('.'); if (pos==-1) { d->fieldOrExpression = name; } @@ -167,7 +167,7 @@ void KexiFieldComboBox::setFieldOrExpression(const TQString& string) d->fieldOrExpression = name.mid(pos+1); } - TQListBoxItem *item = listBox()->tqfindItem(d->fieldOrExpression); + TQListBoxItem *item = listBox()->findItem(d->fieldOrExpression); if (!item) { setCurrentItem(0); setCurrentText(d->fieldOrExpression); @@ -228,7 +228,7 @@ void KexiFieldComboBox::slotReturnPressed(const TQString & text) index = 0; } else { - TQListBoxItem *item = listBox()->tqfindItem( text, TQt::ExactMatch ); + TQListBoxItem *item = listBox()->findItem( text, TQt::ExactMatch ); if (!item) return; index = listBox()->index( item ); diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp index 801f17b25..5c36cfb09 100644 --- a/kexi/widget/kexipropertyeditorview.cpp +++ b/kexi/widget/kexipropertyeditorview.cpp @@ -183,13 +183,13 @@ void KexiPropertyEditorView::updateInfoLabelForPropertySet(KexiObjectInfoLabel * { TQString className, iconName, objectName; if (set) { - if (set->tqcontains("this:classString")) + if (set->contains("this:classString")) className = (*set)["this:classString"].value().toString(); - if (set->tqcontains("this:iconName")) + if (set->contains("this:iconName")) iconName = (*set)["this:iconName"].value().toString(); - const bool useCaptionAsObjectName = set->tqcontains("this:useCaptionAsObjectName") + const bool useCaptionAsObjectName = set->contains("this:useCaptionAsObjectName") && (*set)["this:useCaptionAsObjectName"].value().toBool(); - if (set->tqcontains(useCaptionAsObjectName ? "caption" : "name")) + if (set->contains(useCaptionAsObjectName ? "caption" : "name")) objectName = (*set)[useCaptionAsObjectName ? "caption" : "name"].value().toString(); } if (!set || objectName.isEmpty()) { diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index 64d036818..b88ad3ae4 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -205,7 +205,7 @@ KexiScrollView::contentsMousePressEvent(TQMouseEvent *ev) return; TQRect r3(0, 0, m_widget->width() + 4, m_widget->height() + 4); - if(!r3.tqcontains(ev->pos())) // clicked outside form + if(!r3.contains(ev->pos())) // clicked outside form //m_form->resetSelection(); emit outerAreaClicked(); @@ -214,7 +214,7 @@ KexiScrollView::contentsMousePressEvent(TQMouseEvent *ev) TQRect r(m_widget->width(), 0, 4, m_widget->height() + 4); // right limit TQRect r2(0, m_widget->height(), m_widget->width() + 4, 4); // bottom limit - if(r.tqcontains(ev->pos()) || r2.tqcontains(ev->pos())) + if(r.contains(ev->pos()) || r2.contains(ev->pos())) { m_resizing = true; emit resizingStarted(); @@ -303,11 +303,11 @@ KexiScrollView::contentsMouseMoveEvent(TQMouseEvent *ev) TQRect r2(0, m_widget->height(), m_widget->width(), 4); // bottom TQRect r3(m_widget->width(), m_widget->height(), 4, 4); // bottom-right corner - if(r.tqcontains(p)) + if(r.contains(p)) setCursor(TQCursor::SizeHorCursor); - else if(r2.tqcontains(p)) + else if(r2.contains(p)) setCursor(TQCursor::SizeVerCursor); - else if(r3.tqcontains(p)) + else if(r3.contains(p)) setCursor(TQCursor::SizeFDiagCursor); else unsetCursor(); diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index f5bc4d9ea..fecc5b769 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -50,7 +50,7 @@ TQString PixmapCollection::addPixmapPath(const KURL &url) { TQString name = url.filename(); - while(m_pixmaps.tqcontains(name)) + while(m_pixmaps.contains(name)) { bool ok; int num = name.right(1).toInt(&ok, 10); @@ -68,7 +68,7 @@ TQString PixmapCollection::addPixmapName(const TQString &icon, int size) { TQString name = icon; - while(m_pixmaps.tqcontains(name)) + while(m_pixmaps.contains(name)) { bool ok; int num = name.right(1).toInt(&ok, 10); @@ -91,7 +91,7 @@ PixmapCollection::removePixmap(const TQString &name) TQPixmap PixmapCollection::getPixmap(const TQString &name) { - if(!m_pixmaps.tqcontains(name)) + if(!m_pixmaps.contains(name)) { kdDebug() << " The icon " << name << " you requested is not in the collection" << endl; return TQPixmap(); @@ -106,9 +106,9 @@ PixmapCollection::getPixmap(const TQString &name) } bool -PixmapCollection::tqcontains(const TQString &name) +PixmapCollection::contains(const TQString &name) { - return m_pixmaps.tqcontains(name); + return m_pixmaps.contains(name); } void @@ -351,7 +351,7 @@ void PixmapCollectionEditor::renameCollectionItem(TQIconViewItem *it, const TQString &name) { PixmapIconViewItem *item = static_cast<PixmapIconViewItem*>(it); - if(!m_collection->m_pixmaps.tqcontains(item->name())) + if(!m_collection->m_pixmaps.contains(item->name())) return; // We just rename the collection item @@ -390,7 +390,7 @@ PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, c for(it = collection->m_pixmaps.constBegin(); it != endIt; ++it) new PixmapIconViewItem(m_iconView, it.key(), getPixmap(it.key())); - TQIconViewItem *item = m_iconView->tqfindItem(selectedItem, TQt::ExactMatch); + TQIconViewItem *item = m_iconView->findItem(selectedItem, TQt::ExactMatch); if(item && !selectedItem.isEmpty()) m_iconView->setCurrentItem(item); } diff --git a/kexi/widget/pixmapcollection.h b/kexi/widget/pixmapcollection.h index caf11fd5e..3ac4c417e 100644 --- a/kexi/widget/pixmapcollection.h +++ b/kexi/widget/pixmapcollection.h @@ -53,7 +53,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject TQString addPixmapName(const TQString &name, int size = KIcon::SizeMedium); void removePixmap(const TQString &name); - bool tqcontains(const TQString &name); + bool contains(const TQString &name); TQPixmap getPixmap(const TQString &name); void save(TQDomNode parentNode); diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 2be89bb08..b1fc22d29 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -116,7 +116,7 @@ KexiRelationView::containerForTable(KexiDB::TableSchema* tableSchema) KexiRelationViewTableContainer * KexiRelationView::tableContainer(KexiDB::TableSchema *t) const { - return t ? m_tables.tqfind(t->name()) : 0; + return t ? m_tables.find(t->name()) : 0; } KexiRelationViewTableContainer* @@ -554,7 +554,7 @@ KexiRelationView::hideAllTablesExcept( KexiDB::TableSchema::List* tables ) //! @todo what about queries? for (TablesDictIterator it(m_tables); it.current();) { KexiDB::TableSchema *table = it.current()->schema()->table(); - if (!table || tables->tqfindRef( table )!=-1) { + if (!table || tables->findRef( table )!=-1) { ++it; continue; } diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp index 7c8132986..f294b49cc 100644 --- a/kexi/widget/relations/kexirelationviewconnection.cpp +++ b/kexi/widget/relations/kexirelationviewconnection.cpp @@ -221,7 +221,7 @@ KexiRelationViewConnection::matchesPoint(const TQPoint &p, int tolerance) { TQRect we = connectionRect(); - if(!we.tqcontains(p)) + if(!we.contains(p)) return false; /** get our coordinats diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 2145cf203..a45a9ad17 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -338,7 +338,7 @@ void KexiRelationViewTable::setReadOnly(bool b) int KexiRelationViewTable::globalY(const TQString &item) { - TQListViewItem *i = tqfindItem(item, 0); + TQListViewItem *i = findItem(item, 0); if (!i) return -1; int y = tqitemRect(i).y() + (tqitemRect(i).height() / 2); diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index e48a5d007..ee9caeed1 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -143,7 +143,7 @@ TablesDict* KexiRelationWidget::tables() const KexiRelationViewTableContainer* KexiRelationWidget::table(const TQString& name) const { - return m_relationView->tables()->tqfind( name ); + return m_relationView->tables()->find( name ); } const ConnectionList* KexiRelationWidget::connections() const diff --git a/kexi/widget/tableview/kexicelleditorfactory.cpp b/kexi/widget/tableview/kexicelleditorfactory.cpp index e0e9ec038..a2c79a88e 100644 --- a/kexi/widget/tableview/kexicelleditorfactory.cpp +++ b/kexi/widget/tableview/kexicelleditorfactory.cpp @@ -176,7 +176,7 @@ KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column, KexiDB::IndexSchema::ListIterator it = table->indicesIterator(); for (;it.current();++it) { KexiDB::IndexSchema *idx = it.current(); - if (idx->fields()->tqfindRef(&f)!=-1) { + if (idx->fields()->findRef(&f)!=-1) { //find details-side rel. for this index KexiDB::Relationship *rel = idx->detailsRelationships()->first(); if (rel) { diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 4695dbf8e..8b803746d 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -352,7 +352,7 @@ bool KexiComboBoxTableEdit::eventFilter( TQObject *o, TQEvent *e ) + TQPoint(m_scrollView->childX(d->button), m_scrollView->childY(d->button)); TQRect r(d->button->mapToGlobal(d->button->tqgeometry().topLeft()), d->button->mapToGlobal(d->button->tqgeometry().bottomRight())); - if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.tqcontains( gp )) { + if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) { m_mouseBtnPressedWhenPopupVisible = true; } } diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp index 95ed31c0c..79613d9db 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.cpp +++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp @@ -306,7 +306,7 @@ bool KexiDataAwareObjectInterface::sort() return true; } if (m_currentItem != m_insertItem) { - m_curRow = m_data->tqfindRef(m_currentItem); + m_curRow = m_data->findRef(m_currentItem); int jump = m_curRow - oldRow; if (jump<0) (*m_itemIterator) -= -jump; @@ -1283,7 +1283,7 @@ void KexiDataAwareObjectInterface::insertItem(KexiTableItem *newItem, int row) void KexiDataAwareObjectInterface::slotRowInserted(KexiTableItem *item, bool tqrepaint) { - int row = m_data->tqfindRef(item); + int row = m_data->findRef(item); slotRowInserted( item, row, tqrepaint ); } @@ -1493,7 +1493,7 @@ void KexiDataAwareObjectInterface::slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* /*result*/, bool tqrepaint) { if (tqrepaint) { - m_rowWillBeDeleted = m_data->tqfindRef(&item); + m_rowWillBeDeleted = m_data->findRef(&item); } } @@ -1888,7 +1888,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c if (wholeWordsOnly) { const int whereLength = where.length(); while (true) { - pos = where.tqfind( stringValue, pos, caseSensitive ); + pos = where.find( stringValue, pos, caseSensitive ); if (pos == -1) break; if ((pos > 0 && where.at(pos-1).isLetterOrNumber()) @@ -1902,7 +1902,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c firstCharacter = pos; } else {// !wholeWordsOnly - firstCharacter = where.tqfind( stringValue, pos, caseSensitive ); + firstCharacter = where.find( stringValue, pos, caseSensitive ); } return firstCharacter != -1; } @@ -1915,7 +1915,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c if (wholeWordsOnly) { const int whereLength = where.length(); while (true) { - pos = where.tqfindRev( stringValue, pos, caseSensitive ); + pos = where.findRev( stringValue, pos, caseSensitive ); if (pos == -1) break; if ((pos > 0 && where.at(pos-1).isLetterOrNumber()) @@ -1932,7 +1932,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c firstCharacter = pos; } else {// !wholeWordsOnly - firstCharacter = where.tqfindRev( stringValue, pos, caseSensitive ); + firstCharacter = where.findRev( stringValue, pos, caseSensitive ); } return firstCharacter != -1; } @@ -1962,7 +1962,7 @@ static inline bool findInString(const TQString& stringValue, int stringLength, c return false; } -tristate KexiDataAwareObjectInterface::tqfind(const TQVariant& valueToFind, +tristate KexiDataAwareObjectInterface::find(const TQVariant& valueToFind, const KexiSearchAndReplaceViewInterface::Options& options, bool next) { if (!hasData()) diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h index 3ac196fb4..389c1c742 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.h +++ b/kexi/widget/tableview/kexidataawareobjectiface.h @@ -490,7 +490,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface \return true if value has been found, false if value has not been found, and cancelled if there is nothing to find or there is no data to search in. */ - virtual tristate tqfind(const TQVariant& valueToFind, + virtual tristate find(const TQVariant& valueToFind, const KexiSearchAndReplaceViewInterface::Options& options, bool next); /*! Finds \a valueToFind within the data items and replaces with \a replacement @@ -705,7 +705,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface This is per-interface global cache. Needed for faster lookup because there could be lookup values. Called whenever columns definition changes, i.e. in setData() and clearColumns(). - @see tqfind() */ + @see find() */ void updateIndicesForVisibleValues(); //! data structure displayed for this object @@ -856,7 +856,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface bool exists : 1; }; - /*! Used to mark recently found value. Updated on succesful execution of tqfind(). + /*! Used to mark recently found value. Updated on succesful execution of find(). If the current cursor's position changes, or data in the current cell changes, positionOfRecentlyFoundValue.exists is set to false. */ PositionOfValue m_positionOfRecentlyFoundValue; @@ -867,7 +867,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface /*! Used to compare whether the search direction has changed. */ KexiSearchAndReplaceViewInterface::Options::SearchDirection m_recentSearchDirection; - //! Setup by updateIndicesForVisibleValues() and used by tqfind() + //! Setup by updateIndicesForVisibleValues() and used by find() TQValueVector<uint> m_indicesForVisibleValues; }; diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp index 7d49ec522..5668fbfd6 100644 --- a/kexi/widget/tableview/kexidataawarepropertyset.cpp +++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp @@ -238,7 +238,7 @@ KoProperty::Set* KexiDataAwarePropertySet::findPropertySetForItem(KexiTableItem& { if (m_currentTVData.isNull()) return 0; - int idx = m_currentTVData->tqfindRef(&item); + int idx = m_currentTVData->findRef(&item); if (idx<0) return 0; return m_sets[idx]; @@ -249,7 +249,7 @@ int KexiDataAwarePropertySet::findRowForPropertyValue(const TQCString& propertyN const int size = m_sets.size(); for (int i=0; i<size; i++) { KoProperty::Set *set = m_sets[i]; - if (!set || !set->tqcontains(propertyName)) + if (!set || !set->contains(propertyName)) continue; if (set->property(propertyName).value() == value) return i; diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp index af71ae4c3..a0b5185e3 100644 --- a/kexi/widget/tableview/kexidatetableedit.cpp +++ b/kexi/widget/tableview/kexidatetableedit.cpp @@ -105,7 +105,7 @@ void KexiDateTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria bool KexiDateTableEdit::valueIsNull() { -// if (m_lineedit->text().tqreplace(m_formatter.separator(),"").stripWhiteSpace().isEmpty()) +// if (m_lineedit->text().replace(m_formatter.separator(),"").stripWhiteSpace().isEmpty()) if (m_formatter.isEmpty(m_lineedit->text())) //empty date is null return true; return dateValue().isNull(); diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp index 26a3ed7f6..575ae1e65 100644 --- a/kexi/widget/tableview/kexiinputtableedit.cpp +++ b/kexi/widget/tableview/kexiinputtableedit.cpp @@ -280,7 +280,7 @@ TQVariant KexiInputTableEdit::value() //! js @todo PRESERVE PRECISION! TQString txt = m_lineedit->text(); if (m_decsym!=".") - txt = txt.tqreplace(m_decsym,".");//convert back + txt = txt.replace(m_decsym,".");//convert back bool ok; const double result = txt.toDouble(&ok); return ok ? TQVariant(result) : TQVariant(); diff --git a/kexi/widget/tableview/kexitableedit.h b/kexi/widget/tableview/kexitableedit.h index 1d9378b0c..ef618178f 100644 --- a/kexi/widget/tableview/kexitableedit.h +++ b/kexi/widget/tableview/kexitableedit.h @@ -120,12 +120,12 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI int align, int x, int y_offset, int w, int h, const TQColor& fillColor, const TQFontMetrics &fm, bool readOnly, bool fullRowSelection ); - /*! Sometimes, editor can contain non-standard margin, for example combobox editor tqcontains + /*! Sometimes, editor can contain non-standard margin, for example combobox editor contains dropdown button at the right side. \return left margin's size; 0 by default. For reimplementation. */ int leftMargin() const { return m_leftMargin; } - /*! Sometimes, editor can contain non-standard margin, for example combobox editor tqcontains + /*! Sometimes, editor can contain non-standard margin, for example combobox editor contains dropdown button at the right side. THe dropdown button's width is counted only if \a focused is true. \return right margin's size; 0 by default. For reimplementation. */ int rightMargin(bool focused) const; diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 9fc319ff9..d164f68ac 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -1037,7 +1037,7 @@ void KexiTableView::contentsMousePressEvent( TQMouseEvent* e ) s = TQMIN( columnWidth(m_curCol)-3, s ); //avoid too large box const TQRect r( columnPos(m_curCol) + TQMAX( columnWidth(m_curCol)/2 - s/2, 0 ), rowPos(m_curRow) +d->rowHeight/2 - s/2 /*- 1*/, s, s); //kexidbg << r << endl; - if (r.tqcontains(e->pos())) { + if (r.contains(e->pos())) { // kexidbg << "e->x:" << e->x() << " e->y:" << e->y() << " " << rowPos(m_curRow) << // " " << columnPos(m_curCol) << endl; boolToggled(); @@ -2040,7 +2040,7 @@ void KexiTableView::removeEditor() void KexiTableView::slotRowRepaintRequested(KexiTableItem& item) { - updateRow( m_data->tqfindRef(&item) ); + updateRow( m_data->findRef(&item) ); } //(js) unused diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h index b22d619d4..dec81f955 100644 --- a/kexi/widget/tableview/kexitableviewdata.h +++ b/kexi/widget/tableview/kexitableviewdata.h @@ -408,7 +408,7 @@ public: inline bool isEmpty () const { return KexiTableViewDataBase::isEmpty(); } inline KexiTableItem* first() { return KexiTableViewDataBase::first(); } inline KexiTableItem* last() { return KexiTableViewDataBase::last(); } - inline int tqfindRef( const KexiTableItem* item ) { return KexiTableViewDataBase::tqfindRef(item); } + inline int findRef( const KexiTableItem* item ) { return KexiTableViewDataBase::findRef(item); } inline void sort() { KexiTableViewDataBase::sort(); } inline bool removeFirst() { return KexiTableViewDataBase::removeFirst(); } inline bool removeLast() { return KexiTableViewDataBase::removeLast(); } diff --git a/kexi/widget/tableview/kexitextformatter.cpp b/kexi/widget/tableview/kexitextformatter.cpp index b73881381..6045620aa 100644 --- a/kexi/widget/tableview/kexitextformatter.cpp +++ b/kexi/widget/tableview/kexitextformatter.cpp @@ -168,7 +168,7 @@ TQVariant KexiTextFormatter::textToValue(const TQString& text) const case KexiDB::Field::Double: { // replace custom decimal symbol with '.' as required by to{Float|Double}() TQString fixedText( text ); - fixedText.tqreplace(KGlobal::locale()->decimalSymbol(), "."); + fixedText.replace(KGlobal::locale()->decimalSymbol(), "."); if (t == KexiDB::Field::Double) return fixedText.toDouble(); return fixedText.toFloat(); diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index 8c6c3ab2e..f882f6fa0 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -258,7 +258,7 @@ bool KexiContextMenuUtils::updateTitle(TQPopupMenu *menu, const TQString& object if (!menu || objectName.isEmpty() || objectTypeName.isEmpty()) return false; const int id = menu->idAt(0); - TQMenuItem *item = menu->tqfindItem(id); + TQMenuItem *item = menu->findItem(id); if (!item) return false; KPopupTitle *title = dynamic_cast<KPopupTitle *>(item->widget()); diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 430d2f8fc..1e7b9bc9d 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -43,27 +43,27 @@ KexiDateFormatter::KexiDateFormatter() monthDateFormat("MM"), dayDateFormat("dd"); //for setting up m_dateFormat bool ok = df.length()>=8; - int yearpos, monthpos, daypos; //result of df.tqfind() + int yearpos, monthpos, daypos; //result of df.find() if (ok) {//look at % variables //! @todo more variables are possible here, see void KLocale::setDateFormatShort() docs //! http://developer.kde.org/documentation/library/3.5-api/kdelibs-apidocs/kdecore/html/classKLocale.html#a59 - yearpos = df.tqfind("%y", 0, false); //&y or %y + yearpos = df.find("%y", 0, false); //&y or %y m_longYear = !(yearpos>=0 && df.mid(yearpos+1, 1)=="y"); if (!m_longYear) { yearMask = "99"; yearDateFormat = "yy"; } - monthpos = df.tqfind("%m", 0, true); //%m or %n + monthpos = df.find("%m", 0, true); //%m or %n m_monthWithLeadingZero = true; if (monthpos<0) { - monthpos = df.tqfind("%n", 0, false); + monthpos = df.find("%n", 0, false); m_monthWithLeadingZero = false; monthDateFormat = "M"; } - daypos = df.tqfind("%d", 0, true);//%d or %e + daypos = df.find("%d", 0, true);//%d or %e m_dayWithLeadingZero = true; if (daypos<0) { - daypos = df.tqfind("%e", 0, false); + daypos = df.find("%e", 0, false); m_dayWithLeadingZero = false; dayDateFormat = "d"; } @@ -76,7 +76,7 @@ KexiDateFormatter::KexiDateFormatter() } else if (yearpos<daypos && daypos<monthpos) { m_order = TQDateEdit::YDM; -//! @todo use TQRegExp (to tqreplace %Y by %1, etc.) instead of hardcoded "%1%299%399" +//! @todo use TQRegExp (to replace %Y by %1, etc.) instead of hardcoded "%1%299%399" //! because df may contain also other characters m_inputMask = TQString("%1%299%399").tqarg(yearMask).tqarg(m_separator).tqarg(m_separator); m_qtFormat = yearDateFormat+m_separator+dayDateFormat+m_separator+monthDateFormat; @@ -157,7 +157,7 @@ TQVariant KexiDateFormatter::stringToVariant( const TQString& str ) const bool KexiDateFormatter::isEmpty( const TQString& str ) const { TQString s(str); - return s.tqreplace(m_separator,"").stripWhiteSpace().isEmpty(); + return s.replace(m_separator,"").stripWhiteSpace().isEmpty(); } TQString KexiDateFormatter::dateToString( const TQDate& date ) const @@ -172,31 +172,31 @@ KexiTimeFormatter::KexiTimeFormatter() , m_hmRegExp( new TQRegExp("(\\d*):(\\d*).*( am| pm){,1}", false/*!CS*/) ) { TQString tf( KGlobal::locale()->timeFormat() ); - //m_hourpos, m_minpos, m_secpos; are result of tf.tqfind() + //m_hourpos, m_minpos, m_secpos; are result of tf.find() TQString hourVariable, minVariable, secVariable; - //detect position of HOUR section: tqfind %H or %k or %I or %l + //detect position of HOUR section: find %H or %k or %I or %l m_24h = true; m_hoursWithLeadingZero = true; - m_hourpos = tf.tqfind("%H", 0, true); + m_hourpos = tf.find("%H", 0, true); if (m_hourpos>=0) { m_24h = true; m_hoursWithLeadingZero = true; } else { - m_hourpos = tf.tqfind("%k", 0, true); + m_hourpos = tf.find("%k", 0, true); if (m_hourpos>=0) { m_24h = true; m_hoursWithLeadingZero = false; } else { - m_hourpos = tf.tqfind("%I", 0, true); + m_hourpos = tf.find("%I", 0, true); if (m_hourpos>=0) { m_24h = false; m_hoursWithLeadingZero = true; } else { - m_hourpos = tf.tqfind("%l", 0, true); + m_hourpos = tf.find("%l", 0, true); if (m_hourpos>=0) { m_24h = false; m_hoursWithLeadingZero = false; @@ -204,9 +204,9 @@ KexiTimeFormatter::KexiTimeFormatter() } } } - m_minpos = tf.tqfind("%M", 0, true); - m_secpos = tf.tqfind("%S", 0, true); //can be -1 - m_ampmpos = tf.tqfind("%p", 0, true); //can be -1 + m_minpos = tf.find("%M", 0, true); + m_secpos = tf.find("%S", 0, true); //can be -1 + m_ampmpos = tf.find("%p", 0, true); //can be -1 if (m_hourpos<0 || m_minpos<0) { //set default: hr and min are needed, sec are optional @@ -221,13 +221,13 @@ KexiTimeFormatter::KexiTimeFormatter() hourVariable = tf.mid(m_hourpos, 2); m_inputMask = tf; -// m_inputMask.tqreplace( hourVariable, "00" ); -// m_inputMask.tqreplace( "%M", "00" ); -// m_inputMask.tqreplace( "%S", "00" ); //optional - m_inputMask.tqreplace( hourVariable, "99" ); - m_inputMask.tqreplace( "%M", "99" ); - m_inputMask.tqreplace( "%S", "00" ); //optional - m_inputMask.tqreplace( "%p", "AA" ); //am or pm +// m_inputMask.replace( hourVariable, "00" ); +// m_inputMask.replace( "%M", "00" ); +// m_inputMask.replace( "%S", "00" ); //optional + m_inputMask.replace( hourVariable, "99" ); + m_inputMask.replace( "%M", "99" ); + m_inputMask.replace( "%S", "00" ); //optional + m_inputMask.replace( "%p", "AA" ); //am or pm m_inputMask += ";_"; m_outputFormat = tf; @@ -283,7 +283,7 @@ TQVariant KexiTimeFormatter::stringToVariant( const TQString& str ) bool KexiTimeFormatter::isEmpty( const TQString& str ) const { TQString s(str); - return s.tqreplace(':',"").stripWhiteSpace().isEmpty(); + return s.replace(':',"").stripWhiteSpace().isEmpty(); } TQString KexiTimeFormatter::timeToString( const TQTime& time ) const @@ -294,22 +294,22 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const TQString s(m_outputFormat); if (m_24h) { if (m_hoursWithLeadingZero) - s.tqreplace( "%H", TQString::tqfromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) ); + s.replace( "%H", TQString::tqfromLatin1(time.hour()<10 ? "0" : "") + TQString::number(time.hour()) ); else - s.tqreplace( "%k", TQString::number(time.hour()) ); + s.replace( "%k", TQString::number(time.hour()) ); } else { int time12 = (time.hour()>12) ? (time.hour()-12) : time.hour(); if (m_hoursWithLeadingZero) - s.tqreplace( "%I", TQString::tqfromLatin1(time12<10 ? "0" : "") + TQString::number(time12) ); + s.replace( "%I", TQString::tqfromLatin1(time12<10 ? "0" : "") + TQString::number(time12) ); else - s.tqreplace( "%l", TQString::number(time12) ); + s.replace( "%l", TQString::number(time12) ); } - s.tqreplace( "%M", TQString::tqfromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) ); + s.replace( "%M", TQString::tqfromLatin1(time.minute()<10 ? "0" : "") + TQString::number(time.minute()) ); if (m_secpos>=0) - s.tqreplace( "%S", TQString::tqfromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) ); + s.replace( "%S", TQString::tqfromLatin1(time.second()<10 ? "0" : "") + TQString::number(time.second()) ); if (m_ampmpos>=0) - s.tqreplace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") ); + s.replace( "%p", KGlobal::locale()->translate( time.hour()>=12 ? "pm" : "am") ); return s; } @@ -326,8 +326,8 @@ TQDateTime stringToDateTime( const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter, const TQString& str) { TQString s( str.stripWhiteSpace() ); - const int timepos = s.tqfind(" "); - const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(s.mid(timepos+1)); //.tqreplace(':',"").stripWhiteSpace().isEmpty(); + const int timepos = s.find(" "); + const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(s.mid(timepos+1)); //.replace(':',"").stripWhiteSpace().isEmpty(); if (emptyTime) s = s.left(timepos); if (timepos>0 && !emptyTime) { @@ -347,18 +347,18 @@ TQDateTime stringToDateTime( bool dateTimeIsEmpty( const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter, const TQString& str ) { - int timepos = str.tqfind(" "); - const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(str.mid(timepos+1)); //s.mid(timepos+1).tqreplace(':',"").stripWhiteSpace().isEmpty(); - return (timepos >= 0 && dateFormatter.isEmpty(str.left(timepos)) //s.left(timepos).tqreplace(m_dateFormatter.separator(), "").stripWhiteSpace().isEmpty() + int timepos = str.find(" "); + const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(str.mid(timepos+1)); //s.mid(timepos+1).replace(':',"").stripWhiteSpace().isEmpty(); + return (timepos >= 0 && dateFormatter.isEmpty(str.left(timepos)) //s.left(timepos).replace(m_dateFormatter.separator(), "").stripWhiteSpace().isEmpty() && emptyTime); } bool dateTimeIsValid( const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter, const TQString& str ) { - int timepos = str.tqfind(" "); - const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(str.mid(timepos+1)); //s.mid(timepos+1).tqreplace(':',"").stripWhiteSpace().isEmpty(); - if (timepos >= 0 && dateFormatter.isEmpty(str.left(timepos)) // s.left(timepos).tqreplace(m_dateFormatter.separator(), "").stripWhiteSpace().isEmpty() + int timepos = str.find(" "); + const bool emptyTime = timepos >= 0 && timeFormatter.isEmpty(str.mid(timepos+1)); //s.mid(timepos+1).replace(':',"").stripWhiteSpace().isEmpty(); + if (timepos >= 0 && dateFormatter.isEmpty(str.left(timepos)) // s.left(timepos).replace(m_dateFormatter.separator(), "").stripWhiteSpace().isEmpty() && emptyTime) //empty date/time is valid return true; diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp index 2a1a3ba31..ce92444ff 100644 --- a/kexi/widget/utils/kexigradientwidget.cpp +++ b/kexi/widget/utils/kexigradientwidget.cpp @@ -98,7 +98,7 @@ void KexiGradientWidget::rebuildCache( void ) { for ( WidgetList::Iterator it = childWidgetList.begin(); it != childWidgetList.end(); ++it ) { - if ( p_customBackgroundWidgets.tqcontains( ( *it ) ) == false ) { + if ( p_customBackgroundWidgets.contains( ( *it ) ) == false ) { ( *it )->unsetPalette(); } } @@ -170,7 +170,7 @@ void KexiGradientWidget::rebuildCache( void ) { /** Exclude widgets with a custom palette. */ - if ( p_customBackgroundWidgets.tqcontains( childWidget ) ) { + if ( p_customBackgroundWidgets.contains( childWidget ) ) { continue; } @@ -255,7 +255,7 @@ bool KexiGradientWidget::eventFilter( TQObject* object, TQEvent* event ) { In this case, it has to be added to the customBackground-list. */ if ( p_currentChild == 0L && child != 0L ) { - if ( p_customBackgroundWidgets.tqcontains( child ) == false ) { + if ( p_customBackgroundWidgets.contains( child ) == false ) { p_customBackgroundWidgets.append( child ); return false; } @@ -269,7 +269,7 @@ bool KexiGradientWidget::eventFilter( TQObject* object, TQEvent* event ) { Add the new child to the list of widgets, we don't set the background ourselves if it isn't in the list. */ - if ( p_customBackgroundWidgets.tqcontains( child ) == false ) { + if ( p_customBackgroundWidgets.contains( child ) == false ) { if ( child->paletteBackgroundPixmap() != 0L ) { p_customBackgroundWidgets.append( child ); } @@ -291,7 +291,7 @@ bool KexiGradientWidget::eventFilter( TQObject* object, TQEvent* event ) { } if ( event->type() == TQEvent::Move ) { - if ( p_customBackgroundWidgets.tqcontains( child ) == false ) { + if ( p_customBackgroundWidgets.contains( child ) == false ) { updateChildBackground( child ); } } @@ -320,7 +320,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget ) /** Exclude widgets with a custom palette. */ - if ( p_customBackgroundWidgets.tqcontains( childWidget ) ) { + if ( p_customBackgroundWidgets.contains( childWidget ) ) { return; } |