From: mrjohnson <mrj...@us...> - 2005-02-25 04:57:00
|
Update of /cvsroot/tora/tora In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14254 Modified Files: main.cpp Log Message: fix whitespace Index: main.cpp =================================================================== RCS file: /cvsroot/tora/tora/main.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** main.cpp 23 Feb 2005 23:47:13 -0000 1.76 --- main.cpp 25 Feb 2005 04:56:52 -0000 1.77 *************** *** 4,18 **** * Copyright (C) 2003-2005 Quest Software, Inc * Portions Copyright (C) 2005 Other Contributors ! * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; only version 2 of * the License is valid for this program. ! * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. ! * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software --- 4,18 ---- * Copyright (C) 2003-2005 Quest Software, Inc * Portions Copyright (C) 2005 Other Contributors ! * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; only version 2 of * the License is valid for this program. ! * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. ! * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software *************** *** 114,118 **** if (!toTool::globalConfig(CONF_TOAD_BINDINGS,DEFAULT_TOAD_BINDINGS).isEmpty()) { if (!toadbindings.load(tora_toad,sizeof(tora_toad))) ! printf("Internal error, couldn't load TOAD bindings"); qApp->installTranslator(&toadbindings); } --- 114,118 ---- if (!toTool::globalConfig(CONF_TOAD_BINDINGS,DEFAULT_TOAD_BINDINGS).isEmpty()) { if (!toadbindings.load(tora_toad,sizeof(tora_toad))) ! printf("Internal error, couldn't load TOAD bindings"); qApp->installTranslator(&toadbindings); } *************** *** 144,148 **** for (unsigned int i=0;i<d.count();i++) { ! failed.insert(failed.end(),d.filePath(d[i])); } QProgressBar *progress=splash.progress(); --- 144,148 ---- for (unsigned int i=0;i<d.count();i++) { ! failed.insert(failed.end(),d.filePath(d[i])); } QProgressBar *progress=splash.progress(); *************** *** 153,176 **** bool success; do { ! success=false; ! std::list<QString> current=failed; ! failed.clear(); ! for(std::list<QString>::iterator i=current.begin();i!=current.end();i++) { ! if (!dlopen(*i,RTLD_NOW|RTLD_GLOBAL)) { ! failed.insert(failed.end(),*i); ! } else { ! success=true; ! progress->setProgress(progress->progress()+1); ! QFileInfo file(*i); ! label->setText(qApp->translate("main","Loaded plugin %1").arg(file.fileName())); ! qApp->processEvents(); ! } ! } } while(failed.begin()!=failed.end()&&success); for(std::list<QString>::iterator i=failed.begin();i!=failed.end();i++) ! if (!dlopen(*i,RTLD_NOW|RTLD_GLOBAL)) ! fprintf(stderr,"Failed to load %s\n %s\n", ! (const char *)(*i),dlerror()); } #endif --- 153,176 ---- bool success; do { ! success=false; ! std::list<QString> current=failed; ! failed.clear(); ! for(std::list<QString>::iterator i=current.begin();i!=current.end();i++) { ! if (!dlopen(*i,RTLD_NOW|RTLD_GLOBAL)) { ! failed.insert(failed.end(),*i); ! } else { ! success=true; ! progress->setProgress(progress->progress()+1); ! QFileInfo file(*i); ! label->setText(qApp->translate("main","Loaded plugin %1").arg(file.fileName())); ! qApp->processEvents(); ! } ! } } while(failed.begin()!=failed.end()&&success); for(std::list<QString>::iterator i=failed.begin();i!=failed.end();i++) ! if (!dlopen(*i,RTLD_NOW|RTLD_GLOBAL)) ! fprintf(stderr,"Failed to load %s\n %s\n", ! (const char *)(*i),dlerror()); } #endif *************** *** 185,194 **** QCString nls=getenv("NLS_LANG"); if (nls.isEmpty()) ! nls="american_america.UTF8"; else { ! int pos=nls.findRev('.'); ! if (pos>0) ! nls=nls.left(pos); ! nls+=".UTF8"; } toSetEnv("NLS_LANG",nls); --- 185,194 ---- QCString nls=getenv("NLS_LANG"); if (nls.isEmpty()) ! nls="american_america.UTF8"; else { ! int pos=nls.findRev('.'); ! if (pos>0) ! nls=nls.left(pos); ! nls+=".UTF8"; } toSetEnv("NLS_LANG",nls); *************** *** 198,202 **** toAbout *about=new toAbout(0,NULL,"About " TOAPPNAME,true); if (!about->exec()) { ! exit (2); } delete about; --- 198,202 ---- toAbout *about=new toAbout(0,NULL,"About " TOAPPNAME,true); if (!about->exec()) { ! exit (2); } delete about; *************** *** 210,215 **** } ! toQValue::setNumberFormat(toTool::globalConfig(CONF_NUMBER_FORMAT,DEFAULT_NUMBER_FORMAT).toInt(), ! toTool::globalConfig(CONF_NUMBER_DECIMALS,DEFAULT_NUMBER_DECIMALS).toInt()); if (qApp->argc()>2||(qApp->argc()==2&&qApp->argv()[1][0]=='-')) { --- 210,216 ---- } ! toQValue::setNumberFormat( ! toTool::globalConfig(CONF_NUMBER_FORMAT,DEFAULT_NUMBER_FORMAT).toInt(), ! toTool::globalConfig(CONF_NUMBER_DECIMALS,DEFAULT_NUMBER_DECIMALS).toInt()); if (qApp->argc()>2||(qApp->argc()==2&&qApp->argv()[1][0]=='-')) { *************** *** 221,247 **** int pos=connect.find(QString::fromLatin1("@")); if (pos>-1) { ! user=connect.left(pos); ! connect=connect.right(connect.length()-pos-1); } else { ! user=connect; ! if (getenv("ORACLE_SID")) ! connect=QString::fromLatin1(getenv("ORACLE_SID")); } if (!connect.isEmpty()) ! toTool::globalSetConfig(CONF_DATABASE,connect); pos=user.find(QString::fromLatin1("/")); if (pos>-1) { ! toTool::globalSetConfig(CONF_PASSWORD,user.right(user.length()-pos-1)); ! user=user.left(pos); } if (!user.isEmpty()) ! toTool::globalSetConfig(CONF_USER,user); } ! toMarkedText::setDefaultTabStop(toTool::globalConfig(CONF_TAB_STOP,DEFAULT_TAB_STOP).toInt()); toUpdateIndicateEmpty(); ! new toMain; --- 222,249 ---- int pos=connect.find(QString::fromLatin1("@")); if (pos>-1) { ! user=connect.left(pos); ! connect=connect.right(connect.length()-pos-1); } else { ! user=connect; ! if (getenv("ORACLE_SID")) ! connect=QString::fromLatin1(getenv("ORACLE_SID")); } if (!connect.isEmpty()) ! toTool::globalSetConfig(CONF_DATABASE,connect); pos=user.find(QString::fromLatin1("/")); if (pos>-1) { ! toTool::globalSetConfig(CONF_PASSWORD,user.right(user.length()-pos-1)); ! user=user.left(pos); } if (!user.isEmpty()) ! toTool::globalSetConfig(CONF_USER,user); } ! toMarkedText::setDefaultTabStop( ! toTool::globalConfig(CONF_TAB_STOP,DEFAULT_TAB_STOP).toInt()); toUpdateIndicateEmpty(); ! new toMain; *************** *** 251,255 **** } catch (const QString &str) { fprintf(stderr,"Unhandled exception:\n\n%s\n", ! (const char *)str); TOMessageBox::critical(NULL, qApp->translate("main","Unhandled exception"), --- 253,257 ---- } catch (const QString &str) { fprintf(stderr,"Unhandled exception:\n\n%s\n", ! (const char *)str); TOMessageBox::critical(NULL, qApp->translate("main","Unhandled exception"), |