mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 13:06:59 -04:00
(sorry for making this all one commit)
Fiddled with the backbone for scripts some more. VCS are now suppported in sets but configuration/non-svn-systems missing Linux build now uses precompiled headers (build time--) A couple warning fixes too. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1427 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -513,7 +513,6 @@ IMPLEMENT_REFLECTION(Packaged) {
|
||||
Packaged::Packaged()
|
||||
: position_hint(100000)
|
||||
, fully_loaded(true)
|
||||
, vcs(nullptr)
|
||||
{}
|
||||
|
||||
InputStreamP Packaged::openIconFile() {
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <util/dynamic_arg.hpp>
|
||||
#include <util/error.hpp>
|
||||
#include <util/file_utils.hpp>
|
||||
#include <util/io/vcs.hpp>
|
||||
#include <util/vcs.hpp>
|
||||
|
||||
class Package;
|
||||
class wxFileInputStream;
|
||||
@@ -143,7 +143,7 @@ class Package : public IntrusivePtrVirtualBase {
|
||||
}
|
||||
|
||||
protected:
|
||||
// TODO: I dislike this very much. There ought to be a better way.
|
||||
// TODO: I dislike putting this here very much. There ought to be a better way.
|
||||
virtual VCSP getVCS() { return new_intrusive<VCS>(); }
|
||||
|
||||
// --------------------------------------------------- : Private stuff
|
||||
@@ -219,7 +219,6 @@ class Packaged : public Package {
|
||||
String icon_filename; ///< Filename of icon to use in package lists
|
||||
vector<PackageDependencyP> dependencies; ///< Dependencies of this package
|
||||
int position_hint; ///< A hint for the package list
|
||||
VCSP vcs; ///< The version control system to use
|
||||
|
||||
/// Get an input stream for the package icon, if there is any
|
||||
InputStreamP openIconFile();
|
||||
@@ -243,10 +242,6 @@ class Packaged : public Package {
|
||||
}
|
||||
|
||||
protected:
|
||||
virtual VCSP getVCS() {
|
||||
return vcs;
|
||||
}
|
||||
|
||||
/// filename of the data file, and extension of the package file
|
||||
virtual String typeName() const = 0;
|
||||
/// Can be overloaded to do validation after loading
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ void Regex::assign(const String& code) {
|
||||
} catch (const boost::regex_error& e) {
|
||||
/// TODO: be more precise
|
||||
throw ScriptError(String::Format(_("Error while compiling regular expression: '%s'\nAt position: %d\n%s"),
|
||||
code.c_str(), e.position(), String(e.what(), IF_UNICODE(wxConvUTF8,String::npos))));
|
||||
code.c_str(), e.position(), String(e.what(), IF_UNICODE(wxConvUTF8,String::npos)).c_str()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user