Skip to content

Commit d79db23

Browse files
statusicon-qt: Use different class name than GTK plugin
1 parent 913ef68 commit d79db23

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

src/statusicon-qt/statusicon.cc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <QSystemTrayIcon>
3333
#include <QWheelEvent>
3434

35-
class StatusIcon : public GeneralPlugin
35+
class StatusIconQt : public GeneralPlugin
3636
{
3737
public:
3838
static const char about[];
@@ -49,7 +49,7 @@ class StatusIcon : public GeneralPlugin
4949
PluginQtOnly
5050
};
5151

52-
constexpr StatusIcon () : GeneralPlugin (info, false) {}
52+
constexpr StatusIconQt () : GeneralPlugin (info, false) {}
5353

5454
bool init () override;
5555
void cleanup () override;
@@ -62,9 +62,9 @@ class StatusIcon : public GeneralPlugin
6262
static void toggle_aud_ui ();
6363
};
6464

65-
EXPORT StatusIcon aud_plugin_instance;
65+
EXPORT StatusIconQt aud_plugin_instance;
6666

67-
const char StatusIcon::about[] =
67+
const char StatusIconQt::about[] =
6868
N_("Status Icon Plugin (partial port for Qt interface)\n\n"
6969
"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
7070
"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
@@ -82,7 +82,7 @@ enum {
8282
SI_CFG_MIDDLE_CLICK_ACTION_NEXT
8383
};
8484

85-
const char * const StatusIcon::defaults[] = {
85+
const char * const StatusIconQt::defaults[] = {
8686
"scroll_action", aud::numeric_string<SI_CFG_SCROLL_ACTION_VOLUME>::str,
8787
"middle_click_action", aud::numeric_string<SI_CFG_MIDDLE_CLICK_ACTION_PAUSE>::str,
8888
"disable_popup", "FALSE",
@@ -91,7 +91,7 @@ const char * const StatusIcon::defaults[] = {
9191
nullptr
9292
};
9393

94-
const PreferencesWidget StatusIcon::widgets[] = {
94+
const PreferencesWidget StatusIconQt::widgets[] = {
9595
WidgetLabel (N_("<b>Mouse Scroll Action</b>")),
9696
WidgetRadio (N_("Change volume"),
9797
WidgetInt ("statusicon", "scroll_action"),
@@ -115,17 +115,17 @@ const PreferencesWidget StatusIcon::widgets[] = {
115115
WidgetBool ("statusicon", "reverse_scroll"))
116116
};
117117

118-
const PluginPreferences StatusIcon::prefs = {{widgets}};
118+
const PluginPreferences StatusIconQt::prefs = {{widgets}};
119119

120-
const audqt::MenuItem StatusIcon::items[] =
120+
const audqt::MenuItem StatusIconQt::items[] =
121121
{
122122
audqt::MenuCommand ({N_("_Play"), "media-playback-start"}, aud_drct_play),
123123
audqt::MenuCommand ({N_("Paus_e"), "media-playback-pause"}, aud_drct_pause),
124124
audqt::MenuCommand ({N_("_Stop"), "media-playback-stop"}, aud_drct_stop),
125125
audqt::MenuCommand ({N_("Pre_vious"), "media-skip-backward"}, aud_drct_pl_prev),
126126
audqt::MenuCommand ({N_("_Next"), "media-skip-forward"}, aud_drct_pl_next),
127127
audqt::MenuSep (),
128-
audqt::MenuCommand ({N_("_Open Files ..."), "document-open"}, StatusIcon::open_files),
128+
audqt::MenuCommand ({N_("_Open Files ..."), "document-open"}, StatusIconQt::open_files),
129129
audqt::MenuCommand ({N_("Se_ttings ..."), "preferences-system"}, audqt::prefswin_show),
130130
audqt::MenuCommand ({N_("_Quit"), "application-exit"}, aud_quit),
131131
};
@@ -195,7 +195,7 @@ bool SystemTrayIcon::event (QEvent * e)
195195
static SystemTrayIcon * tray = nullptr;
196196
static QMenu * menu = nullptr;
197197

198-
bool StatusIcon::init ()
198+
bool StatusIconQt::init ()
199199
{
200200
aud_config_set_defaults ("statusicon", defaults);
201201

@@ -217,7 +217,7 @@ bool StatusIcon::init ()
217217
return true;
218218
}
219219

220-
void StatusIcon::cleanup ()
220+
void StatusIconQt::cleanup ()
221221
{
222222
hook_dissociate ("title change", update_tooltip);
223223
hook_dissociate ("playback ready", update_tooltip);
@@ -238,13 +238,13 @@ void StatusIcon::cleanup ()
238238
audqt::cleanup ();
239239
}
240240

241-
void StatusIcon::update_tooltip (void * data, void * user_data)
241+
void StatusIconQt::update_tooltip (void * data, void * user_data)
242242
{
243243
String title = aud_drct_get_title ();
244244
tray->setToolTip (QString (title));
245245
}
246246

247-
void StatusIcon::window_closed (void * data, void * user_data)
247+
void StatusIconQt::window_closed (void * data, void * user_data)
248248
{
249249
bool * handled = (bool *) data;
250250

@@ -255,7 +255,7 @@ void StatusIcon::window_closed (void * data, void * user_data)
255255
}
256256
}
257257

258-
void StatusIcon::activate (QSystemTrayIcon::ActivationReason reason)
258+
void StatusIconQt::activate (QSystemTrayIcon::ActivationReason reason)
259259
{
260260
switch (reason)
261261
{
@@ -282,12 +282,12 @@ void StatusIcon::activate (QSystemTrayIcon::ActivationReason reason)
282282
}
283283
}
284284

285-
void StatusIcon::open_files ()
285+
void StatusIconQt::open_files ()
286286
{
287287
audqt::fileopener_show (audqt::FileMode::Open);
288288
}
289289

290-
void StatusIcon::toggle_aud_ui ()
290+
void StatusIconQt::toggle_aud_ui ()
291291
{
292292
aud_ui_show (! aud_ui_is_shown ());
293293
}

0 commit comments

Comments
 (0)