Skip to content

Commit

Permalink
Merge pull request #4072 from Holzhaus/mixxxmainwindow
Browse files Browse the repository at this point in the history
Rename mixxx.{cpp,h} to mixxxmainwindow.{cpp,h}
  • Loading branch information
uklotzde authored Jul 7, 2021
2 parents 13696bc + 85e22c7 commit 4aba92d
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -703,8 +703,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/mixer/sampler.cpp
src/mixer/samplerbank.cpp
src/coreservices.cpp
src/mixxx.cpp
src/mixxxapplication.cpp
src/mixxxmainwindow.cpp
src/musicbrainz/chromaprinter.cpp
src/musicbrainz/crc.cpp
src/musicbrainz/gzip.cpp
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#include "coreservices.h"
#include "errordialoghandler.h"
#include "mixxx.h"
#include "mixxxapplication.h"
#include "mixxxmainwindow.h"
#include "sources/soundsourceproxy.h"
#include "util/cmdlineargs.h"
#include "util/console.h"
Expand Down
4 changes: 2 additions & 2 deletions src/mixxx.cpp → src/mixxxmainwindow.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "mixxx.h"
#include "mixxxmainwindow.h"

#include <QDesktopServices>
#include <QFileDialog>
Expand All @@ -18,7 +18,7 @@
#include "effects/builtin/builtinbackend.h"
#include "effects/effectsmanager.h"
#include "engine/enginemaster.h"
#include "moc_mixxx.cpp"
#include "moc_mixxxmainwindow.cpp"
#include "preferences/constants.h"
#include "preferences/dialog/dlgprefeq.h"
#include "preferences/dialog/dlgpreferences.h"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/preferences/dialog/dlgprefdeck.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "mixer/basetrackplayer.h"
#include "mixer/playerinfo.h"
#include "mixer/playermanager.h"
#include "mixxx.h"
#include "mixxxmainwindow.h"
#include "moc_dlgprefdeck.cpp"
#include "preferences/usersettings.h"
#include "util/compatibility.h"
Expand Down
2 changes: 1 addition & 1 deletion src/preferences/dialog/dlgprefinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "control/controlobject.h"
#include "control/controlproxy.h"
#include "defs_urls.h"
#include "mixxx.h"
#include "mixxxmainwindow.h"
#include "moc_dlgprefinterface.cpp"
#include "preferences/usersettings.h"
#include "skin/legacy/legacyskinparser.h"
Expand Down
2 changes: 1 addition & 1 deletion src/preferences/dialog/dlgprefwaveform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "library/dao/analysisdao.h"
#include "library/library.h"
#include "mixxx.h"
#include "mixxxmainwindow.h"
#include "moc_dlgprefwaveform.cpp"
#include "preferences/waveformsettings.h"
#include "util/db/dbconnectionpooled.h"
Expand Down

0 comments on commit 4aba92d

Please sign in to comment.