summaryrefslogtreecommitdiffstats
path: root/qtinterface/interface_tqt3
diff options
context:
space:
mode:
Diffstat (limited to 'qtinterface/interface_tqt3')
-rw-r--r--qtinterface/interface_tqt3/tqapplication.cpp12
-rw-r--r--qtinterface/interface_tqt3/tqdir.cpp2
-rw-r--r--qtinterface/interface_tqt3/tqmap.h2
-rw-r--r--qtinterface/interface_tqt3/tqpaintdevice.cpp4
-rw-r--r--qtinterface/interface_tqt3/tqstrlist.h4
-rw-r--r--qtinterface/interface_tqt3/tqtextcodec.cpp16
-rw-r--r--qtinterface/interface_tqt3/tqvaluelist.h2
7 files changed, 21 insertions, 21 deletions
diff --git a/qtinterface/interface_tqt3/tqapplication.cpp b/qtinterface/interface_tqt3/tqapplication.cpp
index dbeef36..d96d9fc 100644
--- a/qtinterface/interface_tqt3/tqapplication.cpp
+++ b/qtinterface/interface_tqt3/tqapplication.cpp
@@ -25,23 +25,23 @@ Boston, MA 02110-1301, USA.
#include <X11/X.h>
#ifdef USE_QT3
-extern Time tqt_x_time;
-extern Time tqt_x_user_time;
+extern Time qt_x_time;
+extern Time qt_x_user_time;
void set_tqt_x_time(unsigned long x) {
- tqt_x_time = x;
+ qt_x_time = x;
}
unsigned long get_tqt_x_time(void) {
- return tqt_x_time;
+ return qt_x_time;
}
void set_tqt_x_user_time(unsigned long x) {
- tqt_x_user_time = x;
+ qt_x_user_time = x;
}
unsigned long get_tqt_x_user_time(void) {
- return tqt_x_user_time;
+ return qt_x_user_time;
}
#endif
diff --git a/qtinterface/interface_tqt3/tqdir.cpp b/qtinterface/interface_tqt3/tqdir.cpp
index 5b5f7c9..f75503d 100644
--- a/qtinterface/interface_tqt3/tqdir.cpp
+++ b/qtinterface/interface_tqt3/tqdir.cpp
@@ -28,7 +28,7 @@ bool QDir::exists( const QString &name, bool acceptAbsPath )
{
if ( name.isEmpty() ) {
#if defined(QT_CHECK_NULL)
- tqWarning( "QDir::exists: Empty or null file name" );
+ qWarning( "QDir::exists: Empty or null file name" );
#endif
return FALSE;
}
diff --git a/qtinterface/interface_tqt3/tqmap.h b/qtinterface/interface_tqt3/tqmap.h
index 6bdb42d..b5f89ae 100644
--- a/qtinterface/interface_tqt3/tqmap.h
+++ b/qtinterface/interface_tqt3/tqmap.h
@@ -604,7 +604,7 @@ Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeB
#ifdef QT_CHECK_RANGE
# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE )
-# define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" )
+# define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) qWarning( "TQMap: Warning invalid element" )
# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() );
# else
# define QT_CHECK_INVALID_MAP_ELEMENT
diff --git a/qtinterface/interface_tqt3/tqpaintdevice.cpp b/qtinterface/interface_tqt3/tqpaintdevice.cpp
index 103d845..0ebab87 100644
--- a/qtinterface/interface_tqt3/tqpaintdevice.cpp
+++ b/qtinterface/interface_tqt3/tqpaintdevice.cpp
@@ -95,11 +95,11 @@ static GC create_gc( int scrn, bool monochrome )
return gc;
}
-GC tqt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC
+GC qt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC
{
int appScreenCount = QApplication::desktop()->numScreens();
if ( scrn < 0 || scrn >= appScreenCount ) {
- tqDebug("invalid screen (tmp) %d %d", scrn, appScreenCount );
+ qDebug("invalid screen (tmp) %d %d", scrn, appScreenCount );
QWidget* bla = 0;
bla->setName("hello");
}
diff --git a/qtinterface/interface_tqt3/tqstrlist.h b/qtinterface/interface_tqt3/tqstrlist.h
index bedc6b7..ac0abc7 100644
--- a/qtinterface/interface_tqt3/tqstrlist.h
+++ b/qtinterface/interface_tqt3/tqstrlist.h
@@ -149,7 +149,7 @@ public:
}
private:
- Q3PtrCollection::Item newItem( Q3PtrCollection::Item d ) { return dc ? tqstrdup( (const char*)d ) : d; }
+ Q3PtrCollection::Item newItem( Q3PtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; }
void deleteItem( Q3PtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; }
int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) { return qstrcmp((const char*)s1,
(const char*)s2); }
@@ -170,7 +170,7 @@ public:
~TQStrIList() { clear(); }
private:
int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 )
- { return tqstricmp((const char*)s1,
+ { return qstricmp((const char*)s1,
(const char*)s2); }
};
diff --git a/qtinterface/interface_tqt3/tqtextcodec.cpp b/qtinterface/interface_tqt3/tqtextcodec.cpp
index 6bb5b72..2333405 100644
--- a/qtinterface/interface_tqt3/tqtextcodec.cpp
+++ b/qtinterface/interface_tqt3/tqtextcodec.cpp
@@ -128,15 +128,15 @@ public:
char comm='%';
bool incmap = FALSE;
while (iod->readLine(line,maxlen) > 0) {
- if (0==tqstrnicmp(line,"<code_set_name>",15))
+ if (0==qstrnicmp(line,"<code_set_name>",15))
n = line+15;
- else if (0==tqstrnicmp(line,"<escape_char> ",14))
+ else if (0==qstrnicmp(line,"<escape_char> ",14))
esc = line[14];
- else if (0==tqstrnicmp(line,"<comment_char> ",15))
+ else if (0==qstrnicmp(line,"<comment_char> ",15))
comm = line[15];
- else if (line[0]==comm && 0==tqstrnicmp(line+1," alias ",7)) {
+ else if (line[0]==comm && 0==qstrnicmp(line+1," alias ",7)) {
aliases.append(line+8);
- } else if (0==tqstrnicmp(line,"CHARMAP",7)) {
+ } else if (0==qstrnicmp(line,"CHARMAP",7)) {
if (!from_unicode_page) {
from_unicode_page = new char*[256];
for (int i=0; i<256; i++)
@@ -146,7 +146,7 @@ public:
to_unicode = new ushort[256];
}
incmap = TRUE;
- } else if (0==tqstrnicmp(line,"END CHARMAP",11))
+ } else if (0==qstrnicmp(line,"END CHARMAP",11))
break;
else if (incmap) {
char* cursor = line;
@@ -226,7 +226,7 @@ public:
}
mb[nmb++] = 0;
from_unicode_page_multiByte[ch.row()][ch.cell()]
- = tqstrdup(mb);
+ = qstrdup(mb);
*mb_unicode = unicode;
} else {
from_unicode_page[ch.row()][ch.cell()] = (char)byte;
@@ -492,7 +492,7 @@ int QTextCodec::heuristicNameMatch(const char* hint) const
int QTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint)
{
// if they're the same, return a perfect score.
- if ( name && hint && *name && *hint && tqstricmp( name, hint ) == 0 )
+ if ( name && hint && *name && *hint && qstricmp( name, hint ) == 0 )
return qstrlen( hint );
// if the letters and numbers are the same, we have an "almost"
diff --git a/qtinterface/interface_tqt3/tqvaluelist.h b/qtinterface/interface_tqt3/tqvaluelist.h
index 63b3278..b8e1241 100644
--- a/qtinterface/interface_tqt3/tqvaluelist.h
+++ b/qtinterface/interface_tqt3/tqvaluelist.h
@@ -423,7 +423,7 @@ void TQValueListPrivate<T>::clear()
#ifdef QT_CHECK_RANGE
# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE )
-# define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) tqWarning( "TQValueList: Warning invalid element" )
+# define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) qWarning( "TQValueList: Warning invalid element" )
# define QT_CHECK_INVALID_LIST_ELEMENT_FATAL Q_ASSERT( !empty() );
# else
# define QT_CHECK_INVALID_LIST_ELEMENT
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 05:45:01 +0000