Fix linear alphabet string errors

pull/1/head
Timothy Pearson 13 years ago
parent b5ceb719aa
commit 86715ac657

@ -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 # Apply changes that should have been made but were not
find ./ -type f -iname "*" -exec sed -i 's/aboutQt/aboutTQt/g' {} \; 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 # Apply patches
patch -p0 < ../tqt3_fixups.diff patch -p0 < ../tqt3_fixups.diff

@ -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 void randStr(sqlite_func *context, int argc, const char **argv){
static const unsigned char zSrc[] = static const unsigned char zSrc[] =
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789" "0123456789"
".-!,:*^+=_|?/<> "; ".-!,:*^+=_|?/<> ";
int iMin, iMax, n, r, i; int iMin, iMax, n, r, i;

@ -787,7 +787,7 @@ int sqliteOsTempFileName(char *zBuf){
}; };
static unsigned char zChars[] = static unsigned char zChars[] =
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789"; "0123456789";
int i, j; int i, j;
struct stat buf; struct stat buf;
@ -812,7 +812,7 @@ int sqliteOsTempFileName(char *zBuf){
#if OS_WIN #if OS_WIN
static char zChars[] = static char zChars[] =
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789"; "0123456789";
int i, j; int i, j;
char zTempPath[STQLITE_TEMPNAME_SIZE]; char zTempPath[STQLITE_TEMPNAME_SIZE];
@ -833,7 +833,7 @@ int sqliteOsTempFileName(char *zBuf){
#if OS_MAC #if OS_MAC
static char zChars[] = static char zChars[] =
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789"; "0123456789";
int i, j; int i, j;
char zTempPath[STQLITE_TEMPNAME_SIZE]; char zTempPath[STQLITE_TEMPNAME_SIZE];

@ -805,7 +805,7 @@ void sqliteRealToSortable(double r, char *z){
** This means we can not use the traditional base-64 digit set. */ ** This means we can not use the traditional base-64 digit set. */
static const char zDigit[] = static const char zDigit[] =
"0123456789" "0123456789"
"ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"|~"; "|~";
if( r<0.0 ){ if( r<0.0 ){

@ -2856,7 +2856,7 @@ static const char* xpm_color_name( int cpp, int index )
{ {
static char returnable[5]; static char returnable[5];
static const char code[] = ".#abcdefghijklmnopqrstuvwxyzABCD" static const char code[] = ".#abcdefghijklmnopqrstuvwxyzABCD"
"EFGHIJKLMNOPTQRSTUVWXYZ0123456789"; "EFGHIJKLMNOPQRSTUVWXYZ0123456789";
// cpp is limited to 4 and index is limited to 64^cpp // cpp is limited to 4 and index is limited to 64^cpp
if ( cpp > 1 ) { if ( cpp > 1 ) {
if ( cpp > 2 ) { if ( cpp > 2 ) {
@ -8894,7 +8894,7 @@ static const char* xpm_color_name( int cpp, int index )
{ {
static char returnable[5]; static char returnable[5];
static const char code[] = ".#abcdefghijklmnopqrstuvwxyzABCD" static const char code[] = ".#abcdefghijklmnopqrstuvwxyzABCD"
"EFGHIJKLMNOPTQRSTUVWXYZ0123456789"; "EFGHIJKLMNOPQRSTUVWXYZ0123456789";
// cpp is limited to 4 and index is limited to 64^cpp // cpp is limited to 4 and index is limited to 64^cpp
if ( cpp > 1 ) { if ( cpp > 1 ) {
if ( cpp > 2 ) { if ( cpp > 2 ) {

@ -91,7 +91,7 @@ void OutputWindow::setupError()
errorView->addColumn( tr( "Location" ) ); errorView->addColumn( tr( "Location" ) );
errorView->setResizeMode( TQListView::LastColumn ); errorView->setResizeMode( TQListView::LastColumn );
errorView->setColumnWidth( 0, errorView->fontMetrics().width( "WARNING1234" ) ); 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->setColumnWidth( 2, errorView->fontMetrics().width( "9999999" ) );
errorView->setColumnAlignment( 2, TQt::AlignRight ); errorView->setColumnAlignment( 2, TQt::AlignRight );
errorView->setAllColumnsShowFocus( TRUE ); errorView->setAllColumnsShowFocus( TRUE );

@ -276,7 +276,7 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin
else else
paragData = new ParagData; paragData = new ParagData;
TQString alphabeth = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ"; TQString alphabeth = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
TQString mathChars = "xXeE"; TQString mathChars = "xXeE";
TQString numbers = "0123456789"; TQString numbers = "0123456789";
bool questionMark = FALSE; bool questionMark = FALSE;

Loading…
Cancel
Save