Commit d9bb3b4e authored by Laurent Montel's avatar Laurent Montel 😁

Compile++

svn path=/trunk/KDE/kdemultimedia/juk/; revision=608756
parent 33bf18f4
......@@ -53,7 +53,7 @@ class PlaylistAction : public KAction
const QString &userText,
const QIcon &pix,
const char *slot,
const KShortcut &cut = 0) :
const KShortcut &cut = KShortcut()) :
KAction(userText, actions(), name),
m_slot(slot)
{
......
......@@ -30,49 +30,49 @@
const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
{ "playPause",
{ KShortcut::null(),
Qt::CTRL+Qt::ALT+Qt::Key_P,
Qt::Key_MediaPlay } },
{ KShortcut(),
KShortcut(Qt::CTRL+Qt::ALT+Qt::Key_P),
KShortcut(Qt::Key_MediaPlay) } },
{ "stop",
{ KShortcut::null(),
Qt::CTRL+Qt::ALT+Qt::Key_S,
Qt::Key_MediaStop } },
{ KShortcut(),
KShortcut(Qt::CTRL+Qt::ALT+Qt::Key_S),
KShortcut(Qt::Key_MediaStop) } },
{ "back",
{ KShortcut::null(),
Qt::CTRL+Qt::ALT+Qt::Key_Left,
Qt::Key_MediaPrevious } },
{ KShortcut(),
KShortcut(Qt::CTRL+Qt::ALT+Qt::Key_Left),
KShortcut(Qt::Key_MediaPrevious) } },
{ "forward",
{ KShortcut::null(),
Qt::CTRL+Qt::ALT+Qt::Key_Right,
Qt::Key_MediaNext } },
{ KShortcut(),
KShortcut(Qt::CTRL+Qt::ALT+Qt::Key_Right),
KShortcut(Qt::Key_MediaNext) } },
{ "forwardAlbum",
{ KShortcut::null(),
Qt::CTRL+Qt::ALT+Qt::Key_Up,
Qt::CTRL+Qt::Key_MediaNext } },
{ KShortcut(),
KShortcut(Qt::CTRL+Qt::ALT+Qt::Key_Up),
KShortcut(Qt::CTRL+Qt::Key_MediaNext) } },
{ "seekBack",
{ KShortcut::null(),
Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_Left,
Qt::SHIFT+Qt::Key_MediaPrevious } },
{ KShortcut(),
KShortcut(Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_Left),
KShortcut(Qt::SHIFT+Qt::Key_MediaPrevious) } },
{ "seekForward",
{ KShortcut::null(),
Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_Right,
Qt::SHIFT+Qt::Key_MediaNext } },
{ KShortcut(),
KShortcut(Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::Key_Right),
KShortcut(Qt::SHIFT+Qt::Key_MediaNext) } },
{ "volumeUp",
{ KShortcut::null(),
Qt::CTRL+Qt::ALT+Qt::SHIFT+Qt::Key_Up,
Qt::Key_VolumeUp } },
{ KShortcut(),
KShortcut(Qt::CTRL+Qt::ALT+Qt::SHIFT+Qt::Key_Up),
KShortcut(Qt::Key_VolumeUp) } },
{ "volumeDown",
{ KShortcut::null(),
Qt::CTRL+Qt::ALT+Qt::SHIFT+Qt::Key_Down,
Qt::Key_VolumeDown } },
{ KShortcut(),
KShortcut(Qt::CTRL+Qt::ALT+Qt::SHIFT+Qt::Key_Down),
KShortcut(Qt::Key_VolumeDown) } },
{ "mute",
{ KShortcut::null(),
Qt::CTRL+Qt::ALT+Qt::Key_M,
Qt::Key_VolumeMute } },
{ KShortcut(),
KShortcut(Qt::CTRL+Qt::ALT+Qt::Key_M),
KShortcut(Qt::Key_VolumeMute) } },
{ "showHide",
{ KShortcut::null(),
KShortcut::null(),
KShortcut::null() } }
{ KShortcut(),
KShortcut(),
KShortcut() } }
};
const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]);
......@@ -186,7 +186,7 @@ int KeyDialog::configure(KActionCollection *actionCollection, QWidget *parent)
void KeyDialog::setupActionShortcut(const QString &actionName)
{
// Find and insert a standard key
KShortcut shortcut = KShortcut::null();
KShortcut shortcut = KShortcut();
for(uint i = 0; i < keyInfoCount; i++) {
if(keyInfo[i].action == actionName) {
......@@ -195,7 +195,7 @@ void KeyDialog::setupActionShortcut(const QString &actionName)
}
}
if(shortcut.isNull())
if(shortcut.isEmpty())
return; // We have no shortcut to set.
KAction *a = ActionCollection::action(actionName);
......
......@@ -854,11 +854,11 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
menu = new KActionMenu(KIcon("filenew"), i18n("&New"), actions(), "file_new");
menu->addAction(createAction(i18n("&Empty Playlist..."), SLOT(slotCreatePlaylist()),
"newPlaylist", "window_new", Qt::CTRL + Qt::Key_N));
"newPlaylist", "window_new", KShortcut(Qt::CTRL + Qt::Key_N)));
menu->addAction(createAction(i18n("&Search Playlist..."), SLOT(slotCreateSearchPlaylist()),
"newSearchPlaylist", "find", Qt::CTRL + Qt::Key_F));
"newSearchPlaylist", "find", KShortcut(Qt::CTRL + Qt::Key_F)));
menu->addAction(createAction(i18n("Playlist From &Folder..."), SLOT(slotCreateFolderPlaylist()),
"newDirectoryPlaylist", "fileopen", Qt::CTRL + Qt::Key_D));
"newDirectoryPlaylist", "fileopen", KShortcut(Qt::CTRL + Qt::Key_D)));
// Guess tag info menu
......@@ -867,23 +867,23 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
/* menu->setIconSet(SmallIconSet("wizard")); */
menu->addAction(createAction(i18n("From &File Name"), SLOT(slotGuessTagFromFile()),
"guessTagFile", "fileimport", Qt::CTRL + Qt::Key_G));
"guessTagFile", "fileimport", KShortcut(Qt::CTRL + Qt::Key_G)));
menu->addAction(createAction(i18n("From &Internet"), SLOT(slotGuessTagFromInternet()),
"guessTagInternet", "connect_established", Qt::CTRL + Qt::Key_I));
"guessTagInternet", "connect_established", KShortcut(Qt::CTRL + Qt::Key_I)));
#else
createAction(i18n("Guess Tag Information From &File Name"), SLOT(slotGuessTagFromFile()),
"guessTag", "fileimport", Qt::CTRL + Qt::Key_F);
"guessTag", "fileimport", KShortcut(Qt::CTRL + Qt::Key_F));
#endif
createAction(i18n("Play First Track"),SLOT(slotPlayFirst()), "playFirst");
createAction(i18n("Play Next Album"), SLOT(slotPlayNextAlbum()), "forwardAlbum", "next");
createAction(i18n("Open..."), SLOT(slotOpen()), "file_open", "fileopen", Qt::CTRL + Qt::Key_O);
createAction(i18n("Open..."), SLOT(slotOpen()), "file_open", "fileopen", KShortcut(Qt::CTRL + Qt::Key_O));
createAction(i18n("Add &Folder..."), SLOT(slotAddFolder()), "openDirectory", "fileopen");
createAction(i18n("&Rename..."), SLOT(slotRename()), "renamePlaylist", "lineedit");
createAction(i18n("D&uplicate..."), SLOT(slotDuplicate()), "duplicatePlaylist", "editcopy");
createAction(i18n("Save"), SLOT(slotSave()), "file_save", "filesave", Qt::CTRL + Qt::Key_S);
createAction(i18n("Save"), SLOT(slotSave()), "file_save", "filesave", KShortcut(Qt::CTRL + Qt::Key_S));
createAction(i18n("Save As..."), SLOT(slotSaveAs()), "file_save_as", "filesaveas");
createAction(i18n("R&emove"), SLOT(slotRemove()), "deleteItemPlaylist", "edittrash");
createAction(i18n("Reload"), SLOT(slotReload()), "reloadPlaylist", "reload");
......@@ -891,16 +891,16 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
createAction(i18n("&Delete"), SLOT(slotRemoveItems()), "removeItem", "editdelete");
createAction(i18n("Refresh"), SLOT(slotRefreshItems()), "refresh", "reload");
createAction(i18n("&Rename File"), SLOT(slotRenameItems()), "renameFile", "filesaveas", Qt::CTRL + Qt::Key_R);
createAction(i18n("&Rename File"), SLOT(slotRenameItems()), "renameFile", "filesaveas", KShortcut(Qt::CTRL + Qt::Key_R));
menu = new KActionMenu(i18n("Cover Manager"), actions(), "coverManager");
/* menu->setIconSet(SmallIconSet("image")); */
menu->addAction(createAction(i18n("&View Cover"),
SLOT(slotViewCovers()), "viewCover", "viewmag"));
menu->addAction(createAction(i18n("Get Cover From &File..."),
SLOT(slotAddLocalCover()), "addCover", "fileimport", Qt::CTRL + Qt::SHIFT + Qt::Key_F));
SLOT(slotAddLocalCover()), "addCover", "fileimport", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_F)));
menu->addAction(createAction(i18n("Get Cover From &Internet..."),
SLOT(slotAddInternetCover()), "googleCover", "connect_established", Qt::CTRL + Qt::SHIFT + Qt::Key_G));
SLOT(slotAddInternetCover()), "googleCover", "connect_established", KShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_G)));
menu->addAction(createAction(i18n("&Delete Cover"),
SLOT(slotRemoveCovers()), "removeCover", "editdelete"));
menu->addAction(createAction(i18n("Show Cover &Manager"),
......
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