rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#5617 Remove plugin interface from Arch

This commit is contained in:
Andrew Nelless 2016-09-27 12:57:30 +01:00
parent 77d6b83b0c
commit 45ef3e1080
4 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/arch/Arch.h
View File

@ -50,7 +50,6 @@
# include "arch/win32/ArchSystemWindows.h" # include "arch/win32/ArchSystemWindows.h"
# include "arch/win32/ArchTaskBarWindows.h" # include "arch/win32/ArchTaskBarWindows.h"
# include "arch/win32/ArchTimeWindows.h" # include "arch/win32/ArchTimeWindows.h"
# include "arch/win32/ArchPluginWindows.h"
# include "arch/win32/ArchInternetWindows.h" # include "arch/win32/ArchInternetWindows.h"
#elif SYSAPI_UNIX #elif SYSAPI_UNIX
# include "arch/unix/ArchConsoleUnix.h" # include "arch/unix/ArchConsoleUnix.h"
@ -66,7 +65,6 @@
# include "arch/unix/ArchSystemUnix.h" # include "arch/unix/ArchSystemUnix.h"
# include "arch/unix/ArchTaskBarXWindows.h" # include "arch/unix/ArchTaskBarXWindows.h"
# include "arch/unix/ArchTimeUnix.h" # include "arch/unix/ArchTimeUnix.h"
# include "arch/unix/ArchPluginUnix.h"
# include "arch/unix/ArchInternetUnix.h" # include "arch/unix/ArchInternetUnix.h"
#endif #endif
@ -122,12 +120,10 @@ public:
static void setInstance(Arch* s) { s_instance = s; } static void setInstance(Arch* s) { s_instance = s; }
ARCH_PLUGIN& plugin() const { return (ARCH_PLUGIN&)m_plugin; }
ARCH_INTERNET& internet() const { return (ARCH_INTERNET&)m_internet; } ARCH_INTERNET& internet() const { return (ARCH_INTERNET&)m_internet; }
private: private:
static Arch* s_instance; static Arch* s_instance;
ARCH_PLUGIN m_plugin;
ARCH_INTERNET m_internet; ARCH_INTERNET m_internet;
}; };

14
src/lib/arch/IArchFile.h
View File

@ -63,13 +63,6 @@ public:
*/ */
virtual std::string getLogDirectory() = 0; virtual std::string getLogDirectory() = 0;
//! Get plugins directory
/*!
Returns the plugin files directory. If no plugin directory is set,
this will return the plugin folder within the user's profile.
*/
virtual std::string getPluginDirectory() = 0;
//! Get user's profile directory //! Get user's profile directory
/*! /*!
Returns the user's profile directory. If no profile directory is set, Returns the user's profile directory. If no profile directory is set,
@ -95,11 +88,4 @@ public:
Returns the user's profile directory. Returns the user's profile directory.
*/ */
virtual void setProfileDirectory(const String& s) = 0; virtual void setProfileDirectory(const String& s) = 0;
//@}
//! Set the user's plugin directory
/*
Returns the user's plugin directory.
*/
virtual void setPluginDirectory(const String& s) = 0;
}; };

3
src/lib/arch/unix/ArchFileUnix.h
View File

@ -34,14 +34,11 @@ public:
virtual std::string getSystemDirectory(); virtual std::string getSystemDirectory();
virtual std::string getInstalledDirectory(); virtual std::string getInstalledDirectory();
virtual std::string getLogDirectory(); virtual std::string getLogDirectory();
virtual std::string getPluginDirectory();
virtual std::string getProfileDirectory(); virtual std::string getProfileDirectory();
virtual std::string concatPath(const std::string& prefix, virtual std::string concatPath(const std::string& prefix,
const std::string& suffix); const std::string& suffix);
virtual void setProfileDirectory(const String& s); virtual void setProfileDirectory(const String& s);
virtual void setPluginDirectory(const String& s);
private: private:
String m_profileDirectory; String m_profileDirectory;
String m_pluginDirectory;
}; };

3
src/lib/arch/win32/ArchFileWindows.h
View File

@ -34,14 +34,11 @@ public:
virtual std::string getSystemDirectory(); virtual std::string getSystemDirectory();
virtual std::string getInstalledDirectory(); virtual std::string getInstalledDirectory();
virtual std::string getLogDirectory(); virtual std::string getLogDirectory();
virtual std::string getPluginDirectory();
virtual std::string getProfileDirectory(); virtual std::string getProfileDirectory();
virtual std::string concatPath(const std::string& prefix, virtual std::string concatPath(const std::string& prefix,
const std::string& suffix); const std::string& suffix);
virtual void setProfileDirectory(const String& s); virtual void setProfileDirectory(const String& s);
virtual void setPluginDirectory(const String& s);
private: private:
String m_profileDirectory; String m_profileDirectory;
String m_pluginDirectory;
}; };