mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-26 02:35:38 +08:00
refactor: Rename old vatlib function
This commit is contained in:
@@ -1007,7 +1007,7 @@ namespace BlackCore
|
|||||||
this->addParserOption(m_cmdDBusAddress);
|
this->addParserOption(m_cmdDBusAddress);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CApplication::addVatlibOptions()
|
void CApplication::addNetworkOptions()
|
||||||
{
|
{
|
||||||
this->addParserOptions(IContextNetwork::getCmdLineOptions());
|
this->addParserOptions(IContextNetwork::getCmdLineOptions());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -252,8 +252,8 @@ namespace BlackCore
|
|||||||
//! DBus address from CMD line, otherwise ""
|
//! DBus address from CMD line, otherwise ""
|
||||||
QString getCmdDBusAddressValue() const;
|
QString getCmdDBusAddressValue() const;
|
||||||
|
|
||||||
//! Add the VATLIB options
|
//! Add the network options
|
||||||
void addVatlibOptions();
|
void addNetworkOptions();
|
||||||
|
|
||||||
//! Add the audio options
|
//! Add the audio options
|
||||||
void addAudioOptions();
|
void addAudioOptions();
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
|
|||||||
CGuiApplication a(CApplicationInfo::swiftCore(), CApplicationInfo::PilotClientCore, CIcons::swiftCore24());
|
CGuiApplication a(CApplicationInfo::swiftCore(), CApplicationInfo::PilotClientCore, CIcons::swiftCore24());
|
||||||
a.addWindowStateOption();
|
a.addWindowStateOption();
|
||||||
a.addDBusAddressOption();
|
a.addDBusAddressOption();
|
||||||
a.addVatlibOptions();
|
a.addNetworkOptions();
|
||||||
a.addAudioOptions();
|
a.addAudioOptions();
|
||||||
if (!a.parseCommandLineArgsAndLoadSetup()) { return EXIT_FAILURE; }
|
if (!a.parseCommandLineArgsAndLoadSetup()) { return EXIT_FAILURE; }
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ CSwiftGuiStdApplication::CSwiftGuiStdApplication() : CGuiApplication(CApplicatio
|
|||||||
{
|
{
|
||||||
this->addParserOption(m_cmdFacadeMode);
|
this->addParserOption(m_cmdFacadeMode);
|
||||||
this->addDBusAddressOption();
|
this->addDBusAddressOption();
|
||||||
this->addVatlibOptions();
|
this->addNetworkOptions();
|
||||||
this->addAudioOptions();
|
this->addAudioOptions();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
|
|||||||
QApplication qa(argc, argv); // needed
|
QApplication qa(argc, argv); // needed
|
||||||
Q_UNUSED(qa)
|
Q_UNUSED(qa)
|
||||||
CGuiApplication a(CApplicationInfo::swiftLauncher(), CApplicationInfo::Laucher, CIcons::swiftLauncher1024());
|
CGuiApplication a(CApplicationInfo::swiftLauncher(), CApplicationInfo::Laucher, CIcons::swiftLauncher1024());
|
||||||
a.addVatlibOptions(); // so it can be passed (hand over) to started applications
|
a.addNetworkOptions(); // so it can be passed (hand over) to started applications
|
||||||
a.addDBusAddressOption(); // required by the dbus server address selector
|
a.addDBusAddressOption(); // required by the dbus server address selector
|
||||||
const QCommandLineOption installerOption { { "i", "installer" }, QCoreApplication::translate("main", "Installer setup.") };
|
const QCommandLineOption installerOption { { "i", "installer" }, QCoreApplication::translate("main", "Installer setup.") };
|
||||||
a.addParserOption(installerOption);
|
a.addParserOption(installerOption);
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
BLACKTEST_INIT(BlackCoreTest::CTestContext)
|
BLACKTEST_INIT(BlackCoreTest::CTestContext)
|
||||||
CApplication a(CApplicationInfo::UnitTest);
|
CApplication a(CApplicationInfo::UnitTest);
|
||||||
a.addVatlibOptions();
|
a.addNetworkOptions();
|
||||||
const bool setup = a.parseCommandLineArgsAndLoadSetup();
|
const bool setup = a.parseCommandLineArgsAndLoadSetup();
|
||||||
if (!setup) { qWarning() << "No setup loaded"; }
|
if (!setup) { qWarning() << "No setup loaded"; }
|
||||||
int r = EXIT_FAILURE;
|
int r = EXIT_FAILURE;
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
|
|||||||
QCoreApplication app(argc, argv);
|
QCoreApplication app(argc, argv);
|
||||||
BLACKTEST_INIT(BlackCoreTest::CTestConnectivity)
|
BLACKTEST_INIT(BlackCoreTest::CTestConnectivity)
|
||||||
CApplication a(CApplicationInfo::UnitTest);
|
CApplication a(CApplicationInfo::UnitTest);
|
||||||
a.addVatlibOptions();
|
a.addNetworkOptions();
|
||||||
const bool setup = a.parseCommandLineArgsAndLoadSetup();
|
const bool setup = a.parseCommandLineArgsAndLoadSetup();
|
||||||
if (!setup) { qWarning() << "No setup loaded"; }
|
if (!setup) { qWarning() << "No setup loaded"; }
|
||||||
int r = EXIT_FAILURE;
|
int r = EXIT_FAILURE;
|
||||||
|
|||||||
Reference in New Issue
Block a user