Commit a1565d24 authored by Michael Reeves's avatar Michael Reeves

*KShortcut -> QKeySequence

*don't use QByteArray for strings.
parent 6c12272f
......@@ -3379,13 +3379,13 @@ void DirectoryMergeWindow::initDirectoryMergeActions( QObject* pKDiff3App, KActi
#include "xpm/showfilesonlyinc.xpm"
DirectoryMergeWindow* p = this;
d->m_pDirStartOperation = KDiff3::createAction< QAction >(i18n("Start/Continue Directory Merge"), KShortcut( Qt::Key_F7 ), p, SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation");
d->m_pDirRunOperationForCurrentItem = KDiff3::createAction< QAction >(i18n("Run Operation for Current Item"), KShortcut( Qt::Key_F6 ), p, SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item");
d->m_pDirStartOperation = KDiff3::createAction< QAction >(i18n("Start/Continue Directory Merge"), QKeySequence( Qt::Key_F7 ), p, SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation");
d->m_pDirRunOperationForCurrentItem = KDiff3::createAction< QAction >(i18n("Run Operation for Current Item"), QKeySequence( Qt::Key_F6 ), p, SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item");
d->m_pDirCompareCurrent = KDiff3::createAction< QAction >(i18n("Compare Selected File"), p, SLOT(compareCurrentFile()), ac, "dir_compare_current");
d->m_pDirMergeCurrent = KDiff3::createAction< QAction >(i18n("Merge Current File"), QIcon(QPixmap(startmerge)), i18n("Merge\nFile"), pKDiff3App, SLOT(slotMergeCurrentFile()), ac, "merge_current");
d->m_pDirFoldAll = KDiff3::createAction< QAction >(i18n("Fold All Subdirs"), p, SLOT(collapseAll()), ac, "dir_fold_all");
d->m_pDirUnfoldAll = KDiff3::createAction< QAction >(i18n("Unfold All Subdirs"), p, SLOT(expandAll()), ac, "dir_unfold_all");
d->m_pDirRescan = KDiff3::createAction< QAction >(i18n("Rescan"), KShortcut( Qt::SHIFT+Qt::Key_F5 ), p, SLOT(reload()), ac, "dir_rescan");
d->m_pDirRescan = KDiff3::createAction< QAction >(i18n("Rescan"), QKeySequence( Qt::SHIFT+Qt::Key_F5 ), p, SLOT(reload()), ac, "dir_rescan");
d->m_pDirSaveMergeState = 0; //KDiff3::createAction< QAction >(i18n("Save Directory Merge State ..."), 0, p, SLOT(slotSaveMergeState()), ac, "dir_save_merge_state");
d->m_pDirLoadMergeState = 0; //KDiff3::createAction< QAction >(i18n("Load Directory Merge State ..."), 0, p, SLOT(slotLoadMergeState()), ac, "dir_load_merge_state");
d->m_pDirChooseAEverywhere = KDiff3::createAction< QAction >(i18n("Choose A for All Items"), p, SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere");
......
......@@ -59,7 +59,7 @@ namespace KDiff3 {
template <class T>
T* createAction(
const QString& text,
const KShortcut& shortcut,
const QKeySequence& shortcut,
const QObject* receiver,
const char* slot,
KActionCollection* ac,
......@@ -101,7 +101,7 @@ namespace KDiff3 {
T* createAction(
const QString& text,
const QIcon& icon,
const KShortcut& shortcut,
const QKeySequence& shortcut,
const QObject* receiver,
const char* slot,
KActionCollection* ac,
......@@ -116,7 +116,7 @@ namespace KDiff3 {
const QString& text,
const QIcon& icon,
const QString& iconText,
const KShortcut& shortcut,
const QKeySequence& shortcut,
const QObject* receiver,
const char* slot,
KActionCollection* ac,
......
This diff is collapsed.
......@@ -177,20 +177,20 @@ int main(int argc, char *argv[])
appVersion += " (32 bit)";
const QString description = i18n("Tool for Comparison and Merge of Files and Directories");
const QString copyright = i18n("(c) 2002-2012 Joachim Eibl");
const QByteArray& homePage = "http://kdiff3.sourceforge.net/";
const QByteArray& bugsAddress = "joachim.eibl@gmx.de";
const QString& homePage = QStringLiteral("http://kdiff3.sourceforge.net/");
const QString& bugsAddress = QStringLiteral("joachim.eibl@gmx.de");
KLocalizedString::setApplicationDomain(appCatalog);
KAboutData aboutData( appName, i18nName,
appVersion, description, KAboutLicense::GPL_V2, copyright, description,
homePage, bugsAddress );
aboutData.addAuthor(i18n("Joachim Eibl"), QString(), QByteArray("joachim.eibl@gmx.de"));
aboutData.addAuthor(i18n("Joachim Eibl"), QString(), QStringLiteral("joachim.eibl@gmx.de"));
aboutData.addCredit(i18n("Eike Sauer"), i18n("Bugfixes, Debian package maintainer") );
aboutData.addCredit(i18n("Sebastien Fricker"), i18n("Windows installer") );
aboutData.addCredit(i18n("Stephan Binner"), i18n("i18n-help"), QByteArray("binner@kde.org") );
aboutData.addCredit(i18n("Stephan Binner"), i18n("i18n-help"), QStringLiteral("binner@kde.org") );
aboutData.addCredit(i18n("Stefan Partheymueller"), i18n("Clipboard-patch" ));
aboutData.addCredit(i18n("David Faure"), i18n("KIO-Help"), QByteArray("faure@kde.org" ));
aboutData.addCredit(i18n("David Faure"), i18n("KIO-Help"), QStringLiteral("faure@kde.org" ));
aboutData.addCredit(i18n("Bernd Gehrmann"), i18n("Class CvsIgnoreList from Cervisia" ));
aboutData.addCredit(i18n("Andre Woebbeking"), i18n("Class StringMatcher" ));
aboutData.addCredit(i18n("Michael Denio"), i18n("Directory Equality-Coloring patch"));
......@@ -199,8 +199,8 @@ int main(int argc, char *argv[])
aboutData.addCredit(i18n("Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower"), i18n("GNU-Diffutils"));
aboutData.addCredit(i18n("Tino Boellsterling, Timothy Mee"), i18n("Intensive test, use and feedback"));
aboutData.addCredit(i18n("Michael Schmidt"), i18n("Mac support"));
aboutData.addCredit(i18n("Valentin Rusu"), i18n("KDE4 porting"), QByteArray("kde@rusu.info"));
aboutData.addCredit(i18n("Albert Astals Cid"), i18n("KDE4 porting"), QByteArray("aacid@kde.org"));
aboutData.addCredit(i18n("Valentin Rusu"), i18n("KDE4 porting"), QStringLiteral("kde@rusu.info"));
aboutData.addCredit(i18n("Albert Astals Cid"), i18n("KDE4 porting"), QStringLiteral("aacid@kde.org"));
aboutData.addCredit(i18n("Silvan Scherrer"), i18n("OS2 port") );
aboutData.addCredit(i18n("Nigel Stewart"), i18n("Cygwin support") );
aboutData.addCredit(i18n("Maurice van der Pot"), i18n("Framework for automated tests") );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment