OSDN Git Service
(root)
/
qcad
/
qcad.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5fe75ba
)
removes setOutputFilename
author
H. Watanabe
<kaityo@users.sourceforge.jp>
Fri, 17 Apr 2015 02:11:15 +0000
(11:11 +0900)
committer
H. Watanabe
<kaityo@users.sourceforge.jp>
Fri, 17 Apr 2015 02:11:15 +0000
(11:11 +0900)
compiler/qcrun.cpp
patch
|
blob
|
history
diff --git
a/compiler/qcrun.cpp
b/compiler/qcrun.cpp
index
5898a85
..
2dda0ec
100644
(file)
--- a/
compiler/qcrun.cpp
+++ b/
compiler/qcrun.cpp
@@
-40,7
+40,7
@@
void forceQuit(void);
void printUsage(void);
\r
void printVersion(void);
\r
void errorAndQuit(const char * const inMessage);
\r
void printUsage(void);
\r
void printVersion(void);
\r
void errorAndQuit(const char * const inMessage);
\r
-std::string
setOutput
Filename(const std::string &inString);
\r
+std::string
getBase
Filename(const std::string &inString);
\r
\r
//----------------------------------------------------------------------------
\r
/**
\r
\r
//----------------------------------------------------------------------------
\r
/**
\r
@@
-136,7
+136,8
@@
int main(int argc, char **argv) {
//_____ OUTPUT ______
\r
if (isSet(parameters_ready, opt_input)) {
\r
if (false == isSet(parameters_ready, opt_output)) {
\r
//_____ OUTPUT ______
\r
if (isSet(parameters_ready, opt_input)) {
\r
if (false == isSet(parameters_ready, opt_output)) {
\r
- ofilename = setOutputFilename(ifilename);
\r
+ //ofilename = setOutputFilename(ifilename);
\r
+ ofilename = getBaseFilename(ifilename)+".qdt";
\r
}
\r
\r
std::ifstream ifs(ifilename.c_str(), std::ios::in);
\r
}
\r
\r
std::ifstream ifs(ifilename.c_str(), std::ios::in);
\r
@@
-183,6
+184,7
@@
int main(int argc, char **argv) {
}
\r
\r
qBits->SaveToFile(ofilename.c_str());
\r
}
\r
\r
qBits->SaveToFile(ofilename.c_str());
\r
+ qBits->SaveAsText("test.txt");
\r
delete qBits;
\r
delete qCCntl;
\r
\r
delete qBits;
\r
delete qCCntl;
\r
\r
@@
-293,9
+295,9
@@
void errorAndQuit(const char * const inMessage) {
\r
//----------------------------------------------------------------------------
\r
/**
\r
\r
//----------------------------------------------------------------------------
\r
/**
\r
- *
Set output
filename
\r
+ *
get basename of
filename
\r
*/
\r
*/
\r
-std::string
setOutput
Filename(const std::string &inString) {
\r
+std::string
getBase
Filename(const std::string &inString) {
\r
std::string retString = "";
\r
\r
unsigned int posdot = inString.rfind(".", inString.length() - 1);
\r
std::string retString = "";
\r
\r
unsigned int posdot = inString.rfind(".", inString.length() - 1);
\r
@@
-305,9
+307,6
@@
std::string setOutputFilename(const std::string &inString) {
} else {
\r
retString.assign(inString, 0, posdot);
\r
}
\r
} else {
\r
retString.assign(inString, 0, posdot);
\r
}
\r
-
\r
- retString += ".qdt";
\r
-
\r
return retString;
\r
}
\r
return retString;
\r
}
\r
-
\r
+//----------------------------------------------------------------------------
\r