Menu
▾
▴
[Valgrind-valkyrie-dev] valkyrie: r481 - in branches/valkyrie_qt4port: . help objects options toolview
|
From: <sv...@va...> - 2010-03-04 22:02:36
|
Author: cerion
Date: 2010-03-04 22:02:19 +0000 (Thu, 04 Mar 2010)
New Revision: 481
Log:
a little cleanup - no functional changes
QApplication::translate() -> tr()
some spacing, etc.
Modified:
branches/valkyrie_qt4port/help/help_handbook.cpp
branches/valkyrie_qt4port/main.cpp
branches/valkyrie_qt4port/mainwindow.cpp
branches/valkyrie_qt4port/objects/valgrind_object.h
branches/valkyrie_qt4port/options/memcheck_options_page.cpp
branches/valkyrie_qt4port/options/vk_option.h
branches/valkyrie_qt4port/options/vk_options_dialog.cpp
branches/valkyrie_qt4port/options/vk_options_page.cpp
branches/valkyrie_qt4port/options/vk_parse_cmdline.cpp
branches/valkyrie_qt4port/options/vk_popt.cpp
branches/valkyrie_qt4port/toolview/helgrindview.cpp
branches/valkyrie_qt4port/toolview/memcheckview.cpp
Modified: branches/valkyrie_qt4port/help/help_handbook.cpp
===================================================================
--- branches/valkyrie_qt4port/help/help_handbook.cpp 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/help/help_handbook.cpp 2010-03-04 22:02:19 UTC (rev 481)
@@ -204,8 +204,9 @@
*/
void HandBook::openFile()
{
- QString fn = QFileDialog::getOpenFileName( this, "Open File", vkConfig->vkDocPath,
- "Html Files (*.html *.htm);;All Files (*)" );
+ QString fn = QFileDialog::getOpenFileName(
+ this, "Open File", vkConfig->vkDocPath,
+ "Html Files (*.html *.htm);;All Files (*)" );
if ( !fn.isEmpty() ) {
browser->setSource( fn );
}
@@ -293,17 +294,17 @@
// file menu
QMenu* fileMenu = new QMenu( menuBar );
fileMenu->setObjectName( QString::fromUtf8("handbook_fileMenu") );
- fileMenu->setTitle( QApplication::translate("MainWindowClass", "&File", 0, QApplication::UnicodeUTF8) );
+ fileMenu->setTitle( tr( "&File" ) );
menuBar->addAction( fileMenu->menuAction() );
QAction* actFile_Open = new QAction( this );
actFile_Open->setObjectName( QString::fromUtf8("handbook_actFile_Open") );
- actFile_Open->setText( QApplication::translate("HandBook", "Open File", 0, QApplication::UnicodeUTF8) );
+ actFile_Open->setText( tr( "Open File" ) );
connect( actFile_Open, SIGNAL( triggered() ), this, SLOT( openFile() ) );
QAction* actFile_Close = new QAction( this );
actFile_Close->setObjectName( QString::fromUtf8("handbook_actFile_Close") );
- actFile_Close->setText( QApplication::translate("HandBook", "Close", 0, QApplication::UnicodeUTF8) );
+ actFile_Close->setText( tr( "Close" ) );
connect( actFile_Close, SIGNAL( triggered() ), this, SLOT( close() ) );
fileMenu->addAction( actFile_Open );
@@ -314,30 +315,30 @@
// go menu
QMenu* goMenu = new QMenu( menuBar );
goMenu->setObjectName( QString::fromUtf8("handbook_goMenu") );
- goMenu->setTitle( QApplication::translate("MainWindowClass", "&Go", 0, QApplication::UnicodeUTF8) );
+ goMenu->setTitle( tr( "&Go" ) );
menuBar->addAction( goMenu->menuAction() );
QAction* actGo_Backward = new QAction( this );
actGo_Backward->setObjectName( QString::fromUtf8("handbook_actGo_Backward") );
- actGo_Backward->setText( QApplication::translate("HandBook", "Backward", 0, QApplication::UnicodeUTF8) );
+ actGo_Backward->setText( tr( "Backward" ) );
actGo_Backward->setIcon( QPixmap( QString::fromUtf8(":/vk_icons/icons/tb_handbook_back.xpm") ) );
connect( actGo_Backward, SIGNAL( triggered() ), browser, SLOT( backward() ) );
QAction* actGo_Forward = new QAction( this );
actGo_Forward->setObjectName( QString::fromUtf8("handbook_actGo_Forward") );
- actGo_Forward->setText( QApplication::translate("HandBook", "Forward", 0, QApplication::UnicodeUTF8) );
+ actGo_Forward->setText( tr( "Forward" ) );
actGo_Forward->setIcon( QPixmap( QString::fromUtf8(":/vk_icons/icons/tb_handbook_forward.xpm") ) );
connect( actGo_Forward, SIGNAL( triggered() ), browser, SLOT( forward() ) );
QAction* actGo_Home = new QAction( this );
actGo_Home->setObjectName( QString::fromUtf8("handbook_actGo_Home") );
- actGo_Home->setText( QApplication::translate("HandBook", "Home", 0, QApplication::UnicodeUTF8) );
+ actGo_Home->setText( tr( "Home" ) );
actGo_Home->setIcon( QPixmap( QString::fromUtf8(":/vk_icons/icons/tb_handbook_home.xpm") ) );
connect( actGo_Home, SIGNAL( triggered() ), browser, SLOT( home() ) );
QAction* actGo_Reload = new QAction( this );
actGo_Reload->setObjectName( QString::fromUtf8("handbook_actGo_Reload") );
- actGo_Reload->setText( QApplication::translate("HandBook", "Reload", 0, QApplication::UnicodeUTF8) );
+ actGo_Reload->setText( tr( "Reload" ) );
actGo_Reload->setIcon( QPixmap( QString::fromUtf8(":/vk_icons/icons/tb_handbook_reload.xpm") ) );
connect( actGo_Reload, SIGNAL( triggered() ), browser, SLOT( reload() ) );
@@ -357,7 +358,7 @@
// history menu
historyMenu = new QMenu( menuBar );
historyMenu->setObjectName( QString::fromUtf8("handbook_historyMenu") );
- historyMenu->setTitle( QApplication::translate("MainWindowClass", "History", 0, QApplication::UnicodeUTF8) );
+ historyMenu->setTitle( tr( "History" ) );
menuBar->addAction( historyMenu->menuAction() );
connect( historyMenu, SIGNAL( triggered( QAction* ) ),
this, SLOT( historyChosen( QAction* ) ) );
@@ -367,12 +368,12 @@
// bookmarks menu
bookmarkMenu = new QMenu( menuBar );
bookmarkMenu->setObjectName( QString::fromUtf8("handbook_bookmarkMenu") );
- bookmarkMenu->setTitle( QApplication::translate("MainWindowClass", "Bookmark", 0, QApplication::UnicodeUTF8) );
+ bookmarkMenu->setTitle( tr( "Bookmark" ) );
menuBar->addAction( bookmarkMenu->menuAction() );
QAction* actBM_AddBM = new QAction( this );
actBM_AddBM->setObjectName( QString::fromUtf8("handbook_actBM_AddBM") );
- actBM_AddBM->setText( QApplication::translate("HandBook", "Add Bookmark", 0, QApplication::UnicodeUTF8) );
+ actBM_AddBM->setText( tr( "Add Bookmark" ) );
connect( actBM_AddBM, SIGNAL( triggered() ), this, SLOT( addBookmark() ) );
bookmarkMenu->addAction( actBM_AddBM );
@@ -386,7 +387,7 @@
// dismiss button
QAction* act_dismiss = new QAction( this );
act_dismiss->setObjectName( QString::fromUtf8("act_dismiss") );
- act_dismiss->setText( QApplication::translate("HandBook", "Dismiss", 0, QApplication::UnicodeUTF8) );
+ act_dismiss->setText( tr( "Dismiss" ) );
connect( act_dismiss, SIGNAL( triggered() ),
this, SLOT( close() ) );
Modified: branches/valkyrie_qt4port/main.cpp
===================================================================
--- branches/valkyrie_qt4port/main.cpp 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/main.cpp 2010-03-04 22:02:19 UTC (rev 481)
@@ -90,7 +90,8 @@
// ------------------------------------------------------------
// Start up the gui
vkWin = new MainWindow( &valkyrie );
- if ( vkConfig->value( valkyrie.getOption( VALKYRIE::BINARY )->configKey() ).toString().isEmpty() ) {
+ if ( vkConfig->value(
+ valkyrie.getOption( VALKYRIE::BINARY )->configKey() ).toString().isEmpty() ) {
vkWin->openOptions();
}
vkWin->showToolView( VGTOOL::ID_MEMCHECK );
Modified: branches/valkyrie_qt4port/mainwindow.cpp
===================================================================
--- branches/valkyrie_qt4port/mainwindow.cpp 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/mainwindow.cpp 2010-03-04 22:02:19 UTC (rev 481)
@@ -77,7 +77,8 @@
lastPalette = qApp->palette();
QIcon icon_vk;
- icon_vk.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/valkyrie.xpm") ), QIcon::Normal, QIcon::Off );
+ icon_vk.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/valkyrie.xpm") ),
+ QIcon::Normal, QIcon::Off );
setWindowIcon( icon_vk );
// handbook: init before menubar / toolbar
@@ -190,96 +191,103 @@
actFile_NewProj = new QAction( this );
actFile_NewProj->setObjectName( QString::fromUtf8("actFile_NewProj") );
- actFile_NewProj->setText( QApplication::translate("MainWindowClass", "&New Project...", 0, QApplication::UnicodeUTF8) );
+ actFile_NewProj->setText( tr( "&New Project..." ) );
actFile_NewProj->setToolTip( tr("Create a project to save your configuration") );
QIcon icon_newproj;
- icon_newproj.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/filenew.png") ), QIcon::Normal, QIcon::Off );
+ icon_newproj.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/filenew.png") ),
+ QIcon::Normal, QIcon::Off );
actFile_NewProj->setIcon( icon_newproj );
connect( actFile_NewProj, SIGNAL( triggered() ), this, SLOT( createNewProject() ) );
actFile_OpenProj = new QAction( this );
actFile_OpenProj->setObjectName( QString::fromUtf8("actFile_OpenProj") );
- actFile_OpenProj->setText( QApplication::translate("MainWindowClass", "&Open Project...", 0, QApplication::UnicodeUTF8) );
+ actFile_OpenProj->setText( tr( "&Open Project..." ) );
actFile_OpenProj->setToolTip( tr("Open an existing project to load a saved configuration") );
QIcon icon_openproj;
- icon_openproj.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/folder_blue.png") ), QIcon::Normal, QIcon::Off );
+ icon_openproj.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/folder_blue.png") ),
+ QIcon::Normal, QIcon::Off );
actFile_OpenProj->setIcon( icon_openproj );
connect( actFile_OpenProj, SIGNAL( triggered() ), this, SLOT( openProject() ) );
actFile_Close = new QAction( this );
actFile_Close->setObjectName( QString::fromUtf8("actFile_Close") );
actFile_Close->setToolTip( tr("Close the currently active tool") );
- actFile_Close->setText( QApplication::translate("MainWindowClass", "&Close Tool", 0, QApplication::UnicodeUTF8) );
+ actFile_Close->setText( tr( "&Close Tool" ) );
connect( actFile_Close, SIGNAL( triggered() ), this, SLOT( closeToolView() ) );
actFile_Exit = new QAction( this );
actFile_Exit->setObjectName( QString::fromUtf8("actFile_Exit") );
- actFile_Exit->setText( QApplication::translate("MainWindowClass", "E&xit", 0, QApplication::UnicodeUTF8) );
+ actFile_Exit->setText( tr( "E&xit" ) );
actFile_Exit->setToolTip( tr("Exit Valkyrie") );
QIcon icon_exit;
- icon_exit.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/exit.png") ), QIcon::Normal, QIcon::Off );
+ icon_exit.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/exit.png") ),
+ QIcon::Normal, QIcon::Off );
actFile_Exit->setIcon( icon_exit );
connect( actFile_Exit, SIGNAL( triggered() ), qApp, SLOT( closeAllWindows() ) );
actEdit_Options = new QAction( this );
actEdit_Options->setObjectName( QString::fromUtf8("actEdit_Options") );
- actEdit_Options->setText( QApplication::translate("MainWindowClass", "O&ptions", 0, QApplication::UnicodeUTF8) );
+ actEdit_Options->setText( tr( "O&ptions" ) );
actEdit_Options->setToolTip( tr("Open the options-editing window") );
QIcon icon_options;
- icon_options.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/gear.png") ), QIcon::Normal, QIcon::Off );
+ icon_options.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/gear.png") ),
+ QIcon::Normal, QIcon::Off );
actEdit_Options->setIcon( icon_options );
connect( actEdit_Options, SIGNAL( triggered() ), this, SLOT( openOptions() ) );
actProcess_Run = new QAction( this );
actProcess_Run->setObjectName( QString::fromUtf8("actProcess_Run") );
- actProcess_Run->setText( QApplication::translate("MainWindowClass", "&Run", 0, QApplication::UnicodeUTF8) );
+ actProcess_Run->setText( tr( "&Run" ) );
actProcess_Run->setToolTip( tr("Run Valgrind with the currently active tool") );
- actProcess_Run->setShortcut( QApplication::translate("MainWindowClass", "Ctrl+R", 0, QApplication::UnicodeUTF8) );
+ actProcess_Run->setShortcut( QString::fromUtf8( "Ctrl+R" ) );
QIcon icon_run;
- icon_run.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/valgrind_run.png") ), QIcon::Normal, QIcon::Off );
+ icon_run.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/valgrind_run.png") ),
+ QIcon::Normal, QIcon::Off );
actProcess_Run->setIcon( icon_run );
actProcess_Run->setIconVisibleInMenu( true );
connect( actProcess_Run, SIGNAL( triggered() ), this, SLOT( runValgrind() ) );
actProcess_Stop = new QAction( this );
actProcess_Stop->setObjectName( QString::fromUtf8("actProcess_Stop") );
- actProcess_Stop->setText( QApplication::translate("MainWindowClass", "S&top", 0, QApplication::UnicodeUTF8) );
+ actProcess_Stop->setText( tr( "S&top" ) );
actProcess_Stop->setToolTip( tr("Stop Valgrind") );
QIcon icon_stop;
- icon_stop.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/valgrind_stop.png") ), QIcon::Normal, QIcon::Off );
+ icon_stop.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/valgrind_stop.png") ),
+ QIcon::Normal, QIcon::Off );
actProcess_Stop->setIcon( icon_stop );
connect( actProcess_Stop, SIGNAL( triggered() ), this, SLOT( stopTool() ) );
actHelp_Handbook = new QAction( this );
actHelp_Handbook->setObjectName( QString::fromUtf8("actHelp_Handbook") );
- actHelp_Handbook->setText( QApplication::translate("MainWindowClass", "Handbook", 0, QApplication::UnicodeUTF8) );
+ actHelp_Handbook->setText( tr( "Handbook" ) );
actHelp_Handbook->setToolTip( tr("Open the Valkyrie Handbook") );
- actHelp_Handbook->setShortcut( QApplication::translate("MainWindowClass", "F1", 0, QApplication::UnicodeUTF8) );
+ actHelp_Handbook->setShortcut( QString::fromUtf8( "F1" ) );
QIcon icon_handbook;
- icon_handbook.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/tb_handbook_help.xpm") ), QIcon::Normal, QIcon::Off );
+ icon_handbook.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/tb_handbook_help.xpm") ),
+ QIcon::Normal, QIcon::Off );
actHelp_Handbook->setIcon( icon_handbook );
connect( actHelp_Handbook, SIGNAL( triggered() ), this, SLOT( openHandBook() ) );
actHelp_About_Valkyrie = new QAction( this );
actHelp_About_Valkyrie->setObjectName( QString::fromUtf8("actHelp_About_Valkyrie") );
- actHelp_About_Valkyrie->setText( QApplication::translate("MainWindowClass", "About Valkyrie", 0, QApplication::UnicodeUTF8) );
+ actHelp_About_Valkyrie->setText( tr( "About Valkyrie" ) );
// actHelp_About_Valkyrie->setMenuRole( QAction::AboutRole );
connect( actHelp_About_Valkyrie, SIGNAL( triggered() ), this, SLOT( openAboutVk() ) );
actHelp_About_Qt = new QAction( this );
actHelp_About_Qt->setObjectName( QString::fromUtf8("actHelp_About_Qt") );
- actHelp_About_Qt->setText( QApplication::translate("MainWindowClass", "About Qt", 0, QApplication::UnicodeUTF8) );
+ actHelp_About_Qt->setText( tr( "About Qt" ) );
// actHelp_About_Qt->setMenuRole( QAction::AboutQtRole );
connect( actHelp_About_Qt, SIGNAL( triggered() ), qApp, SLOT( aboutQt() ) );
actHelp_License = new QAction( this );
actHelp_License->setObjectName( QString::fromUtf8("actHelp_License") );
- actHelp_License->setText( QApplication::translate("MainWindowClass", "License", 0, QApplication::UnicodeUTF8) );
+ actHelp_License->setText( tr( "License" ) );
connect( actHelp_License, SIGNAL( triggered() ), this, SLOT( openAboutLicense() ) );
actHelp_Support = new QAction( this );
actHelp_Support->setObjectName( QString::fromUtf8("actHelp_Support") );
- actHelp_Support->setText( QApplication::translate("MainWindowClass", "Support", 0, QApplication::UnicodeUTF8) );
+ actHelp_Support->setText( tr( "Support" ) );
connect( actHelp_Support, SIGNAL( triggered() ), this, SLOT( openAboutSupport() ) );
@@ -291,7 +299,8 @@
connect( toolActionGroup, SIGNAL( triggered( QAction* ) ), this, SLOT( toolGroupTriggered( QAction* ) ) );
QIcon icon_bullet;
- icon_bullet.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/tb_mainwin_blackbullet.xpm") ), QIcon::Normal, QIcon::Off );
+ icon_bullet.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/tb_mainwin_blackbullet.xpm") ),
+ QIcon::Normal, QIcon::Off );
ToolObjList tools = valkyrie->valgrind()->getToolObjList();
vk_assert( tools.size() > 0 );
@@ -330,23 +339,23 @@
menuFile = new QMenu( menuBar );
menuFile->setObjectName( QString::fromUtf8("menuFile") );
- menuFile->setTitle( QApplication::translate("MainWindowClass", "&File", 0, QApplication::UnicodeUTF8) );
+ menuFile->setTitle( tr( "&File" ) );
menuEdit = new QMenu( menuBar );
menuEdit->setObjectName( QString::fromUtf8("menuEdit") );
- menuEdit->setTitle( QApplication::translate("MainWindowClass", "&Edit", 0, QApplication::UnicodeUTF8) );
+ menuEdit->setTitle( tr( "&Edit" ) );
menuProcess = new QMenu( menuBar );
menuProcess->setObjectName( QString::fromUtf8("menuProcess") );
- menuProcess->setTitle( QApplication::translate("MainWindowClass", "&Process", 0, QApplication::UnicodeUTF8) );
+ menuProcess->setTitle( tr( "&Process" ) );
menuTools = new QMenu( menuBar );
menuTools->setObjectName( QString::fromUtf8("menuTools") );
- menuTools->setTitle( QApplication::translate("MainWindowClass", "&Tools", 0, QApplication::UnicodeUTF8) );
+ menuTools->setTitle( tr( "&Tools" ) );
menuHelp = new QMenu( menuBar );
menuHelp->setObjectName( QString::fromUtf8("menuHelp") );
- menuHelp->setTitle( QApplication::translate("MainWindowClass", "Help", 0, QApplication::UnicodeUTF8) );
+ menuHelp->setTitle( tr( "Help" ) );
// application-wide context help button
ContextHelpAction* ctxtHlpAction = new ContextHelpAction( this, handBook );
- ctxtHlpAction->setText( QApplication::translate("MainWindowClass", "Context Help", 0, QApplication::UnicodeUTF8) );
+ ctxtHlpAction->setText( tr( "Context Help" ) );
// ------------------------------------------------------------
@@ -914,7 +923,6 @@
*/
void MainWindow::stopTool()
{
- cerr << "TODO: MainWindow::stopTool()" << endl;
valkyrie->stopTool( toolViewStack->currentToolId() );
}
Modified: branches/valkyrie_qt4port/objects/valgrind_object.h
===================================================================
--- branches/valkyrie_qt4port/objects/valgrind_object.h 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/objects/valgrind_object.h 2010-03-04 22:02:19 UTC (rev 481)
@@ -58,9 +58,9 @@
SHOW_BELOW, // --show-below-main
/* suppressions hackery */
- SUPPS_DIRS, /* list of suppfile dirs - feeds SUPPS_AVAIL list */
- SUPPS_AVAIL, /* fake opt: dyname list of available supp files */
- SUPPS_SEL, /* the currently selected suppression(s) */
+ SUPPS_DIRS, // list of suppfile dirs - feeds SUPPS_AVAIL list
+ SUPPS_AVAIL, // fake opt: dyname list of available supp files
+ SUPPS_SEL, // the currently selected suppression(s)
/* misc */
GEN_SUPP, // --gen-suppressions
Modified: branches/valkyrie_qt4port/options/memcheck_options_page.cpp
===================================================================
--- branches/valkyrie_qt4port/options/memcheck_options_page.cpp 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/options/memcheck_options_page.cpp 2010-03-04 22:02:19 UTC (rev 481)
@@ -85,7 +85,7 @@
int i=0;
QGridLayout* grid1 = new QGridLayout( group1 );
grid1->setRowMinimumHeight( i++, lineHeight/2 ); // blank top row
-// grid1->setColStretch( 1, 10 ); /* push widgets to the left */
+// grid1->setColStretch( 1, 10 ); // push widgets to the left
grid1->addLayout( m_itemList[MEMCHECK::LEAK_CHECK]->hlayout(), i++, 0 );
grid1->addWidget( m_itemList[MEMCHECK::SHOW_REACH]->widget(), i++, 0 );
Modified: branches/valkyrie_qt4port/options/vk_option.h
===================================================================
--- branches/valkyrie_qt4port/options/vk_option.h 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/options/vk_option.h 2010-03-04 22:02:19 UTC (rev 481)
@@ -78,8 +78,7 @@
#define PERROR_BADNUMBER -17 /* invalid numeric value */
#define PERROR_OUTOFRANGE -18 /* outside min|max values */
#define PERROR_OVERFLOW -19 /* number too large or too small */
-#define PERROR_BADOPERATION -20 /* mutually exclusive logical
- operations requested */
+#define PERROR_BADOPERATION -20 /* mutually exclusive logical operations requested */
#define PERROR_NULLARG -21 /* opt->arg should not be NULL */
#define PERROR_MALLOC -22 /* memory allocation failed */
#define PERROR_BADDIR -23 /* dir does not exist */
@@ -89,8 +88,7 @@
#define PERROR_BADFILEWR -27 /* user hasn't got wr permission */
#define PERROR_BADEXEC -28 /* user hasn't got exec permission */
#define PERROR_DB_CONFLICT -29 /* db-attach -v- trace-children */
-#define PERROR_DB_OUTPUT -30 /* using db-attach, but not sending
- output to stderr */
+#define PERROR_DB_OUTPUT -30 /* using db-attach, but not sending output to stderr */
#define PERROR_POWER_OF_TWO -31 /* number not a power of two */
#define PERROR_BADVERSION -32 /* bad program version */
Modified: branches/valkyrie_qt4port/options/vk_options_dialog.cpp
===================================================================
--- branches/valkyrie_qt4port/options/vk_options_dialog.cpp 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/options/vk_options_dialog.cpp 2010-03-04 22:02:19 UTC (rev 481)
@@ -164,7 +164,8 @@
optionsButtonBox = new QDialogButtonBox( hButtonWidget );
optionsButtonBox->setObjectName(QString::fromUtf8("optionsButtonBox"));
optionsButtonBox->setOrientation(Qt::Horizontal);
- optionsButtonBox->setStandardButtons(QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
+ optionsButtonBox->setStandardButtons(QDialogButtonBox::Apply|
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
hLayoutButtons->addWidget( optionsButtonBox );
Modified: branches/valkyrie_qt4port/options/vk_options_page.cpp
===================================================================
--- branches/valkyrie_qt4port/options/vk_options_page.cpp 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/options/vk_options_page.cpp 2010-03-04 22:02:19 UTC (rev 481)
@@ -249,8 +249,9 @@
QString val = vkConfig->value( opt->configKey() ).toString();
int ival = val.toInt(&ok);
if ( !ok ) {
- cerr << "Error in VkOptionsPage::insertOptionWidget( " << optid << " ): " <<
- "VkOPT::WDG_SPINBOX: bad int conversion from: '" << val.toLatin1().data() << "'" << endl;
+ cerr << "Error in VkOptionsPage::insertOptionWidget( " << optid << " ): "
+ << "VkOPT::WDG_SPINBOX: bad int conversion from: '"
+ << val.toLatin1().data() << "'" << endl;
// soldier on...
ival = 0;
}
Modified: branches/valkyrie_qt4port/options/vk_parse_cmdline.cpp
===================================================================
--- branches/valkyrie_qt4port/options/vk_parse_cmdline.cpp 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/options/vk_parse_cmdline.cpp 2010-03-04 22:02:19 UTC (rev 481)
@@ -108,16 +108,20 @@
vkopt->shortFlag = opt->shortFlag.toLatin1();
vkopt->optGrp = (char*)malloc( opt->configGrp.length()+1 );
- strncpy( vkopt->optGrp, opt->configGrp.toLatin1().data(), opt->configGrp.length()+1 );
+ strncpy( vkopt->optGrp, opt->configGrp.toLatin1().data(),
+ opt->configGrp.length()+1 );
vkopt->longFlag = (char*)malloc( opt->longFlag.length()+1 );
- strncpy( vkopt->longFlag, opt->longFlag.toLatin1().data(), opt->longFlag.length()+1 );
+ strncpy( vkopt->longFlag, opt->longFlag.toLatin1().data(),
+ opt->longFlag.length()+1 );
vkopt->helptxt = (char*)malloc( opt->longHelp.length()+1 );
- strncpy( vkopt->helptxt, opt->longHelp.toLatin1().data(), opt->longHelp.length()+1 );
+ strncpy( vkopt->helptxt, opt->longHelp.toLatin1().data(),
+ opt->longHelp.length()+1 );
vkopt->helpdesc = (char*)malloc( opt->flagDescr.length()+1 );
- strncpy( vkopt->helpdesc, opt->flagDescr.toLatin1().data(), opt->flagDescr.length()+1 );
+ strncpy( vkopt->helpdesc, opt->flagDescr.toLatin1().data(),
+ opt->flagDescr.length()+1 );
}
// null entry terminator
vkOpts[idx] = nullOpt();
Modified: branches/valkyrie_qt4port/options/vk_popt.cpp
===================================================================
--- branches/valkyrie_qt4port/options/vk_popt.cpp 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/options/vk_popt.cpp 2010-03-04 22:02:19 UTC (rev 481)
@@ -101,7 +101,8 @@
if ( opt->arg != NULL ) { // is-a table
// recurse on included sub-tables.
- const vkPoptOption* opt2 = vkFindOption( opt->arg, longFlag, shortFlag, singleDash );
+ const vkPoptOption* opt2 = vkFindOption( opt->arg, longFlag,
+ shortFlag, singleDash );
if ( opt2 == NULL ) {
// no match in sub-table
continue;
Modified: branches/valkyrie_qt4port/toolview/helgrindview.cpp
===================================================================
--- branches/valkyrie_qt4port/toolview/helgrindview.cpp 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/toolview/helgrindview.cpp 2010-03-04 22:02:19 UTC (rev 481)
@@ -116,7 +116,7 @@
QIcon icon_openlog;
icon_openlog.addPixmap( QPixmap( QString::fromUtf8(":/vk_icons/icons/folder_green.png") ), QIcon::Normal, QIcon::Off );
actFile_OpenLog->setIcon( icon_openlog );
- actFile_OpenLog->setText( QApplication::translate("HelgrindViewClass", "Open Log", 0, QApplication::UnicodeUTF8) );
+ actFile_OpenLog->setText( tr( "Open Log" ) );
actFile_OpenLog->setToolTip( tr("Open Helgrind XML log") );
}
@@ -136,6 +136,6 @@
// ------------------------------------------------------------
// Helgrind menu
toolMenu->setObjectName( QString::fromUtf8("helgrindMenu"));
- toolMenu->setTitle( QApplication::translate("HelgrindViewClass", "Helgrind", 0, QApplication::UnicodeUTF8) );
+ toolMenu->setTitle( tr( "Helgrind" ) );
toolMenu->addAction( actFile_OpenLog );
}
Modified: branches/valkyrie_qt4port/toolview/memcheckview.cpp
===================================================================
--- branches/valkyrie_qt4port/toolview/memcheckview.cpp 2010-03-03 22:46:49 UTC (rev 480)
+++ branches/valkyrie_qt4port/toolview/memcheckview.cpp 2010-03-04 22:02:19 UTC (rev 481)
@@ -188,16 +188,16 @@
// ------------------------------------------------------------
// Text
- actMC_OpenClose_item->setText( QApplication::translate("MemcheckViewClass", "Open/Close", 0, QApplication::UnicodeUTF8) );
+ actMC_OpenClose_item->setText( tr( "Open/Close" ) );
actMC_OpenClose_item->setToolTip( tr("Open/Close currently selected item") );
- actMC_OpenClose_all->setText ( QApplication::translate("MemcheckViewClass", "Open/Close all", 0, QApplication::UnicodeUTF8) );
+ actMC_OpenClose_all->setText ( tr( "Open/Close all" ) );
actMC_OpenClose_all->setToolTip( tr("Open/Close all items") );
- actMC_ShowSrcPaths->setText ( QApplication::translate("MemcheckViewClass", "Display simple", 0, QApplication::UnicodeUTF8) );
+ actMC_ShowSrcPaths->setText ( tr( "Display simple" ) );
actMC_ShowSrcPaths->setToolTip( tr("Display complex / simplified view") );
- actFile_OpenLog->setText(QApplication::translate("MemcheckViewClass", "Open Log", 0, QApplication::UnicodeUTF8) );
+ actFile_OpenLog->setText(tr( "Open Log" ) );
actFile_OpenLog->setToolTip( tr("Open Memcheck XML log") );
- actFile_SaveLog->setText(QApplication::translate("MemcheckViewClass", "Save Log", 0, QApplication::UnicodeUTF8) );
+ actFile_SaveLog->setText(tr( "Save Log" ) );
actFile_SaveLog->setToolTip( tr("Save Valgrind output to an XML log") );
}
@@ -221,7 +221,7 @@
// ------------------------------------------------------------
// Memcheck menu (created in base class)
toolMenu->setObjectName( QString::fromUtf8("memcheckMenu") );
- toolMenu->setTitle( QApplication::translate("MemcheckViewClass", "Memcheck", 0, QApplication::UnicodeUTF8) );
+ toolMenu->setTitle( tr( "Memcheck" ) );
toolMenu->addAction( actMC_OpenClose_item );
toolMenu->addAction( actMC_OpenClose_all );
|
