summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-25 16:12:45 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-25 16:12:45 -0600
commit86715ac657b0c8a37b27fa72215d7d2c88508dd9 (patch)
treea9fcba0d6a5d22fd4f8cfa3fe3c13e5dc8dcf3d7
parentb5ceb719aabb997aaeaf578622845c384e6b3021 (diff)
downloadexperimental-86715ac657b0c8a37b27fa72215d7d2c88508dd9.tar.gz
experimental-86715ac657b0c8a37b27fa72215d7d2c88508dd9.zip
Fix linear alphabet string errors
-rwxr-xr-xqt3-tqt3/convert_qt_itself_qt33
-rw-r--r--tqtinterface/qt4/src/3rdparty/sqlite/func.c2
-rw-r--r--tqtinterface/qt4/src/3rdparty/sqlite/os.c6
-rw-r--r--tqtinterface/qt4/src/3rdparty/sqlite/util.c2
-rw-r--r--tqtinterface/qt4/src/kernel/tqimage.cpp4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/outputwindow.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp2
7 files changed, 11 insertions, 10 deletions
diff --git a/qt3-tqt3/convert_qt_itself_qt3 b/qt3-tqt3/convert_qt_itself_qt3
index 9520401..d5ed6de 100755
--- a/qt3-tqt3/convert_qt_itself_qt3
+++ b/qt3-tqt3/convert_qt_itself_qt3
@@ -67,7 +67,8 @@ find ./ -type f -iname "*" -exec sed -i 's/retquire/require/g' {} \;
# Apply changes that should have been made but were not
find ./ -type f -iname "*" -exec sed -i 's/aboutQt/aboutTQt/g' {} \;
-# Rename the headers
+# Back out linear alphabet string changes
+find ./ -type f -iname "*" -not -iwholename '*.git*' -exec sed -i 's/MNOPTQR/MNOPQR/g' {} \;
# Apply patches
patch -p0 < ../tqt3_fixups.diff
diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/func.c b/tqtinterface/qt4/src/3rdparty/sqlite/func.c
index 529b169..3c6c85f 100644
--- a/tqtinterface/qt4/src/3rdparty/sqlite/func.c
+++ b/tqtinterface/qt4/src/3rdparty/sqlite/func.c
@@ -365,7 +365,7 @@ static void soundexFunc(sqlite_func *context, int argc, const char **argv){
static void randStr(sqlite_func *context, int argc, const char **argv){
static const unsigned char zSrc[] =
"abcdefghijklmnopqrstuvwxyz"
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789"
".-!,:*^+=_|?/<> ";
int iMin, iMax, n, r, i;
diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/os.c b/tqtinterface/qt4/src/3rdparty/sqlite/os.c
index d9b4ee7..7918f81 100644
--- a/tqtinterface/qt4/src/3rdparty/sqlite/os.c
+++ b/tqtinterface/qt4/src/3rdparty/sqlite/os.c
@@ -787,7 +787,7 @@ int sqliteOsTempFileName(char *zBuf){
};
static unsigned char zChars[] =
"abcdefghijklmnopqrstuvwxyz"
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789";
int i, j;
struct stat buf;
@@ -812,7 +812,7 @@ int sqliteOsTempFileName(char *zBuf){
#if OS_WIN
static char zChars[] =
"abcdefghijklmnopqrstuvwxyz"
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789";
int i, j;
char zTempPath[STQLITE_TEMPNAME_SIZE];
@@ -833,7 +833,7 @@ int sqliteOsTempFileName(char *zBuf){
#if OS_MAC
static char zChars[] =
"abcdefghijklmnopqrstuvwxyz"
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789";
int i, j;
char zTempPath[STQLITE_TEMPNAME_SIZE];
diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/util.c b/tqtinterface/qt4/src/3rdparty/sqlite/util.c
index d3813a4..42f7482 100644
--- a/tqtinterface/qt4/src/3rdparty/sqlite/util.c
+++ b/tqtinterface/qt4/src/3rdparty/sqlite/util.c
@@ -805,7 +805,7 @@ void sqliteRealToSortable(double r, char *z){
** This means we can not use the traditional base-64 digit set. */
static const char zDigit[] =
"0123456789"
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"|~";
if( r<0.0 ){
diff --git a/tqtinterface/qt4/src/kernel/tqimage.cpp b/tqtinterface/qt4/src/kernel/tqimage.cpp
index 3483e2a..843f49e 100644
--- a/tqtinterface/qt4/src/kernel/tqimage.cpp
+++ b/tqtinterface/qt4/src/kernel/tqimage.cpp
@@ -2856,7 +2856,7 @@ static const char* xpm_color_name( int cpp, int index )
{
static char returnable[5];
static const char code[] = ".#abcdefghijklmnopqrstuvwxyzABCD"
- "EFGHIJKLMNOPTQRSTUVWXYZ0123456789";
+ "EFGHIJKLMNOPQRSTUVWXYZ0123456789";
// cpp is limited to 4 and index is limited to 64^cpp
if ( cpp > 1 ) {
if ( cpp > 2 ) {
@@ -8894,7 +8894,7 @@ static const char* xpm_color_name( int cpp, int index )
{
static char returnable[5];
static const char code[] = ".#abcdefghijklmnopqrstuvwxyzABCD"
- "EFGHIJKLMNOPTQRSTUVWXYZ0123456789";
+ "EFGHIJKLMNOPQRSTUVWXYZ0123456789";
// cpp is limited to 4 and index is limited to 64^cpp
if ( cpp > 1 ) {
if ( cpp > 2 ) {
diff --git a/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp b/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp
index 7ffb541..2de538a 100644
--- a/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp
@@ -91,7 +91,7 @@ void OutputWindow::setupError()
errorView->addColumn( tr( "Location" ) );
errorView->setResizeMode( TQListView::LastColumn );
errorView->setColumnWidth( 0, errorView->fontMetrics().width( "WARNING1234" ) );
- errorView->setColumnWidth( 1, errorView->fontMetrics().width( "ABCDEFGHIJKLMNOPTQRSTUVWXYZABCDEFGHIJKLMNOPTQRSTUVWXYZABCDEFGHIJKLMNOP" ) );
+ errorView->setColumnWidth( 1, errorView->fontMetrics().width( "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOP" ) );
errorView->setColumnWidth( 2, errorView->fontMetrics().width( "9999999" ) );
errorView->setColumnAlignment( 2, TQt::AlignRight );
errorView->setAllColumnsShowFocus( TRUE );
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
index 0217682..daf8717 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
@@ -276,7 +276,7 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin
else
paragData = new ParagData;
- TQString alphabeth = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ";
+ TQString alphabeth = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
TQString mathChars = "xXeE";
TQString numbers = "0123456789";
bool questionMark = FALSE;