From: Montel L. <mo...@kd...> - 2013-12-16 09:47:56
|
Git commit 5d4746e4c3e8665de83e6d281dcd08a46cd22c31 by Montel Laurent. Committed on 15/12/2013 at 14:59. Pushed by mlaurent into branch 'master'. Use KLocalizedString (for i18n only, in kf5 it will necessary => use a script for converting it when necessary) M +1 -1 src/abstractclipitem.cpp M +1 -1 src/archivewidget.cpp M +1 -1 src/beziercurve/beziersplinewidget.cpp M +1 -1 src/commands/addclipcommand.cpp M +1 -1 src/commands/addclipcutcommand.cpp M +1 -1 src/commands/addeffectcommand.cpp M +1 -1 src/commands/addextradatacommand.cpp M +1 -1 src/commands/addfoldercommand.cpp M +1 -1 src/commands/addmarkercommand.cpp M +1 -1 src/commands/addtimelineclipcommand.cpp M +1 -1 src/commands/addtrackcommand.cpp M +1 -1 src/commands/addtransitioncommand.cpp M +1 -1 src/commands/changecliptypecommand.cpp M +1 -1 src/commands/changeeffectstatecommand.cpp M +1 -1 src/commands/changespeedcommand.cpp M +1 -1 src/commands/editclipcommand.cpp M +1 -1 src/commands/editclipcutcommand.cpp M +1 -1 src/commands/editeffectcommand.cpp M +1 -1 src/commands/editfoldercommand.cpp M +1 -1 src/commands/editguidecommand.cpp M +1 -1 src/commands/editkeyframecommand.cpp M +1 -1 src/commands/edittransitioncommand.cpp M +1 -1 src/commands/groupclipscommand.cpp M +1 -1 src/commands/insertspacecommand.cpp M +1 -1 src/commands/locktrackcommand.cpp M +1 -1 src/commands/moveclipcommand.cpp M +1 -1 src/commands/moveeffectcommand.cpp M +1 -1 src/commands/movegroupcommand.cpp M +1 -1 src/commands/movetransitioncommand.cpp M +1 -1 src/commands/razorclipcommand.cpp M +1 -1 src/commands/resizeclipcommand.cpp M +1 -1 src/commands/splitaudiocommand.cpp M +1 -1 src/complexparameter.cpp M +1 -1 src/customtrackview.cpp M +1 -1 src/definitions.h M +1 -1 src/documentvalidator.cpp M +1 -1 src/dvdwizard.cpp M +1 -1 src/effectslist.cpp M +1 -1 src/effectslistview.cpp M +1 -1 src/effectstack/collapsibleeffect.cpp M +1 -1 src/effectstack/collapsiblegroup.cpp M +1 -1 src/effectstack/effectstackview2.cpp M +1 -1 src/effectstackedit.cpp M +1 -1 src/folderprojectitem.cpp M +1 -1 src/headertrack.cpp M +1 -1 src/kdenlivedoc.cpp M +1 -1 src/mainwindow.cpp M +1 -1 src/mltdevicecapture.cpp M +1 -1 src/monitor.cpp M +1 -1 src/noteswidget.cpp M +1 -1 src/projectitem.cpp M +1 -1 src/projectlist.cpp M +1 -1 src/projectlistview.cpp M +1 -1 src/projecttree/abstractclipjob.cpp M +1 -1 src/projecttree/cutclipjob.cpp M +1 -1 src/projecttree/meltjob.cpp M +1 -1 src/projecttree/proxyclipjob.cpp M +1 -1 src/recmonitor.cpp M +1 -1 src/renderer.cpp M +1 -0 src/scopes/abstractscopewidget.cpp M +1 -1 src/simplekeyframes/simplekeyframewidget.cpp M +1 -1 src/smallruler.cpp M +1 -1 src/stopmotion/capturehandler.cpp M +1 -1 src/subprojectitem.cpp M +1 -1 src/timecode.cpp M +1 -1 src/titledocument.cpp M +1 -1 src/utils/archiveorg.cpp M +1 -1 src/utils/freesound.cpp M +1 -1 src/v4l/v4lcapture.cpp M +1 -1 src/wizard.cpp http://commits.kde.org/kdenlive/5d4746e4c3e8665de83e6d281dcd08a46cd22c31 diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index a616219..7ef051b 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -23,7 +23,7 @@ #include "kdenlivesettings.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <KGlobalSettings> #include <QPainter> diff --git a/src/archivewidget.cpp b/src/archivewidget.cpp index a645172..ae19130 100644 --- a/src/archivewidget.cpp +++ b/src/archivewidget.cpp @@ -21,7 +21,7 @@ #include "archivewidget.h" #include "titlewidget.h" -#include <KLocale> +#include <KLocalizedString> #include <KDiskFreeSpaceInfo> #include <KUrlRequester> #include <KFileDialog> diff --git a/src/beziercurve/beziersplinewidget.cpp b/src/beziercurve/beziersplinewidget.cpp index f61e65f..6f7683f 100644 --- a/src/beziercurve/beziersplinewidget.cpp +++ b/src/beziercurve/beziersplinewidget.cpp @@ -24,7 +24,7 @@ #include <QVBoxLayout> #include <KIcon> -#include <KLocale> +#include <KLocalizedString> BezierSplineWidget::BezierSplineWidget(const QString& spline, QWidget* parent) : diff --git a/src/commands/addclipcommand.cpp b/src/commands/addclipcommand.cpp index d8cc2e4..5ffd45c 100644 --- a/src/commands/addclipcommand.cpp +++ b/src/commands/addclipcommand.cpp @@ -21,7 +21,7 @@ #include "addclipcommand.h" #include "kdenlivedoc.h" -#include <KLocale> +#include <KLocalizedString> AddClipCommand::AddClipCommand(KdenliveDoc *doc, const QDomElement &xml, const QString &id, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/addclipcutcommand.cpp b/src/commands/addclipcutcommand.cpp index 6faec76..bb4143f 100644 --- a/src/commands/addclipcutcommand.cpp +++ b/src/commands/addclipcutcommand.cpp @@ -20,7 +20,7 @@ #include "addclipcutcommand.h" #include "projectlist.h" -#include <KLocale> +#include <KLocalizedString> AddClipCutCommand::AddClipCutCommand(ProjectList *list, const QString &id, int in, int out, const QString& desc, bool newItem, bool remove, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/addeffectcommand.cpp b/src/commands/addeffectcommand.cpp index 399ec59..8df25a9 100644 --- a/src/commands/addeffectcommand.cpp +++ b/src/commands/addeffectcommand.cpp @@ -21,7 +21,7 @@ #include "addeffectcommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> AddEffectCommand::AddEffectCommand(CustomTrackView *view, const int track, const GenTime &pos, const QDomElement &effect, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/addextradatacommand.cpp b/src/commands/addextradatacommand.cpp index f2aa541..1b5aea2 100644 --- a/src/commands/addextradatacommand.cpp +++ b/src/commands/addextradatacommand.cpp @@ -19,7 +19,7 @@ #include "addextradatacommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> AddExtraDataCommand::AddExtraDataCommand(CustomTrackView *view, const QString&id, const QString&key, const QString &oldData, const QString &newData, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/addfoldercommand.cpp b/src/commands/addfoldercommand.cpp index 3f5c562..4a7cb2a 100644 --- a/src/commands/addfoldercommand.cpp +++ b/src/commands/addfoldercommand.cpp @@ -21,7 +21,7 @@ #include "addfoldercommand.h" #include "projectlist.h" -#include <KLocale> +#include <KLocalizedString> AddFolderCommand::AddFolderCommand(ProjectList *view, const QString &folderName, const QString &clipId, bool doIt, QUndoCommand *parent) : QUndoCommand(parent), diff --git a/src/commands/addmarkercommand.cpp b/src/commands/addmarkercommand.cpp index 46a7d9c..5070ca6 100644 --- a/src/commands/addmarkercommand.cpp +++ b/src/commands/addmarkercommand.cpp @@ -19,7 +19,7 @@ #include "addmarkercommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const CommentedTime &oldMarker, const CommentedTime &newMarker, const QString &id, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/addtimelineclipcommand.cpp b/src/commands/addtimelineclipcommand.cpp index 5cc0fe7..4cd39a7 100644 --- a/src/commands/addtimelineclipcommand.cpp +++ b/src/commands/addtimelineclipcommand.cpp @@ -21,7 +21,7 @@ #include "addtimelineclipcommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> AddTimelineClipCommand::AddTimelineClipCommand(CustomTrackView *view, const QDomElement &xml, const QString &clipId, const ItemInfo &info, const EffectsList &effects, bool overwrite, bool push, bool doIt, bool doRemove, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/addtrackcommand.cpp b/src/commands/addtrackcommand.cpp index f36d220..d7db0ad 100644 --- a/src/commands/addtrackcommand.cpp +++ b/src/commands/addtrackcommand.cpp @@ -21,7 +21,7 @@ #include "addtrackcommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> #include <KDebug> AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, const TrackInfo &info, bool addTrack, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/addtransitioncommand.cpp b/src/commands/addtransitioncommand.cpp index 8a8002f..ead49b6 100644 --- a/src/commands/addtransitioncommand.cpp +++ b/src/commands/addtransitioncommand.cpp @@ -19,7 +19,7 @@ #include "addtransitioncommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> AddTransitionCommand::AddTransitionCommand(CustomTrackView *view, const ItemInfo &info, int transitiontrack, const QDomElement ¶ms, bool remove, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/changecliptypecommand.cpp b/src/commands/changecliptypecommand.cpp index 61932cc..b5aa2fc 100644 --- a/src/commands/changecliptypecommand.cpp +++ b/src/commands/changecliptypecommand.cpp @@ -21,7 +21,7 @@ #include "changecliptypecommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> #include <KDebug> ChangeClipTypeCommand::ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, QUndoCommand * parent) : diff --git a/src/commands/changeeffectstatecommand.cpp b/src/commands/changeeffectstatecommand.cpp index adf7884..2d1deff 100644 --- a/src/commands/changeeffectstatecommand.cpp +++ b/src/commands/changeeffectstatecommand.cpp @@ -21,7 +21,7 @@ #include "changeeffectstatecommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> ChangeEffectStateCommand::ChangeEffectStateCommand(CustomTrackView *view, const int track, const GenTime& pos, const QList <int>& effectIndexes, bool disable, bool refreshEffectStack, bool doIt, QUndoCommand *parent) : QUndoCommand(parent), diff --git a/src/commands/changespeedcommand.cpp b/src/commands/changespeedcommand.cpp index 67399a9..7ada3e0 100644 --- a/src/commands/changespeedcommand.cpp +++ b/src/commands/changespeedcommand.cpp @@ -21,7 +21,7 @@ #include "changespeedcommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, const ItemInfo &info, const ItemInfo &speedIndependantInfo, double old_speed, double new_speed, int old_strobe, int new_strobe, const QString &clipId, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/editclipcommand.cpp b/src/commands/editclipcommand.cpp index 96c35b9..00686b5 100644 --- a/src/commands/editclipcommand.cpp +++ b/src/commands/editclipcommand.cpp @@ -20,7 +20,7 @@ #include "editclipcommand.h" #include "projectlist.h" -#include <KLocale> +#include <KLocalizedString> #include <KDebug> EditClipCommand::EditClipCommand(ProjectList *list, const QString &id, const QMap <QString, QString> &oldparams, const QMap <QString, QString> &newparams, bool doIt, QUndoCommand * parent) : diff --git a/src/commands/editclipcutcommand.cpp b/src/commands/editclipcutcommand.cpp index 7bdfc53..a5e7df7 100644 --- a/src/commands/editclipcutcommand.cpp +++ b/src/commands/editclipcutcommand.cpp @@ -20,7 +20,7 @@ #include "editclipcutcommand.h" #include "projectlist.h" -#include <KLocale> +#include <KLocalizedString> #include <KDebug> EditClipCutCommand::EditClipCutCommand(ProjectList *list, const QString &id, const QPoint &oldZone, const QPoint &newZone, const QString &oldComment, const QString &newComment, bool doIt, QUndoCommand * parent) : diff --git a/src/commands/editeffectcommand.cpp b/src/commands/editeffectcommand.cpp index 3fb2a33..e6ab0a3 100644 --- a/src/commands/editeffectcommand.cpp +++ b/src/commands/editeffectcommand.cpp @@ -21,7 +21,7 @@ #include "editeffectcommand.h" #include "customtrackview.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, const GenTime &pos, const QDomElement &oldeffect, const QDomElement &effect, int stackPos, bool refreshEffectStack, bool doIt, QUndoCommand *parent) : QUndoCommand(parent), diff --git a/src/commands/editfoldercommand.cpp b/src/commands/editfoldercommand.cpp index 1b569f1..cb7bc04 100644 --- a/src/commands/editfoldercommand.cpp +++ b/src/commands/editfoldercommand.cpp @@ -21,7 +21,7 @@ #include "editfoldercommand.h" #include "projectlist.h" -#include <KLocale> +#include <KLocalizedString> EditFolderCommand::EditFolderCommand(ProjectList *view, const QString &newfolderName, const QString &oldfolderName, const QString &clipId, bool doIt, QUndoCommand *parent) : QUndoCommand(parent), diff --git a/src/commands/editguidecommand.cpp b/src/commands/editguidecommand.cpp index 0f5ece0..0e80bce 100644 --- a/src/commands/editguidecommand.cpp +++ b/src/commands/editguidecommand.cpp @@ -19,7 +19,7 @@ #include "editguidecommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> EditGuideCommand::EditGuideCommand(CustomTrackView *view, const GenTime &oldPos, const QString &oldcomment, const GenTime &pos, const QString &comment, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/editkeyframecommand.cpp b/src/commands/editkeyframecommand.cpp index bf5de55..87676bb 100644 --- a/src/commands/editkeyframecommand.cpp +++ b/src/commands/editkeyframecommand.cpp @@ -19,7 +19,7 @@ #include "editkeyframecommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> EditKeyFrameCommand::EditKeyFrameCommand(CustomTrackView *view, const int track, const GenTime &pos, const int effectIndex, const QString& oldkeyframes, const QString& newkeyframes, bool doIt) : QUndoCommand(), diff --git a/src/commands/edittransitioncommand.cpp b/src/commands/edittransitioncommand.cpp index 8ec2a87..533a6b2 100644 --- a/src/commands/edittransitioncommand.cpp +++ b/src/commands/edittransitioncommand.cpp @@ -18,7 +18,7 @@ #include "edittransitioncommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> EditTransitionCommand::EditTransitionCommand(CustomTrackView *view, const int track, const GenTime &pos, const QDomElement &oldeffect, const QDomElement &effect, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/groupclipscommand.cpp b/src/commands/groupclipscommand.cpp index d8f2417..4eb1bcb 100644 --- a/src/commands/groupclipscommand.cpp +++ b/src/commands/groupclipscommand.cpp @@ -21,7 +21,7 @@ #include "groupclipscommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> #include <KDebug> GroupClipsCommand::GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> &clipInfos, const QList <ItemInfo>& transitionInfos, bool group, QUndoCommand * parent) : diff --git a/src/commands/insertspacecommand.cpp b/src/commands/insertspacecommand.cpp index d06556f..202d56a 100644 --- a/src/commands/insertspacecommand.cpp +++ b/src/commands/insertspacecommand.cpp @@ -21,7 +21,7 @@ #include "insertspacecommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> InsertSpaceCommand::InsertSpaceCommand(CustomTrackView *view, const QList<ItemInfo> &clipsToMove, const QList<ItemInfo> &transToMove, int track, const GenTime &duration, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/locktrackcommand.cpp b/src/commands/locktrackcommand.cpp index 1f334a9..dee4f82 100644 --- a/src/commands/locktrackcommand.cpp +++ b/src/commands/locktrackcommand.cpp @@ -20,7 +20,7 @@ #include "locktrackcommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> LockTrackCommand::LockTrackCommand(CustomTrackView *view, int ix, bool lock, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/moveclipcommand.cpp b/src/commands/moveclipcommand.cpp index b41ebf8..857eef0 100644 --- a/src/commands/moveclipcommand.cpp +++ b/src/commands/moveclipcommand.cpp @@ -22,7 +22,7 @@ #include "moveclipcommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> MoveClipCommand::MoveClipCommand(CustomTrackView *view, const ItemInfo &start, const ItemInfo &end, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/moveeffectcommand.cpp b/src/commands/moveeffectcommand.cpp index 50d49e4..4d34cd0 100644 --- a/src/commands/moveeffectcommand.cpp +++ b/src/commands/moveeffectcommand.cpp @@ -21,7 +21,7 @@ #include "moveeffectcommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> #include <KDebug> MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, const GenTime &pos, const QList<int> &oldPos, int newPos, QUndoCommand * parent) : diff --git a/src/commands/movegroupcommand.cpp b/src/commands/movegroupcommand.cpp index 651a602..22de56d 100644 --- a/src/commands/movegroupcommand.cpp +++ b/src/commands/movegroupcommand.cpp @@ -21,7 +21,7 @@ #include "movegroupcommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> MoveGroupCommand::MoveGroupCommand(CustomTrackView *view, const QList <ItemInfo> &startClip, const QList <ItemInfo> &startTransition, const GenTime &offset, const int trackOffset, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/movetransitioncommand.cpp b/src/commands/movetransitioncommand.cpp index 2a24d2f..9520c6d 100644 --- a/src/commands/movetransitioncommand.cpp +++ b/src/commands/movetransitioncommand.cpp @@ -18,7 +18,7 @@ #include "movetransitioncommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> MoveTransitionCommand::MoveTransitionCommand(CustomTrackView *view, const ItemInfo &start, const ItemInfo &end, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/razorclipcommand.cpp b/src/commands/razorclipcommand.cpp index 8abf064..ba2099a 100644 --- a/src/commands/razorclipcommand.cpp +++ b/src/commands/razorclipcommand.cpp @@ -21,7 +21,7 @@ #include "razorclipcommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo &info, EffectsList stack, const GenTime &cutTime, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/resizeclipcommand.cpp b/src/commands/resizeclipcommand.cpp index aef1763..4082398 100644 --- a/src/commands/resizeclipcommand.cpp +++ b/src/commands/resizeclipcommand.cpp @@ -21,7 +21,7 @@ #include "resizeclipcommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> ResizeClipCommand::ResizeClipCommand(CustomTrackView *view, const ItemInfo &start, const ItemInfo &end, bool doIt, bool dontWorry, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/commands/splitaudiocommand.cpp b/src/commands/splitaudiocommand.cpp index ee25913..d303bc8 100644 --- a/src/commands/splitaudiocommand.cpp +++ b/src/commands/splitaudiocommand.cpp @@ -21,7 +21,7 @@ #include "splitaudiocommand.h" #include "customtrackview.h" -#include <KLocale> +#include <KLocalizedString> SplitAudioCommand::SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, const EffectsList &effects, QUndoCommand * parent) : QUndoCommand(parent), diff --git a/src/complexparameter.cpp b/src/complexparameter.cpp index 02298a9..09e260e 100644 --- a/src/complexparameter.cpp +++ b/src/complexparameter.cpp @@ -18,7 +18,7 @@ #include "complexparameter.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <QHeaderView> diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index c777d31..0cf3b48 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -69,7 +69,7 @@ #include "lib/audio/audioCorrelation.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <KUrl> #include <KIcon> #include <KCursor> diff --git a/src/definitions.h b/src/definitions.h index dd04bd2..4812dd7 100644 --- a/src/definitions.h +++ b/src/definitions.h @@ -24,7 +24,7 @@ #include "gentime.h" #include "effectslist.h" -#include <KLocale> +#include <KLocalizedString> #include <QDebug> #include <QTreeWidgetItem> diff --git a/src/documentvalidator.cpp b/src/documentvalidator.cpp index 899bad4..abd9174 100644 --- a/src/documentvalidator.cpp +++ b/src/documentvalidator.cpp @@ -26,7 +26,7 @@ #include <KDebug> #include <KMessageBox> #include <KApplication> -#include <KLocale> +#include <KLocalizedString> #include <KStandardDirs> #include <QFile> diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index 33c568f..dddae69 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -26,7 +26,7 @@ #include "monitormanager.h" #include <KStandardDirs> -#include <KLocale> +#include <KLocalizedString> #include <KFileDialog> #include <kmimetype.h> #include <KIO/NetAccess> diff --git a/src/effectslist.cpp b/src/effectslist.cpp index 1a09ebe..5bda6bd 100644 --- a/src/effectslist.cpp +++ b/src/effectslist.cpp @@ -19,7 +19,7 @@ #include "effectslist.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> EffectsList::EffectsList(bool indexRequired) : m_useIndex(indexRequired) diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp index a9e9328..567fa3e 100644 --- a/src/effectslistview.cpp +++ b/src/effectslistview.cpp @@ -24,7 +24,7 @@ #include "kdenlivesettings.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <KStandardDirs> #include <QMenu> diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp index c2a59f7..1bf0906 100644 --- a/src/effectstack/collapsibleeffect.cpp +++ b/src/effectstack/collapsibleeffect.cpp @@ -34,7 +34,7 @@ #include <KDebug> #include <KComboBox> #include <KGlobalSettings> -#include <KLocale> +#include <KLocalizedString> #include <KMessageBox> #include <KStandardDirs> #include <KFileDialog> diff --git a/src/effectstack/collapsiblegroup.cpp b/src/effectstack/collapsiblegroup.cpp index c4824e9..cd5a439 100644 --- a/src/effectstack/collapsiblegroup.cpp +++ b/src/effectstack/collapsiblegroup.cpp @@ -30,7 +30,7 @@ #include <KDebug> #include <KGlobalSettings> -#include <KLocale> +#include <KLocalizedString> #include <KMessageBox> #include <KStandardDirs> #include <KFileDialog> diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp index c5f8ec8..8fe4d1f 100644 --- a/src/effectstack/effectstackview2.cpp +++ b/src/effectstack/effectstackview2.cpp @@ -30,7 +30,7 @@ #include "collapsiblegroup.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <KMessageBox> #include <KStandardDirs> #include <KFileDialog> diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index 2a21a0f..11d9d7c 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -22,7 +22,7 @@ #include "kdenlivesettings.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <KFileDialog> #include <KComboBox> diff --git a/src/folderprojectitem.cpp b/src/folderprojectitem.cpp index 6f814b5..4a868f3 100644 --- a/src/folderprojectitem.cpp +++ b/src/folderprojectitem.cpp @@ -21,7 +21,7 @@ #include "folderprojectitem.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <KIcon> diff --git a/src/headertrack.cpp b/src/headertrack.cpp index cef0b2e..1967833 100644 --- a/src/headertrack.cpp +++ b/src/headertrack.cpp @@ -23,7 +23,7 @@ #include "kdenlivesettings.h" #include <KIcon> -#include <KLocale> +#include <KLocalizedString> #include <KDebug> #include <QMouseEvent> diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 291201f..01cd32e 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -35,7 +35,7 @@ #include <KStandardDirs> #include <KMessageBox> #include <KProgressDialog> -#include <KLocale> +#include <KLocalizedString> #include <KFileDialog> #include <KIO/NetAccess> #include <KIO/CopyJob> diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f387927..e0d461b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -69,7 +69,7 @@ #include <KApplication> #include <KAction> -#include <KLocale> +#include <KLocalizedString> #include <KGlobal> #include <KActionCollection> #include <KActionCategory> diff --git a/src/mltdevicecapture.cpp b/src/mltdevicecapture.cpp index 425b81a..296278a 100644 --- a/src/mltdevicecapture.cpp +++ b/src/mltdevicecapture.cpp @@ -25,7 +25,7 @@ #include <KDebug> #include <KStandardDirs> #include <KMessageBox> -#include <KLocale> +#include <KLocalizedString> #include <KTemporaryFile> #include <QTimer> diff --git a/src/monitor.cpp b/src/monitor.cpp index 0920da0..53abc68 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -27,7 +27,7 @@ #include "kdenlivesettings.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <KFileDialog> #include <KApplication> #include <KMessageBox> diff --git a/src/noteswidget.cpp b/src/noteswidget.cpp index e18e214..f3e5aaa 100644 --- a/src/noteswidget.cpp +++ b/src/noteswidget.cpp @@ -20,7 +20,7 @@ #include "noteswidget.h" -#include <KLocale> +#include <KLocalizedString> #include <KDebug> #include <QMenu> #include <QMouseEvent> diff --git a/src/projectitem.cpp b/src/projectitem.cpp index 6b5f573..3cb1150 100644 --- a/src/projectitem.cpp +++ b/src/projectitem.cpp @@ -24,7 +24,7 @@ #include "docclipbase.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <KIcon> #include <QFile> diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 86eb239..626a99d 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -48,7 +48,7 @@ #include <KDebug> #include <KAction> -#include <KLocale> +#include <KLocalizedString> #include <KFileDialog> #include <KInputDialog> #include <KMessageBox> diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp index 0b3c67d..6267017 100644 --- a/src/projectlistview.cpp +++ b/src/projectlistview.cpp @@ -26,7 +26,7 @@ #include <KDebug> #include <KMenu> -#include <KLocale> +#include <KLocalizedString> #include <QApplication> #include <QHeaderView> diff --git a/src/projecttree/abstractclipjob.cpp b/src/projecttree/abstractclipjob.cpp index 23f71a5..1956430 100644 --- a/src/projecttree/abstractclipjob.cpp +++ b/src/projecttree/abstractclipjob.cpp @@ -23,7 +23,7 @@ #include "kdenlivedoc.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> AbstractClipJob::AbstractClipJob(JOBTYPE type, CLIPTYPE cType, const QString &id, const QStringList &) : diff --git a/src/projecttree/cutclipjob.cpp b/src/projecttree/cutclipjob.cpp index 48bc77e..26ff2bb 100644 --- a/src/projecttree/cutclipjob.cpp +++ b/src/projecttree/cutclipjob.cpp @@ -23,7 +23,7 @@ #include "kdenlivedoc.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> CutClipJob::CutClipJob(CLIPTYPE cType, const QString &id, const QStringList ¶meters) : AbstractClipJob(CUTJOB, cType, id, parameters) { diff --git a/src/projecttree/meltjob.cpp b/src/projecttree/meltjob.cpp index 7fbb258..294ff94 100644 --- a/src/projecttree/meltjob.cpp +++ b/src/projecttree/meltjob.cpp @@ -24,7 +24,7 @@ #include <KDebug> #include <KUrl> -#include <KLocale> +#include <KLocalizedString> #include <mlt++/Mlt.h> diff --git a/src/projecttree/proxyclipjob.cpp b/src/projecttree/proxyclipjob.cpp index 1049cfb..ca56505 100644 --- a/src/projecttree/proxyclipjob.cpp +++ b/src/projecttree/proxyclipjob.cpp @@ -25,7 +25,7 @@ #include <KDebug> -#include <KLocale> +#include <KLocalizedString> ProxyJob::ProxyJob(CLIPTYPE cType, const QString &id, const QStringList& parameters) : AbstractClipJob(PROXYJOB, cType, id, parameters), diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index e104426..d8d2bd2 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -28,7 +28,7 @@ #include "profilesdialog.h" #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <KStandardDirs> #include <KComboBox> #include <KIO/NetAccess> diff --git a/src/renderer.cpp b/src/renderer.cpp index 444fcc7..ef5c177 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -35,7 +35,7 @@ #include <KDebug> #include <KStandardDirs> #include <KMessageBox> -#include <KLocale> +#include <KLocalizedString> #include <KTemporaryFile> #include <QTimer> diff --git a/src/scopes/abstractscopewidget.cpp b/src/scopes/abstractscopewidget.cpp index 4f94ba4..bce8631 100644 --- a/src/scopes/abstractscopewidget.cpp +++ b/src/scopes/abstractscopewidget.cpp @@ -21,6 +21,7 @@ #include <KConfigGroup> #include <KGlobal> +#include <KSharedConfig> // Uncomment for Scope debugging. //#define DEBUG_ASW diff --git a/src/simplekeyframes/simplekeyframewidget.cpp b/src/simplekeyframes/simplekeyframewidget.cpp index af8e477..85cbece 100644 --- a/src/simplekeyframes/simplekeyframewidget.cpp +++ b/src/simplekeyframes/simplekeyframewidget.cpp @@ -24,7 +24,7 @@ #include <QGridLayout> #include <KIcon> -#include <KLocale> +#include <KLocalizedString> SimpleKeyframeWidget::SimpleKeyframeWidget(const Timecode &t, int duration, QWidget *parent) : QWidget(parent) diff --git a/src/smallruler.cpp b/src/smallruler.cpp index ee77912..d5b9903 100644 --- a/src/smallruler.cpp +++ b/src/smallruler.cpp @@ -23,7 +23,7 @@ #include <KDebug> #include <KColorScheme> -#include <KLocale> +#include <KLocalizedString> #include <QMouseEvent> #include <QStylePainter> diff --git a/src/stopmotion/capturehandler.cpp b/src/stopmotion/capturehandler.cpp index f1778dd..99318c7 100644 --- a/src/stopmotion/capturehandler.cpp +++ b/src/stopmotion/capturehandler.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include <KLocale> +#include <KLocalizedString> #include "capturehandler.h" #include "kdenlivesettings.h" diff --git a/src/subprojectitem.cpp b/src/subprojectitem.cpp index 7b1f745..b03ed5c 100644 --- a/src/subprojectitem.cpp +++ b/src/subprojectitem.cpp @@ -26,7 +26,7 @@ #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include <KIcon> const int DurationRole = Qt::UserRole + 1; diff --git a/src/timecode.cpp b/src/timecode.cpp index 789b286..d36b0f2 100644 --- a/src/timecode.cpp +++ b/src/timecode.cpp @@ -82,7 +82,7 @@ return frameNumber; #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include "timecode.h" diff --git a/src/titledocument.cpp b/src/titledocument.cpp index 16fcda4..f76707b 100644 --- a/src/titledocument.cpp +++ b/src/titledocument.cpp @@ -22,7 +22,7 @@ #include <kio/netaccess.h> #include <KApplication> #include <KStandardDirs> -#include <KLocale> +#include <KLocalizedString> #include <KMessageBox> #include <QGraphicsScene> diff --git a/src/utils/archiveorg.cpp b/src/utils/archiveorg.cpp index e6b9296..357b9b8 100644 --- a/src/utils/archiveorg.cpp +++ b/src/utils/archiveorg.cpp @@ -30,7 +30,7 @@ #include <KDebug> #include "kdenlivesettings.h" #include <kio/job.h> -#include <KLocale> +#include <KLocalizedString> #ifdef USE_QJSON #include <qjson/parser.h> diff --git a/src/utils/freesound.cpp b/src/utils/freesound.cpp index 962984f..00cb6ee 100644 --- a/src/utils/freesound.cpp +++ b/src/utils/freesound.cpp @@ -30,7 +30,7 @@ #include <KDebug> #include "kdenlivesettings.h" #include <kio/job.h> -#include <KLocale> +#include <KLocalizedString> #ifdef USE_QJSON #include <qjson/parser.h> diff --git a/src/v4l/v4lcapture.cpp b/src/v4l/v4lcapture.cpp index cf0e247..8e6a63b 100644 --- a/src/v4l/v4lcapture.cpp +++ b/src/v4l/v4lcapture.cpp @@ -30,7 +30,7 @@ #include <QPainter> #include <KDebug> -#include <KLocale> +#include <KLocalizedString> #include "v4lcapture.h" #include "kdenlivesettings.h" diff --git a/src/wizard.cpp b/src/wizard.cpp index 7267e4b..47de0a0 100644 --- a/src/wizard.cpp +++ b/src/wizard.cpp @@ -30,7 +30,7 @@ #include <framework/mlt_version.h> #include <KStandardDirs> -#include <KLocale> +#include <KLocalizedString> #include <KProcess> #include <kmimetype.h> #include <KRun> |