重命名实现空间

CoreTest/configtest.cpp

@@ -1,6 +1,8 @@
 #include "configtest.h"
 #include <xmlconfig.h>
+
 using namespace Config;
+using namespace TestCase;
 
 ConfigTest::ConfigTest(Configration *test_ins)
     : xml(test_ins)

CoreTest/configtest.h

@@ -4,6 +4,8 @@
 #include <libConfig.h>
 #include <QtTest/QTest>
 
+namespace TestCase {
+
     class ConfigTest : public QObject
     {
         Q_OBJECT
@@ -20,5 +22,7 @@ private slots:
         void testList();
         void testMap();
     };
+}
+
 
 #endif // CONFIGTEST_H

CoreTest/main.cpp

@@ -3,6 +3,8 @@
 #include "xmlconfig.h"
 
 
+using namespace TestCase;
+
 int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);

QtNovelDesc.pro

@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
+    CoreTest \
     DesParser \
     Testpad \
     WordsIDE \

QtNovelDesc.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.15.0, 2023-01-26T18:33:12. -->
+<!-- Written by QtCreator 4.15.0, 2023-02-25T17:12:50. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -67,7 +67,14 @@
     <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
     <value type="bool" key="AutoTest.Framework.QtTest">true</value>
    </valuemap>
-   <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
+   <valuemap type="QVariantMap" key="AutoTest.CheckStates">
+    <value type="Qt::CheckState" key="1@D:/Projects/Cpp/QtNovelDesc/CoreTest/configtest.cpp:testConfig">Checked</value>
+    <value type="Qt::CheckState" key="1@D:/Projects/Cpp/QtNovelDesc/CoreTest/configtest.cpp:testException">Checked</value>
+    <value type="Qt::CheckState" key="1@D:/Projects/Cpp/QtNovelDesc/CoreTest/configtest.cpp:testList">Checked</value>
+    <value type="Qt::CheckState" key="1@D:/Projects/Cpp/QtNovelDesc/CoreTest/configtest.cpp:testMap">Checked</value>
+    <value type="Qt::CheckState" key="1@D:/Projects/Cpp/QtNovelDesc/CoreTest/configtest.cpp:testReload">Checked</value>
+    <value type="Qt::CheckState" key="1@D:/Projects/Cpp/QtNovelDesc/CoreTest/configtest.h:ConfigTest">Checked</value>
+   </valuemap>
    <value type="int" key="AutoTest.RunAfterBuild">0</value>
    <value type="bool" key="AutoTest.UseGlobal">true</value>
    <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey">
@@ -85,6 +92,9 @@
     <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
     <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
    </valuemap>
+   <valuemap type="QVariantMap" key="CppEditor.QuickFix">
+    <value type="bool" key="UseGlobalSettings">true</value>
+   </valuemap>
   </valuemap>
  </data>
  <data>
@@ -96,7 +106,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.51211.win64_msvc2017_64_kit</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">2</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">3</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="int" key="EnableQmlDebugging">0</value>
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\Projects\Cpp\build-QtNovelDesc-Desktop_Qt_5_12_11_MSVC2017_64bit-Debug</value>
@@ -449,7 +459,80 @@
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Projects/Cpp/build-QtNovelDesc-Desktop_Qt_5_12_11_MSVC2017_64bit-Debug/WordsIDE</value>
    </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.3">
+    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
+    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
+     <value type="QString">cpu-cycles</value>
+    </valuelist>
+    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
+    <value type="int" key="Analyzer.Perf.Frequency">250</value>
+    <valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
+     <value type="QString">-e</value>
+     <value type="QString">cpu-cycles</value>
+     <value type="QString">--call-graph</value>
+     <value type="QString">dwarf,4096</value>
+     <value type="QString">-F</value>
+     <value type="QString">250</value>
+    </valuelist>
+    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="QString" key="Analyzer.Valgrind.Callgrind.Arguments"></value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="QString" key="Analyzer.Valgrind.Memcheck.Arguments"></value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindArguments"></value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <valuelist type="QVariantList" key="CustomOutputParsers"/>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Projects/Cpp/QtNovelDesc/CoreTest/CoreTest.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/Projects/Cpp/QtNovelDesc/CoreTest/CoreTest.pro</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Projects/Cpp/build-QtNovelDesc-Desktop_Qt_5_12_11_MSVC2017_64bit-Debug/CoreTest</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">4</value>
   </valuemap>
  </data>
  <data>

Testpad/main.cpp

@@ -10,11 +10,11 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
 
-    try {
+    QFile x("./test.dd");
-        throw new std::exception();
+    qDebug() << x.open(QIODevice::WriteOnly);
-    }  catch (std::exception *) {
+    qDebug() << x.exists();
-        qDebug() << "catched";
+    qDebug() << x.open(QIODevice::WriteOnly);
-    }
+    qDebug() << x.exists();
 
     return a.exec();
 }

WordsIDE/SourceEditView.cpp

@@ -138,7 +138,7 @@ void FormattedTextEdit::textContentReset(const QString &value)
     edit_square->setPlainText(value);
 }
 
-namespace __temp {
+namespace __impl_temp {
     class TextEditConfigration : public QWidget
     {
     public:
@@ -192,7 +192,7 @@ QList<Scale> TextContentEditFactory::configs() const
 
 QWidget *TextContentEditFactory::getNewPanel(Config::Configration *config)
 {
-    return new __temp::TextEditConfigration(config);
+    return new __impl_temp::TextEditConfigration(config);
 }
 
 QString TextContentEditFactory::extensionName() const

WordsIDE/sourcecodeeditor.cpp

@@ -113,7 +113,7 @@ QList<Core::Scale> SourceCodeEditorFactory::configs() const
     return QList<Core::Scale>() << Core::Scale::Project << Core::Scale::Global;
 }
 
-namespace __temp {
+namespace __impl_temp {
     class XMarksConfig : public QWidget
     {
     public:
@@ -148,7 +148,7 @@ namespace __temp {
 
 QWidget *SourceCodeEditorFactory::getNewPanel(Config::Configration *config)
 {
-    return new __temp::XMarksConfig(config);
+    return new __impl_temp::XMarksConfig(config);
 }
 
 QString SourceCodeEditorFactory::extensionName() const

WordsIDE/storyboardsourceedit.cpp

@@ -103,7 +103,7 @@ QList<Scale> StoryBoardSourceEditFactory::configs() const
     return QList<Scale>() << Scale::Project << Scale::Global;
 }
 
-namespace __temp {
+namespace __impl_temp {
     class BoardConfigration : public QWidget
     {
     public:
@@ -139,7 +139,7 @@ namespace __temp {
 }
 QWidget *StoryBoardSourceEditFactory::getNewPanel(Config::Configration *config)
 {
-    return new __temp::BoardConfigration(config);
+    return new __impl_temp::BoardConfigration(config);
 }
 
 QString StoryBoardSourceEditFactory::extensionName() const

WordsIDE/storychainsourceeditor.cpp

@@ -105,7 +105,7 @@ void StoryChainSourceEdit::jumpTo(const QList<QString> &path)
     this->textView()->setFocus();
 }
 
-namespace __temp {
+namespace __impl_temp {
     class ChainSrcConfig : public QWidget
     {
     public:
@@ -128,7 +128,7 @@ QList<Core::Scale> Components::StoryChainSourceEditFactory::configs() const
 }
 
 
-namespace __temp {
+namespace __impl_temp {
     class ChainConfigration : public QWidget
     {
     public:
@@ -164,7 +164,7 @@ namespace __temp {
 }
 QWidget *Components::StoryChainSourceEditFactory::getNewPanel(Config::Configration *config)
 {
-    return new __temp::ChainConfigration(config);
+    return new __impl_temp::ChainConfigration(config);
 }
 
 QString StoryChainSourceEditFactory::extensionName() const

WordsIDE/storyunitsourceedit.cpp

@@ -229,7 +229,7 @@ QList<Scale> StoryUnitSourceEditFactory::configs() const
     return QList<Scale>() << Scale::Project << Scale::Global;
 }
 
-namespace __temp {
+namespace __impl_temp {
     class UnitConfigration : public QWidget
     {
     public:
@@ -265,7 +265,7 @@ namespace __temp {
 }
 QWidget *StoryUnitSourceEditFactory::getNewPanel(Config::Configration *config)
 {
-    return new __temp::UnitConfigration(config);
+    return new __impl_temp::UnitConfigration(config);
 }
 
 QString StoryUnitSourceEditFactory::extensionName() const

WordsIDE/storyvolumesourceedit.cpp

@@ -92,7 +92,7 @@ QList<Scale> StoryVolumeSourceEditFactory::configs() const
     return QList<Scale>() << Scale::Project << Scale::Global;
 }
 
-namespace __temp {
+namespace __impl_temp {
     class VolumeConfigration : public QWidget
     {
     public:
@@ -128,7 +128,7 @@ namespace __temp {
 }
 QWidget *StoryVolumeSourceEditFactory::getNewPanel(Config::Configration *config)
 {
-    return new __temp::VolumeConfigration(config);
+    return new __impl_temp::VolumeConfigration(config);
 }
 
 QString StoryVolumeSourceEditFactory::extensionName() const

libConfig/xmlconfig.cpp

@@ -55,7 +55,7 @@ void XMLConfig::loadFile(const QString &path)
         throw new Impl_ParseException("解析错误", QString("指定路径：%1，配置文件无法打开").arg(path));
 
     QString err_str; int err_row, err_col;
-    if(doc_ins.setContent(&config, false, &err_str, &err_row, &err_col))
+    if(!doc_ins.setContent(&config, false, &err_str, &err_row, &err_col))
         throw new Impl_ParseException("解析错误", QString("指定配置文件：%1，row:%2,col:%3,格式错误。").arg(err_col).arg(err_row).arg(err_col));
 }