Renamed Qt3-legacy *_activated() -> *_triggered().

This fixes the problems on pure Qt4-only environments.
This commit is contained in:
Tvangeste 2012-12-03 22:57:00 +01:00
parent bd765714d6
commit 2836b66d54
2 changed files with 22 additions and 22 deletions

View file

@ -2464,7 +2464,7 @@ void MainWindow::toggleMenuBarTriggered(bool announce)
menuBar()->setVisible( !cfg.preferences.hideMenubar ); menuBar()->setVisible( !cfg.preferences.hideMenubar );
} }
void MainWindow::on_clearHistory_activated() void MainWindow::on_clearHistory_triggered()
{ {
history.clear(); history.clear();
history.save(); history.save();
@ -2473,7 +2473,7 @@ void MainWindow::on_clearHistory_activated()
ui.wordList->clear(); ui.wordList->clear();
} }
void MainWindow::on_newTab_activated() void MainWindow::on_newTab_triggered()
{ {
addNewTab(); addNewTab();
} }
@ -2505,12 +2505,12 @@ void MainWindow::setAutostart(bool autostart)
#endif #endif
} }
void MainWindow::on_actionCloseToTray_activated() void MainWindow::on_actionCloseToTray_triggered()
{ {
toggleMainWindow( !cfg.preferences.enableTrayIcon ); toggleMainWindow( !cfg.preferences.enableTrayIcon );
} }
void MainWindow::on_pageSetup_activated() void MainWindow::on_pageSetup_triggered()
{ {
if ( getPrinter().isValid() ) if ( getPrinter().isValid() )
{ {
@ -2523,7 +2523,7 @@ void MainWindow::on_pageSetup_activated()
tr( "No printer is available. Please install one first." ) ); tr( "No printer is available. Please install one first." ) );
} }
void MainWindow::on_printPreview_activated() void MainWindow::on_printPreview_triggered()
{ {
QPrintPreviewDialog dialog( &getPrinter(), this ); QPrintPreviewDialog dialog( &getPrinter(), this );
@ -2533,7 +2533,7 @@ void MainWindow::on_printPreview_activated()
dialog.exec(); dialog.exec();
} }
void MainWindow::on_print_activated() void MainWindow::on_print_triggered()
{ {
QPrintDialog dialog( &getPrinter(), this ); QPrintDialog dialog( &getPrinter(), this );
@ -2554,7 +2554,7 @@ void MainWindow::printPreviewPaintRequested( QPrinter * printer )
view->print( printer ); view->print( printer );
} }
void MainWindow::on_saveArticle_activated() void MainWindow::on_saveArticle_triggered()
{ {
ArticleView *view = getCurrentArticleView(); ArticleView *view = getCurrentArticleView();
@ -2580,7 +2580,7 @@ void MainWindow::on_saveArticle_activated()
} }
} }
void MainWindow::on_rescanFiles_activated() void MainWindow::on_rescanFiles_triggered()
{ {
hotkeyWrapper.reset(); // No hotkeys while we're editing dictionaries hotkeyWrapper.reset(); // No hotkeys while we're editing dictionaries
scanPopup.reset(); // No scan popup either. No one should use dictionaries. scanPopup.reset(); // No scan popup either. No one should use dictionaries.
@ -2732,7 +2732,7 @@ void MainWindow::wordReceived( const QString & word)
translateInputFinished(); translateInputFinished();
} }
void MainWindow::on_showHideHistory_activated() void MainWindow::on_showHideHistory_triggered()
{ {
static bool needHideSearchPane; static bool needHideSearchPane;
if( showHistory ) if( showHistory )
@ -2802,7 +2802,7 @@ static bool needHideSearchPane;
} }
} }
void MainWindow::on_exportHistory_activated() void MainWindow::on_exportHistory_triggered()
{ {
QString exportPath; QString exportPath;
if( cfg.historyExportPath.isEmpty() ) if( cfg.historyExportPath.isEmpty() )
@ -2863,7 +2863,7 @@ void MainWindow::on_exportHistory_activated()
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) ); mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) );
} }
void MainWindow::on_importHistory_activated() void MainWindow::on_importHistory_triggered()
{ {
QString importPath; QString importPath;
if( cfg.historyExportPath.isEmpty() ) if( cfg.historyExportPath.isEmpty() )

View file

@ -323,24 +323,24 @@ private slots:
void useSmallIconsInToolbarsTriggered(); void useSmallIconsInToolbarsTriggered();
void toggleMenuBarTriggered( bool announce = true ); void toggleMenuBarTriggered( bool announce = true );
void on_clearHistory_activated(); void on_clearHistory_triggered();
void on_newTab_activated(); void on_newTab_triggered();
void on_actionCloseToTray_activated(); void on_actionCloseToTray_triggered();
void on_pageSetup_activated(); void on_pageSetup_triggered();
void on_printPreview_activated(); void on_printPreview_triggered();
void on_print_activated(); void on_print_triggered();
void printPreviewPaintRequested( QPrinter * ); void printPreviewPaintRequested( QPrinter * );
void on_saveArticle_activated(); void on_saveArticle_triggered();
void on_rescanFiles_activated(); void on_rescanFiles_triggered();
void on_showHideHistory_activated(); void on_showHideHistory_triggered();
void on_exportHistory_activated(); void on_exportHistory_triggered();
void on_importHistory_activated(); void on_importHistory_triggered();
void focusWordList(); void focusWordList();
/// Add word to history /// Add word to history