Browse Source

Rename additional global TQt functions

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
2dfc9a2950
16 changed files with 50 additions and 50 deletions
  1. +6
    -6
      ChangeLog
  2. +5
    -5
      NEWS
  3. +1
    -1
      examples3/canvas/canvas.py
  4. +1
    -1
      examples3/progress.py
  5. +3
    -3
      pylupdate3/fetchtr.cpp
  6. +7
    -7
      pylupdate3/main.cpp
  7. +1
    -1
      pylupdate3/merge.cpp
  8. +2
    -2
      pylupdate3/metatranslator.cpp
  9. +1
    -1
      pylupdate3/numberh.cpp
  10. +1
    -1
      pylupdate3/sametexth.cpp
  11. +3
    -3
      pyuic2/uic.cpp
  12. +1
    -1
      pyuic3/embed.cpp
  13. +4
    -4
      pyuic3/main.cpp
  14. +2
    -2
      sip/qt/qbytearray.sip
  15. +10
    -10
      sip/qt/qglobal.sip
  16. +2
    -2
      sip/qtnetwork/qnetwork.sip

+ 6
- 6
ChangeLog View File

@@ -1200,7 +1200,7 @@ Slight change to handwritten code forced by the change to sipParseResult().


2003/11/23 17:04:10 phil
Removed qInstallPathSysconf() on Windows.
Removed tqInstallPathSysconf() on Windows.


2003/11/22 20:54:01 phil
@@ -1325,9 +1325,9 @@ Fixed the internal build system (again).
Fixed TQIODevice handwritten code which looked very broken.
Checked all virtual abstract functions that need handwritten code.
Added /TransferBack/ for function return values where needed.
Added the missing qInstallPath(), qInstallPathDocs(), qInstallPathHeaders(),
qInstallPathLibs(), qInstallPathBins(), qInstallPathPlugins(),
qInstallPathData(), qInstallPathTranslations(), qInstallPathSysconf().
Added the missing tqInstallPath(), tqInstallPathDocs(), tqInstallPathHeaders(),
tqInstallPathLibs(), tqInstallPathBins(), tqInstallPathPlugins(),
tqInstallPathData(), tqInstallPathTranslations(), tqInstallPathSysconf().
Made sure all handwritten code uses functions that are part of the SIP v4 API.


@@ -1940,7 +1940,7 @@ TQIMComposeEvent, TQMutexLocker and TQSyntaxHighlighter TQt 3.1.0 classes.
TQListView.sort() is now virtual for TQt3.
Fixed a bug in the widgets.py example for both TQt2 and TQt3.
Updated pyuic from TQt 3.1.0.
Added the qCompress and tqUncompress TQt 3.1.0 functions.
Added the tqCompress and tqUncompress TQt 3.1.0 functions.


2002/11/06 23:56:57 phil
@@ -2733,7 +2733,7 @@ Minor fixes for pyuic3.


2001/11/17 14:48:19 phil
Added the missing qInitNetworkProtocols() function to the qtnetwork module.
Added the missing tqInitNetworkProtocols() function to the qtnetwork module.
Added the missing TQRect.contains() variant.
Changed TQByteArray, TQCString and TQString %ConvertToTypeCode to convert None
objects to empty instances.


+ 5
- 5
NEWS View File

@@ -119,9 +119,9 @@ v3.9 7th December 2003
- Added the TQImageIO and TQListViewItemIterator classes.
- Added the TQDockArea << and >> operators.
- Added readBoolEntry() to TQSettings.
- Added qInstallPath(), qInstallPathDocs(), qInstallPathHeaders(),
qInstallPathLibs(), qInstallPathBins(), qInstallPathPlugins(),
qInstallPathData(), qInstallPathTranslations(), qInstallPathSysconf().
- Added tqInstallPath(), tqInstallPathDocs(), tqInstallPathHeaders(),
tqInstallPathLibs(), tqInstallPathBins(), tqInstallPathPlugins(),
tqInstallPathData(), tqInstallPathTranslations(), tqInstallPathSysconf().
- A new (configure.py) build system has been added which is independent of
tmake and qmake and installs a pyqtconfig module. The old (build.py) build
system remains.
@@ -185,7 +185,7 @@ v3.5 11th December 2002
- Support for TQt v3.0.6, v3.1.0 and v3.1.1 added.
- Added the TQt v3.1.x TQAssistantClient, TQEventLoop, TQIconFactory,
- TQIMComposeEvent, TQMutexLocker and TQSyntaxHighlighter classes, and
qCompress() and tqUncompress functions.
tqCompress() and tqUncompress functions.
- Removed eric from the distribution as it is now packaged separately.
- The SQL examples now support PostgreSQL as well as MySQL.
- Added the TQtopia v1.5.0 AppLnk, AppLnkSet, Config, DateFormat, DocLnk,
@@ -319,7 +319,7 @@ v3.0 17th November 2001
TQSqlField, TQSqlFieldInfo, TQSqlForm, TQSqlIndex, TQSqlPropertyMap, TQSqlQuery,
TQSqlRecord, TQSqlRecordInfo, TQSqlResult, TQStyleFactory, TQStyleOption,
TQTabletEvent, TQTextEdit, TQTimeEdit and TQWindowsMime TQt3 classes.
- Added the missing qInitNetworkProtocols() function to the qtnetwork module.
- Added the missing tqInitNetworkProtocols() function to the qtnetwork module.
- Removed the TQTableHeader class and TQTabWidget.selected() as they are not
part of the documented API.
- Removed the /Transfer/ flag on the TQWidget parameters of


+ 1
- 1
examples3/canvas/canvas.py View File

@@ -563,7 +563,7 @@ class Main (TQMainWindow):
#ifndef QT_NO_PROGRESSDIALOG
#progress.setProgress( rows )
#endif
#// qDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );
#// tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() );

def addRectangle(self):
i = TQCanvasRectangle( self.canvas.width()*random.random()%self.canvas.width(),


+ 1
- 1
examples3/progress.py View File

@@ -210,7 +210,7 @@ class CPUWaster(TQWidget):
def draw(self, n):
if self.timer_driven:
if self.pb:
qWarning("This cannot happen!")
tqWarning("This cannot happen!")
return

self.rects = n


+ 3
- 3
pylupdate3/fetchtr.cpp View File

@@ -262,7 +262,7 @@ static int getToken()
if ( yyCh != quoteChar ) {
printf("%c\n", yyCh);
qWarning( "%s:%d: Unterminated string",
tqWarning( "%s:%d: Unterminated string",
(const char *) yyFileName, yyLineNo );
}
@@ -434,7 +434,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
}

if ( yyParenDepth != 0 )
qWarning( "%s: Unbalanced parentheses in Python code",
tqWarning( "%s: Unbalanced parentheses in Python code",
(const char *) yyFileName );
}

@@ -444,7 +444,7 @@ void fetchtr_py( const char *fileName, MetaTranslator *tor,
yyInFile = fopen( fileName, "r" );
if ( yyInFile == 0 ) {
if ( mustExist )
qWarning( "pylupdate error: cannot open Python source file '%s': %s",
tqWarning( "pylupdate error: cannot open Python source file '%s': %s",
fileName, strerror(errno) );
return;
}


+ 7
- 7
pylupdate3/main.cpp View File

@@ -51,7 +51,7 @@ typedef TQValueList<MetaTranslatorMessage> TML;

static void printUsage()
{
qWarning( "Usage: pylupdate [options] file.pro...\n"
tqWarning( "Usage: pylupdate [options] file.pro...\n"
"Options:\n"
" -help Display this information and exits\n"
" -noobsolete\n"
@@ -80,14 +80,14 @@ int main( int argc, char **argv )
verbose = TRUE;
continue;
} else if ( qstrcmp(argv[i], "-version") == 0 ) {
qWarning( "pylupdate version %s", TQT_VERSION_STR );
tqWarning( "pylupdate version %s", TQT_VERSION_STR );
return 0;
}

numProFiles++;
TQFile f( argv[i] );
if ( !f.open(IO_ReadOnly) ) {
qWarning( "pylupdate error: Cannot open project file '%s': %s",
tqWarning( "pylupdate error: Cannot open project file '%s': %s",
argv[i], strerror(errno) );
return 1;
}
@@ -129,20 +129,20 @@ int main( int argc, char **argv )
if ( !codec.isEmpty() )
tor.setCodec( codec );
if ( verbose )
qWarning( "Updating '%s'...", (*tf).latin1() );
tqWarning( "Updating '%s'...", (*tf).latin1() );
merge( &tor, &fetchedTor, verbose );
if ( noObsolete )
tor.stripObsoleteMessages();
tor.stripEmptyContexts();
if ( !tor.save(*tf) )
qWarning( "pylupdate error: Cannot save '%s': %s", (*tf).latin1(),
tqWarning( "pylupdate error: Cannot save '%s': %s", (*tf).latin1(),
strerror(errno) );
}
if ( !metSomething ) {
qWarning( "pylupdate warning: File '%s' does not look like a project"
tqWarning( "pylupdate warning: File '%s' does not look like a project"
" file", argv[i] );
} else if ( translatorFiles.isEmpty() ) {
qWarning( "pylupdate warning: Met no 'TRANSLATIONS' entry in project"
tqWarning( "pylupdate warning: Met no 'TRANSLATIONS' entry in project"
" file '%s'", argv[i] );
}
}


+ 1
- 1
pylupdate3/merge.cpp View File

@@ -105,6 +105,6 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose )
applyNumberHeuristic( tor, verbose );

if ( verbose )
qWarning( " %d known, %d new and %d obsoleted messages",
tqWarning( " %d known, %d new and %d obsoleted messages",
known, neww, obsoleted );
}

+ 2
- 2
pylupdate3/metatranslator.cpp View File

@@ -175,7 +175,7 @@ bool TsHandler::fatalError( const TQXmlParseException& exception )
exception.lineNumber(), exception.columnNumber(),
exception.message().latin1() );
if ( tqApp == 0 )
qWarning( "XML error: %s", msg.latin1() );
tqWarning( "XML error: %s", msg.latin1() );
else
TQMessageBox::information( tqApp->mainWidget(),
TQObject::tr("TQt Linguist"), msg );
@@ -453,7 +453,7 @@ bool MetaTranslator::release( const TQString& filename, bool verbose ) const

bool saved = tor.save( filename, TQTranslator::Stripped );
if ( saved && verbose )
qWarning( " %d finished, %d unfinished and %d untranslated messages",
tqWarning( " %d finished, %d unfinished and %d untranslated messages",
finished, unfinished, untranslated );
return saved;


+ 1
- 1
pylupdate3/numberh.cpp View File

@@ -225,6 +225,6 @@ void applyNumberHeuristic( MetaTranslator *tor, bool verbose )
}
}
if ( verbose && inserted != 0 )
qWarning( " number heuristic provided %d translation%s",
tqWarning( " number heuristic provided %d translation%s",
inserted, inserted == 1 ? "" : "s" );
}

+ 1
- 1
pylupdate3/sametexth.cpp View File

@@ -73,6 +73,6 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose )
}
}
if ( verbose && inserted != 0 )
qWarning( " same-text heuristic provided %d translation%s",
tqWarning( " same-text heuristic provided %d translation%s",
inserted, inserted == 1 ? "" : "s" );
}

+ 3
- 3
pyuic2/uic.cpp View File

@@ -1552,13 +1552,13 @@ int main( int argc, char * argv[] )

TQFile file( fileName );
if ( !file.open( IO_ReadOnly ) )
qFatal( "pyuic: Could not open file '%s' ", (const char *)fileName );
tqFatal( "pyuic: Could not open file '%s' ", (const char *)fileName );

TQFile fileOut;
if (!outputFile.isEmpty()) {
fileOut.setName( outputFile );
if (!fileOut.open( IO_WriteOnly ) )
qFatal( "pyuic: Could not open output file '%s'", (const char *)outputFile );
tqFatal( "pyuic: Could not open output file '%s'", (const char *)outputFile );
} else {
fileOut.open( IO_WriteOnly, stdout );
}
@@ -1567,7 +1567,7 @@ int main( int argc, char * argv[] )

TQDomDocument doc;
if ( !doc.setContent( &file ) )
qFatal( "pyuic: Failed to parse %s\n", (const char *)fileName );
tqFatal( "pyuic: Failed to parse %s\n", (const char *)fileName );

out << "# Form implementation generated from reading ui file '" << fileName << "'" << endl;
out << "#" << endl;


+ 1
- 1
pyuic3/embed.cpp View File

@@ -67,7 +67,7 @@ static TQString convertToCIdentifier( const char *s )
static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
{
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
TQByteArray bazip( qCompress( input, nbytes ) );
TQByteArray bazip( tqCompress( input, nbytes ) );
uint len = bazip.size();
#else
uint len = (uint)nbytes;


+ 4
- 4
pyuic3/main.cpp View File

@@ -165,7 +165,7 @@ int main( int argc, char * argv[] )
if ( !outputFile.isEmpty() ) {
fileOut.setName( outputFile );
if (!fileOut.open( IO_WriteOnly ) )
qFatal( "pyuic: Could not open output file '%s'", outputFile.data() );
tqFatal( "pyuic: Could not open output file '%s'", outputFile.data() );
} else {
fileOut.open( IO_WriteOnly, stdout );
}
@@ -182,17 +182,17 @@ int main( int argc, char * argv[] )
out.setEncoding( TQTextStream::UnicodeUTF8 );
TQFile file( fileName );
if ( !file.open( IO_ReadOnly ) )
qFatal( "pyuic: Could not open file '%s' ", fileName );
tqFatal( "pyuic: Could not open file '%s' ", fileName );

TQDomDocument doc;
TQString errMsg;
int errLine;
if ( !doc.setContent( &file, &errMsg, &errLine ) )
qFatal( TQString("pyuic: Failed to parse %s: ") + errMsg + TQString (" in line %d\n"), fileName, errLine );
tqFatal( TQString("pyuic: Failed to parse %s: ") + errMsg + TQString (" in line %d\n"), fileName, errLine );

TQDomElement e = doc.firstChild().toElement();
if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) {
qWarning( TQString("pyuic: File generated with too recent version of TQt Designer (%s vs. %s)"),
tqWarning( TQString("pyuic: File generated with too recent version of TQt Designer (%s vs. %s)"),
e.attribute("version").latin1(), TQT_VERSION_STR );
return 1;
}


+ 2
- 2
sip/qt/qbytearray.sip View File

@@ -196,8 +196,8 @@ public:


%If (TQt_3_1_0 -)
TQByteArray qCompress(const uchar * /Array/,int /ArraySize/);
TQByteArray qCompress(const TQByteArray &);
TQByteArray tqCompress(const uchar * /Array/,int /ArraySize/);
TQByteArray tqCompress(const TQByteArray &);
TQByteArray tqUncompress(const uchar * /Array/,int /ArraySize/);
TQByteArray tqUncompress(const TQByteArray &);
%End

+ 10
- 10
sip/qt/qglobal.sip View File

@@ -52,23 +52,23 @@ typedef long long Q_LONG;
typedef unsigned long long Q_ULONG;
%End

const char *qVersion();
const char *tqVersion();

%If (TQt_3_0_0 -)
%End

%If (TQt_3_1_0 -)
const char *qInstallPath();
const char *qInstallPathDocs();
const char *qInstallPathHeaders();
const char *qInstallPathLibs();
const char *qInstallPathBins();
const char *qInstallPathPlugins();
const char *qInstallPathData();
const char *tqInstallPath();
const char *tqInstallPathDocs();
const char *tqInstallPathHeaders();
const char *tqInstallPathLibs();
const char *tqInstallPathBins();
const char *tqInstallPathPlugins();
const char *tqInstallPathData();
%End
%If (TQt_3_2_0 -)
const char *qInstallPathTranslations();
const char *tqInstallPathTranslations();
%If (!WS_WIN)
const char *qInstallPathSysconf();
const char *tqInstallPathSysconf();
%End
%End

+ 2
- 2
sip/qtnetwork/qnetwork.sip View File

@@ -1,4 +1,4 @@
// This is the SIP interface definition for qInitNetworkProtocols.
// This is the SIP interface definition for tqInitNetworkProtocols.
//
// Copyright (c) 2007
// Riverbank Computing Limited <info@riverbankcomputing.co.uk>
@@ -28,7 +28,7 @@
#include <tqnetwork.h>
%End

void qInitNetworkProtocols();
void tqInitNetworkProtocols();

%End
%End

Loading…
Cancel
Save