diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-16 15:05:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:51 +0100 |
| commit | 182a74d937088f0f08850014a7b918719e106b7d (patch) | |
| tree | 0a286f4a6a5adcd32fd32a26b61b247d247c93d2 /avmedia | |
| parent | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (diff) | |
de-hrc various things
e.g. helpid[s].hrc -> helpids.h
and insert include guards where missing
move "ordinary" defines into .hxx files
remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead
Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/inc/helpids.h (renamed from avmedia/inc/helpids.hrc) | 4 | ||||
| -rw-r--r-- | avmedia/source/framework/MediaControlBase.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/framework/mediaplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.h index f7152de0621f..3d9a8c782369 100644 --- a/avmedia/inc/helpids.hrc +++ b/avmedia/inc/helpids.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_INC_HELPIDS_HRC -#define INCLUDED_AVMEDIA_INC_HELPIDS_HRC +#ifndef INCLUDED_AVMEDIA_INC_HELPIDS_H +#define INCLUDED_AVMEDIA_INC_HELPIDS_H #define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY" #define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE" diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx index ba848c050915..09bd5bf146af 100644 --- a/avmedia/source/framework/MediaControlBase.cxx +++ b/avmedia/source/framework/MediaControlBase.cxx @@ -28,7 +28,7 @@ #include <vcl/lstbox.hxx> #include "bitmaps.hlst" #include "strings.hrc" -#include "helpids.hrc" +#include "helpids.h" #include "mediamisc.hxx" using ::rtl::OUString; diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index c5695c4f185a..614430a325ae 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -22,7 +22,7 @@ #include "mediamisc.hxx" #include <avmedia/mediawindow.hxx> #include <avmedia/mediaplayer.hxx> -#include "helpids.hrc" +#include "helpids.h" #include <tools/time.hxx> #include <svtools/miscopt.hxx> #include <vcl/svapp.hxx> diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index 6cce70f2e026..a544d5103fc0 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -22,7 +22,7 @@ #include <avmedia/mediaitem.hxx> #include "mediamisc.hxx" #include "strings.hrc" -#include "helpids.hrc" +#include "helpids.h" #include <svl/stritem.hxx> #include <sfx2/app.hxx> diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 13eb6626774f..78f709850861 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -25,7 +25,7 @@ #include "mediamisc.hxx" #include "strings.hrc" #include "bitmaps.hlst" -#include "helpids.hrc" +#include "helpids.h" #include <algorithm> #include <cmath> |