From 37fb993b5bf233e38f304df8fb8ec88c7a2fdce8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 25 Jan 2012 16:19:45 -0600 Subject: [PATCH] Fix linear alphabet string errors --- src/3rdparty/sqlite/func.c | 2 +- src/3rdparty/sqlite/os.c | 6 +++--- src/3rdparty/sqlite/util.c | 2 +- src/kernel/qimage.cpp | 2 +- tools/designer/designer/outputwindow.cpp | 2 +- tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/3rdparty/sqlite/func.c b/src/3rdparty/sqlite/func.c index f580a7d4..fe67d130 100644 --- a/src/3rdparty/sqlite/func.c +++ b/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/src/3rdparty/sqlite/os.c b/src/3rdparty/sqlite/os.c index afbf7e06..3130bdee 100644 --- a/src/3rdparty/sqlite/os.c +++ b/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[SQLITE_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[SQLITE_TEMPNAME_SIZE]; diff --git a/src/3rdparty/sqlite/util.c b/src/3rdparty/sqlite/util.c index 6dbaba78..074afedf 100644 --- a/src/3rdparty/sqlite/util.c +++ b/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/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index 252e5240..edc77a85 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -5867,7 +5867,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/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp index 1219201d..73160946 100644 --- a/tools/designer/designer/outputwindow.cpp +++ b/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/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp index ff720440..5d4441fd 100644 --- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp +++ b/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;