From 305f4eb9eae9a037ee967758b73ff2b3e0e9eea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= Date: Fri, 2 May 2014 17:10:43 +0300 Subject: [PATCH] Refactor: Renamed libdeng2 to libcore (deng_core) --- README.md | 8 ++--- distrib/autobuild.py | 2 +- distrib/platform_release.py | 2 +- distrib/win32/setup.iss.template | 7 ++-- doomsday/api/api_uri.h | 6 ++-- doomsday/build/scripts/codex.py | 2 +- doomsday/build/win32/copy_to_products.py | 2 +- doomsday/build/win32/qmake_msvc.py | 2 +- doomsday/client/client.pro | 4 +-- doomsday/client/include/def_data.h | 2 +- .../client/include/network/masterserver.h | 2 +- doomsday/client/include/network/protocol.h | 2 +- doomsday/client/include/render/biasdigest.h | 2 +- .../client/include/render/consoleeffect.h | 2 +- doomsday/client/include/render/ilightsource.h | 2 +- doomsday/client/include/render/lightgrid.h | 2 +- doomsday/client/include/render/sky.h | 2 +- .../client/include/render/surfacedecorator.h | 2 +- .../include/render/trianglestripbuilder.h | 2 +- .../client/include/resource/colorpalette.h | 2 +- doomsday/client/include/ui/clientwindow.h | 2 +- doomsday/client/include/ui/dd_input.h | 2 +- doomsday/client/include/ui/widgetactions.h | 2 +- doomsday/client/include/updater.h | 2 +- .../client/include/world/entitydatabase.h | 2 +- doomsday/client/include/world/linesighttest.h | 2 +- doomsday/client/src/clientapp.cpp | 2 +- doomsday/client/src/filesys/sys_direc.cpp | 2 +- doomsday/client/src/gl/sys_opengl.cpp | 2 +- doomsday/client/src/library.cpp | 2 +- doomsday/client/src/render/cameralensfx.cpp | 2 +- doomsday/client/src/render/rend_main.cpp | 2 +- doomsday/client/src/resource/patch.cpp | 2 +- .../client/src/updater/updatersettings.cpp | 36 ------------------- doomsday/config.pri | 8 ++--- doomsday/{dep_deng2.pri => dep_core.pri} | 16 ++++----- doomsday/dep_core_cwrapper.pri | 19 ++++++++++ doomsday/dep_deng2_cwrapper.pri | 19 ---------- doomsday/doomsday.pro | 2 +- doomsday/doomsday_sdk.pri | 4 +-- .../include/de/framework/guiwidgetprivate.h | 2 +- doomsday/libappfw/libappfw.pro | 6 ++-- doomsday/libappfw/src/precompiled.h | 2 +- doomsday/{libdeng2 => libcore}/api2.doxy | 4 +-- .../{libdeng2 => libcore}/concurrency.pri | 0 doomsday/{libdeng2 => libcore}/data.pri | 0 doomsday/{libdeng2 => libcore}/doxygen.css | 0 doomsday/{libdeng2 => libcore}/filesys.pri | 0 doomsday/{libdeng2 => libcore}/game.pri | 0 .../include/de/AccessorValue | 0 .../{libdeng2 => libcore}/include/de/Action | 0 .../{libdeng2 => libcore}/include/de/Address | 0 .../include/de/Animation | 0 .../include/de/AnimationVector | 0 doomsday/{libdeng2 => libcore}/include/de/App | 0 .../{libdeng2 => libcore}/include/de/Archive | 0 .../include/de/ArchiveEntryFile | 0 .../include/de/ArchiveFeed | 0 .../include/de/ArrayExpression | 0 .../include/de/ArrayValue | 0 .../{libdeng2 => libcore}/include/de/Asset | 0 .../include/de/AssignStatement | 0 .../{libdeng2 => libcore}/include/de/Audience | 0 .../{libdeng2 => libcore}/include/de/Bank | 0 .../{libdeng2 => libcore}/include/de/Beacon | 0 .../include/de/BigEndianByteOrder | 0 .../include/de/BinaryTree | 0 .../{libdeng2 => libcore}/include/de/BitField | 0 .../{libdeng2 => libcore}/include/de/Block | 0 .../include/de/BlockPacket | 0 .../include/de/BlockValue | 0 .../include/de/BuiltInExpression | 0 .../include/de/ByteArrayFile | 0 .../include/de/ByteOrder | 0 .../include/de/ByteRefArray | 0 .../include/de/ByteSubArray | 0 .../include/de/CatchStatement | 0 .../{libdeng2 => libcore}/include/de/Clock | 0 .../include/de/CommandLine | 0 .../{libdeng2 => libcore}/include/de/Compound | 0 .../{libdeng2 => libcore}/include/de/Config | 0 .../include/de/ConstantExpression | 0 .../include/de/ConstantRule | 0 .../{libdeng2 => libcore}/include/de/Context | 0 .../{libdeng2 => libcore}/include/de/Counted | 0 .../{libdeng2 => libcore}/include/de/Date | 0 .../include/de/DebugLogSink | 0 .../include/de/DeleteStatement | 0 .../include/de/DictionaryExpression | 0 .../include/de/DictionaryValue | 0 .../include/de/DirectoryFeed | 0 .../{libdeng2 => libcore}/include/de/DotPath | 0 .../include/de/Enumerator | 0 .../{libdeng2 => libcore}/include/de/Error | 0 .../include/de/EscapeParser | 0 .../include/de/Evaluator | 0 .../{libdeng2 => libcore}/include/de/Event | 0 .../include/de/Expression | 0 .../include/de/ExpressionStatement | 0 .../{libdeng2 => libcore}/include/de/FIFO | 0 doomsday/{libdeng2 => libcore}/include/de/FS | 0 .../{libdeng2 => libcore}/include/de/Feed | 0 .../{libdeng2 => libcore}/include/de/File | 0 .../include/de/FileLogSink | 0 .../include/de/FileSystem | 0 .../include/de/FixedByteArray | 0 .../include/de/FlowStatement | 0 .../{libdeng2 => libcore}/include/de/Folder | 0 .../include/de/ForStatement | 0 .../{libdeng2 => libcore}/include/de/Function | 0 .../include/de/FunctionStatement | 0 .../include/de/FunctionValue | 0 .../{libdeng2 => libcore}/include/de/Garbage | 0 .../{libdeng2 => libcore}/include/de/Guard | 0 .../include/de/HighPerformanceTimer | 0 .../{libdeng2 => libcore}/include/de/IBlock | 0 .../include/de/IByteArray | 0 .../include/de/IIOStream | 0 .../{libdeng2 => libcore}/include/de/IIStream | 0 .../{libdeng2 => libcore}/include/de/IOStream | 0 .../{libdeng2 => libcore}/include/de/IParser | 0 .../include/de/IReadable | 0 .../include/de/ISerializable | 0 .../include/de/IWritable | 0 doomsday/{libdeng2 => libcore}/include/de/Id | 0 .../include/de/IdentifiedPacket | 0 .../include/de/IfStatement | 0 .../include/de/IndirectRule | 0 .../{libdeng2 => libcore}/include/de/Info | 0 .../{libdeng2 => libcore}/include/de/InfoBank | 0 doomsday/{libdeng2 => libcore}/include/de/Lex | 0 .../{libdeng2 => libcore}/include/de/Library | 0 .../include/de/LibraryFile | 0 .../include/de/ListenSocket | 0 .../include/de/LittleEndianByteOrder | 0 .../{libdeng2 => libcore}/include/de/Lockable | 0 doomsday/{libdeng2 => libcore}/include/de/Log | 0 .../include/de/LogBuffer | 0 .../include/de/LogFilter | 0 .../{libdeng2 => libcore}/include/de/LogSink | 0 .../{libdeng2 => libcore}/include/de/Loop | 0 .../{libdeng2 => libcore}/include/de/Matrix | 0 .../include/de/MemoryLogSink | 0 .../{libdeng2 => libcore}/include/de/Message | 0 .../{libdeng2 => libcore}/include/de/Module | 0 .../include/de/MonospaceLogSinkFormatter | 0 .../include/de/NameExpression | 0 .../include/de/NativeFile | 0 .../include/de/NativePath | 0 .../include/de/NoneValue | 0 .../include/de/NumberValue | 0 .../include/de/Observers | 0 .../{libdeng2 => libcore}/include/de/Operator | 0 .../include/de/OperatorExpression | 0 .../include/de/OperatorRule | 0 .../include/de/PackageFolder | 0 .../{libdeng2 => libcore}/include/de/Packet | 0 .../{libdeng2 => libcore}/include/de/Parser | 0 .../{libdeng2 => libcore}/include/de/Path | 0 .../{libdeng2 => libcore}/include/de/PathTree | 0 .../include/de/PrintStatement | 0 .../{libdeng2 => libcore}/include/de/Process | 0 .../{libdeng2 => libcore}/include/de/Property | 0 .../{libdeng2 => libcore}/include/de/Protocol | 0 .../{libdeng2 => libcore}/include/de/Range | 0 .../include/de/ReadWriteLockable | 0 .../{libdeng2 => libcore}/include/de/Reader | 0 .../{libdeng2 => libcore}/include/de/Record | 0 .../include/de/RecordPacket | 0 .../include/de/RecordValue | 0 .../include/de/Rectangle | 0 .../{libdeng2 => libcore}/include/de/RefValue | 0 .../{libdeng2 => libcore}/include/de/Refuge | 0 .../include/de/RootWidget | 0 .../{libdeng2 => libcore}/include/de/Rule | 0 .../{libdeng2 => libcore}/include/de/RuleBank | 0 .../include/de/RuleRectangle | 0 .../include/de/ScalarRule | 0 .../{libdeng2 => libcore}/include/de/Script | 0 .../include/de/ScriptLex | 0 .../include/de/ScriptSystem | 0 .../include/de/ScriptedInfo | 0 .../{libdeng2 => libcore}/include/de/Shared | 0 .../include/de/SimpleLogFilter | 0 .../{libdeng2 => libcore}/include/de/Socket | 0 .../include/de/Statement | 0 .../{libdeng2 => libcore}/include/de/String | 0 .../include/de/StringPool | 0 .../{libdeng2 => libcore}/include/de/System | 0 .../{libdeng2 => libcore}/include/de/Task | 0 .../{libdeng2 => libcore}/include/de/TaskPool | 0 .../{libdeng2 => libcore}/include/de/TextApp | 0 .../include/de/TextStreamLogSink | 0 .../include/de/TextValue | 0 .../{libdeng2 => libcore}/include/de/Time | 0 .../include/de/TimeValue | 0 .../include/de/TokenBuffer | 0 .../include/de/TokenRange | 0 .../include/de/Transmitter | 0 .../include/de/TryStatement | 0 .../{libdeng2 => libcore}/include/de/UnixInfo | 0 .../{libdeng2 => libcore}/include/de/Value | 0 .../{libdeng2 => libcore}/include/de/Variable | 0 .../{libdeng2 => libcore}/include/de/Vector | 0 .../{libdeng2 => libcore}/include/de/Version | 0 .../{libdeng2 => libcore}/include/de/Waitable | 0 .../include/de/WaitableFIFO | 0 .../include/de/WhileStatement | 0 .../{libdeng2 => libcore}/include/de/Widget | 0 .../{libdeng2 => libcore}/include/de/Writer | 0 .../{libdeng2 => libcore}/include/de/Zeroed | 0 .../include/de/ZipArchive | 0 .../include/de/c_wrapper.h | 23 +++++------- .../include/de/charsymbols.h | 0 .../include/de/concurrency/guard.h | 4 +-- .../include/de/concurrency/lockable.h | 4 +-- .../de/concurrency/readwritelockable.h | 2 +- .../include/de/concurrency/task.h | 2 +- .../include/de/concurrency/taskpool.h | 2 +- .../include/de/concurrency/waitable.h | 4 +-- .../include/de/core/app.h | 8 ++--- .../include/de/core/asset.h | 2 +- .../include/de/core/clock.h | 2 +- .../include/de/core/commandline.h | 4 +-- .../include/de/core/config.h | 2 +- .../include/de/core/debuglogsink.h | 0 .../include/de/core/event.h | 2 +- .../include/de/core/filelogsink.h | 0 .../include/de/core/garbage.h | 2 +- .../include/de/core/highperformancetimer.h | 0 .../include/de/core/id.h | 4 +-- .../include/de/core/library.h | 14 ++++---- .../include/de/core/log.h | 2 +- .../include/de/core/logbuffer.h | 2 +- .../include/de/core/logfilter.h | 0 .../include/de/core/logsink.h | 0 .../include/de/core/loop.h | 0 .../include/de/core/matrix.h | 2 +- .../include/de/core/memorylogsink.h | 0 .../de/core/monospacelogsinkformatter.h | 0 .../include/de/core/range.h | 2 +- .../include/de/core/rectangle.h | 2 +- .../include/de/core/system.h | 0 .../include/de/core/textapp.h | 0 .../include/de/core/textstreamlogsink.h | 0 .../include/de/core/unixinfo.h | 2 +- .../include/de/core/vector.h | 0 .../include/de/core/version.h | 8 ++--- .../include/de/data/accessorvalue.h | 2 +- .../include/de/data/archive.h | 4 +-- .../include/de/data/arrayvalue.h | 2 +- .../include/de/data/bank.h | 2 +- .../include/de/data/binarytree.h | 2 +- .../include/de/data/bitfield.h | 0 .../include/de/data/block.h | 2 +- .../include/de/data/blockvalue.h | 2 +- .../include/de/data/byteorder.h | 4 +-- .../include/de/data/byterefarray.h | 2 +- .../include/de/data/bytesubarray.h | 2 +- .../include/de/data/counted.h | 4 +-- .../include/de/data/date.h | 2 +- .../include/de/data/dictionaryvalue.h | 2 +- .../include/de/data/escapeparser.h | 2 +- .../include/de/data/fifo.h | 2 +- .../include/de/data/fixedbytearray.h | 2 +- .../include/de/data/huffman.h | 2 +- .../include/de/data/iblock.h | 2 +- .../include/de/data/ibytearray.h | 4 +-- .../include/de/data/iiostream.h | 0 .../include/de/data/iistream.h | 0 .../include/de/data/info.h | 2 +- .../include/de/data/infobank.h | 0 .../include/de/data/iostream.h | 0 .../include/de/data/ireadable.h | 4 +-- .../include/de/data/iserializable.h | 4 +-- .../include/de/data/iwritable.h | 4 +-- .../include/de/data/json.h | 0 .../include/de/data/nonevalue.h | 2 +- .../include/de/data/numbervalue.h | 2 +- .../include/de/data/observers.h | 4 +-- .../include/de/data/path.h | 2 +- .../include/de/data/pathtree.h | 0 .../include/de/data/property.h | 2 +- .../include/de/data/reader.h | 6 ++-- .../include/de/data/record.h | 2 +- .../include/de/data/recordvalue.h | 2 +- .../include/de/data/refuge.h | 0 .../include/de/data/refvalue.h | 2 +- .../include/de/data/shared.h | 0 .../include/de/data/string.h | 4 +-- .../include/de/data/stringpool.h | 2 +- .../include/de/data/textvalue.h | 2 +- .../include/de/data/time.h | 4 +-- .../include/de/data/timevalue.h | 0 .../include/de/data/value.h | 4 +-- .../include/de/data/variable.h | 2 +- .../include/de/data/waitablefifo.h | 2 +- .../include/de/data/writer.h | 4 +-- .../include/de/data/zeroed.h | 4 +-- .../include/de/data/ziparchive.h | 2 +- .../{libdeng2 => libcore}/include/de/error.h | 8 ++--- .../include/de/filesys/archiveentryfile.h | 2 +- .../include/de/filesys/archivefeed.h | 0 .../include/de/filesys/bytearrayfile.h | 4 +-- .../include/de/filesys/directoryfeed.h | 0 .../include/de/filesys/feed.h | 4 +-- .../include/de/filesys/file.h | 2 +- .../include/de/filesys/filesystem.h | 8 ++--- .../include/de/filesys/folder.h | 4 +-- .../include/de/filesys/libraryfile.h | 2 +- .../include/de/filesys/nativefile.h | 4 +-- .../include/de/filesys/nativepath.h | 0 .../include/de/filesys/packagefolder.h | 0 .../include/de/game/Game | 0 .../include/de/game/SavedSession | 0 .../include/de/game/Session | 0 .../include/de/game/game.h | 0 .../include/de/game/savedsession.h | 0 .../include/de/game/session.h | 0 .../include/de/libcore.h} | 14 ++++---- .../{libdeng2 => libcore}/include/de/math.h | 4 +-- .../include/de/net/address.h | 4 +-- .../include/de/net/beacon.h | 0 .../include/de/net/blockpacket.h | 0 .../include/de/net/identifiedpacket.h | 2 +- .../include/de/net/listensocket.h | 4 +-- .../include/de/net/message.h | 2 +- .../include/de/net/packet.h | 6 ++-- .../include/de/net/protocol.h | 4 +-- .../include/de/net/recordpacket.h | 2 +- .../include/de/net/socket.h | 4 +-- .../include/de/net/transmitter.h | 4 +-- .../include/de/scriptsys/arrayexpression.h | 2 +- .../include/de/scriptsys/assignstatement.h | 4 +-- .../include/de/scriptsys/builtinexpression.h | 4 +-- .../include/de/scriptsys/catchstatement.h | 2 +- .../include/de/scriptsys/compound.h | 4 +-- .../include/de/scriptsys/constantexpression.h | 2 +- .../include/de/scriptsys/context.h | 2 +- .../include/de/scriptsys/deletestatement.h | 4 +-- .../de/scriptsys/dictionaryexpression.h | 2 +- .../include/de/scriptsys/evaluator.h | 4 +-- .../include/de/scriptsys/expression.h | 2 +- .../de/scriptsys/expressionstatement.h | 2 +- .../include/de/scriptsys/flowstatement.h | 2 +- .../include/de/scriptsys/forstatement.h | 2 +- .../include/de/scriptsys/function.h | 2 +- .../include/de/scriptsys/functionstatement.h | 2 +- .../include/de/scriptsys/functionvalue.h | 2 +- .../include/de/scriptsys/ifstatement.h | 2 +- .../include/de/scriptsys/iparser.h | 2 +- .../include/de/scriptsys/lex.h | 4 +-- .../include/de/scriptsys/module.h | 2 +- .../include/de/scriptsys/nameexpression.h | 2 +- .../include/de/scriptsys/operator.h | 2 +- .../include/de/scriptsys/operatorexpression.h | 4 +-- .../include/de/scriptsys/parser.h | 4 +-- .../include/de/scriptsys/printstatement.h | 2 +- .../include/de/scriptsys/process.h | 2 +- .../include/de/scriptsys/script.h | 2 +- .../include/de/scriptsys/scriptedinfo.h | 0 .../include/de/scriptsys/scriptlex.h | 2 +- .../include/de/scriptsys/scriptsystem.h | 0 .../include/de/scriptsys/statement.h | 2 +- .../include/de/scriptsys/tokenbuffer.h | 4 +-- .../include/de/scriptsys/tokenrange.h | 2 +- .../include/de/scriptsys/trystatement.h | 2 +- .../include/de/scriptsys/whilestatement.h | 2 +- .../include/de/widgets/action.h | 0 .../include/de/widgets/animation.h | 0 .../include/de/widgets/animationvector.h | 0 .../include/de/widgets/constantrule.h | 0 .../include/de/widgets/indirectrule.h | 0 .../include/de/widgets/operatorrule.h | 0 .../include/de/widgets/rootwidget.h | 0 .../include/de/widgets/rule.h | 2 +- .../include/de/widgets/rulebank.h | 0 .../include/de/widgets/rulerectangle.h | 0 .../include/de/widgets/rules.h | 0 .../include/de/widgets/scalarrule.h | 0 .../include/de/widgets/widget.h | 0 .../libdeng2.pro => libcore/libcore.pro} | 20 +++++------ .../{libdeng2 => libcore}/modules/Config.de | 4 +-- doomsday/{libdeng2 => libcore}/modules/Log.de | 2 +- .../{libdeng2 => libcore}/modules/recutil.de | 2 +- doomsday/{libdeng2 => libcore}/network.pri | 0 .../res/win32/.gitignore | 0 .../res/win32/core.rc.in} | 4 +-- .../res/win32/deng_core.dll.manifest} | 0 .../res/win32/generate_rc.py | 6 ++-- .../res/win32/resource.h | 2 +- doomsday/{libdeng2 => libcore}/scriptsys.pri | 0 .../{libdeng2 => libcore}/src/c_wrapper.cpp | 2 +- .../src/concurrency/guard.cpp | 2 +- .../src/concurrency/lockable.cpp | 2 +- .../src/concurrency/readwritelockable.cpp | 0 .../src/concurrency/task.cpp | 0 .../src/concurrency/taskpool.cpp | 0 .../src/concurrency/waitable.cpp | 2 +- .../{libdeng2 => libcore}/src/core/app.cpp | 6 ++-- .../{libdeng2 => libcore}/src/core/asset.cpp | 0 .../src/core/callbacktimer.cpp | 0 .../src/core/callbacktimer.h | 0 .../{libdeng2 => libcore}/src/core/clock.cpp | 0 .../src/core/commandline.cpp | 2 +- .../{libdeng2 => libcore}/src/core/config.cpp | 4 +-- .../src/core/debuglogsink.cpp | 0 .../src/core/filelogsink.cpp | 0 .../src/core/garbage.cpp | 0 .../src/core/highperformancetimer.cpp | 0 .../{libdeng2 => libcore}/src/core/id.cpp | 2 +- .../src/core/library.cpp | 4 +-- .../{libdeng2 => libcore}/src/core/log.cpp | 2 +- .../src/core/logbuffer.cpp | 2 +- .../src/core/logfilter.cpp | 0 .../src/core/logsink.cpp | 0 .../src/core/logtextstyle.h | 4 +-- .../{libdeng2 => libcore}/src/core/loop.cpp | 0 .../src/core/memorylogsink.cpp | 0 .../src/core/monospacelogsinkformatter.cpp | 0 .../{libdeng2 => libcore}/src/core/system.cpp | 0 .../src/core/textapp.cpp | 0 .../src/core/textstreamlogsink.cpp | 0 .../src/core/unixinfo.cpp | 0 .../src/data/accessorvalue.cpp | 2 +- .../src/data/archive.cpp | 0 .../src/data/arrayvalue.cpp | 2 +- .../{libdeng2 => libcore}/src/data/bank.cpp | 0 .../src/data/binarytree_wrapper.cpp | 0 .../src/data/bitfield.cpp | 0 .../src/data/bitfield_elements.cpp | 0 .../{libdeng2 => libcore}/src/data/block.cpp | 2 +- .../src/data/blockvalue.cpp | 2 +- .../src/data/byteorder.cpp | 2 +- .../src/data/byterefarray.cpp | 2 +- .../src/data/bytesubarray.cpp | 2 +- .../src/data/counted.cpp | 2 +- .../{libdeng2 => libcore}/src/data/date.cpp | 2 +- .../src/data/dictionaryvalue.cpp | 2 +- .../src/data/escapeparser.cpp | 0 .../src/data/fixedbytearray.cpp | 2 +- .../src/data/huffman.cpp | 0 .../{libdeng2 => libcore}/src/data/info.cpp | 2 +- .../src/data/infobank.cpp | 0 .../{libdeng2 => libcore}/src/data/json.cpp | 0 .../src/data/nonevalue.cpp | 2 +- .../src/data/numbervalue.cpp | 2 +- .../{libdeng2 => libcore}/src/data/path.cpp | 0 .../src/data/pathtree.cpp | 0 .../src/data/pathtreenode.cpp | 0 .../{libdeng2 => libcore}/src/data/reader.cpp | 2 +- .../{libdeng2 => libcore}/src/data/record.cpp | 2 +- .../src/data/recordvalue.cpp | 2 +- .../{libdeng2 => libcore}/src/data/refuge.cpp | 0 .../src/data/refvalue.cpp | 2 +- .../{libdeng2 => libcore}/src/data/string.cpp | 2 +- .../src/data/stringpool.cpp | 0 .../src/data/textvalue.cpp | 2 +- .../{libdeng2 => libcore}/src/data/time.cpp | 2 +- .../src/data/timevalue.cpp | 0 .../{libdeng2 => libcore}/src/data/value.cpp | 2 +- .../src/data/variable.cpp | 2 +- .../{libdeng2 => libcore}/src/data/writer.cpp | 2 +- .../src/data/ziparchive.cpp | 2 +- doomsday/{libdeng2 => libcore}/src/error.cpp | 0 .../src/filesys/archiveentryfile.cpp | 2 +- .../src/filesys/archivefeed.cpp | 0 .../src/filesys/bytearrayfile.cpp | 2 +- .../src/filesys/directoryfeed.cpp | 0 .../src/filesys/feed.cpp | 2 +- .../src/filesys/file.cpp | 2 +- .../src/filesys/filesystem.cpp | 0 .../src/filesys/folder.cpp | 2 +- .../src/filesys/libraryfile.cpp | 2 +- .../src/filesys/nativefile.cpp | 2 +- .../src/filesys/nativepath.cpp | 2 +- .../src/filesys/packagefolder.cpp | 0 .../{libdeng2 => libcore}/src/game/game.cpp | 0 .../src/game/savedsession.cpp | 0 .../src/game/session.cpp | 0 doomsday/{libdeng2 => libcore}/src/matrix.cpp | 0 .../{libdeng2 => libcore}/src/net/address.cpp | 2 +- .../{libdeng2 => libcore}/src/net/beacon.cpp | 0 .../src/net/blockpacket.cpp | 0 .../src/net/identifiedpacket.cpp | 0 .../src/net/listensocket.cpp | 2 +- .../{libdeng2 => libcore}/src/net/message.cpp | 2 +- .../{libdeng2 => libcore}/src/net/packet.cpp | 2 +- .../src/net/protocol.cpp | 2 +- .../src/net/recordpacket.cpp | 2 +- .../{libdeng2 => libcore}/src/net/socket.cpp | 2 +- .../src/net/transmitter.cpp | 2 +- .../{libdeng2 => libcore}/src/precompiled.h | 2 +- .../src/scriptsys/arrayexpression.cpp | 2 +- .../src/scriptsys/assignstatement.cpp | 2 +- .../src/scriptsys/builtinexpression.cpp | 2 +- .../src/scriptsys/catchstatement.cpp | 2 +- .../src/scriptsys/compound.cpp | 2 +- .../src/scriptsys/constantexpression.cpp | 2 +- .../src/scriptsys/context.cpp | 2 +- .../src/scriptsys/deletestatement.cpp | 2 +- .../src/scriptsys/dictionaryexpression.cpp | 2 +- .../src/scriptsys/evaluator.cpp | 2 +- .../src/scriptsys/expression.cpp | 2 +- .../src/scriptsys/expressionstatement.cpp | 2 +- .../src/scriptsys/flowstatement.cpp | 2 +- .../src/scriptsys/forstatement.cpp | 2 +- .../src/scriptsys/function.cpp | 2 +- .../src/scriptsys/functionstatement.cpp | 2 +- .../src/scriptsys/functionvalue.cpp | 2 +- .../src/scriptsys/ifstatement.cpp | 2 +- .../src/scriptsys/lex.cpp | 2 +- .../src/scriptsys/module.cpp | 2 +- .../src/scriptsys/nameexpression.cpp | 2 +- .../src/scriptsys/operator.cpp | 2 +- .../src/scriptsys/operatorexpression.cpp | 2 +- .../src/scriptsys/parser.cpp | 2 +- .../src/scriptsys/printstatement.cpp | 2 +- .../src/scriptsys/process.cpp | 2 +- .../src/scriptsys/script.cpp | 2 +- .../src/scriptsys/scriptedinfo.cpp | 0 .../src/scriptsys/scriptlex.cpp | 2 +- .../src/scriptsys/scriptsystem.cpp | 0 .../src/scriptsys/statement.cpp | 2 +- .../src/scriptsys/tokenbuffer.cpp | 2 +- .../src/scriptsys/tokenrange.cpp | 2 +- .../src/scriptsys/trystatement.cpp | 2 +- .../src/scriptsys/whilestatement.cpp | 2 +- .../{libdeng2 => libcore}/src/version.cpp | 2 +- .../src/widgets/action.cpp | 0 .../src/widgets/animation.cpp | 0 .../src/widgets/constantrule.cpp | 0 .../src/widgets/indirectrule.cpp | 0 .../src/widgets/operatorrule.cpp | 0 .../src/widgets/rootwidget.cpp | 0 .../src/widgets/rule.cpp | 0 .../src/widgets/rulebank.cpp | 0 .../src/widgets/rulerectangle.cpp | 0 .../src/widgets/scalarrule.cpp | 0 .../src/widgets/widget.cpp | 0 doomsday/{libdeng2 => libcore}/widgets.pri | 0 doomsday/libgui/gui.doxy | 2 +- .../libgui/include/de/graphics/drawable.h | 2 +- .../libgui/include/de/graphics/glbuffer.h | 2 +- doomsday/libgui/include/de/graphics/glinfo.h | 2 +- .../libgui/include/de/graphics/glprogram.h | 2 +- .../libgui/include/de/graphics/glshader.h | 2 +- doomsday/libgui/include/de/graphics/glstate.h | 2 +- .../libgui/include/de/graphics/gltarget.h | 2 +- .../libgui/include/de/graphics/gltexture.h | 2 +- .../libgui/include/de/graphics/gluniform.h | 2 +- doomsday/libgui/include/de/gui/canvas.h | 2 +- doomsday/libgui/include/de/gui/displaymode.h | 2 +- doomsday/libgui/include/de/text/font.h | 2 +- doomsday/libgui/libgui.pro | 6 ++-- doomsday/libgui/src/displaymode_dummy.cpp | 2 +- doomsday/libgui/src/displaymode_macx.mm | 2 +- .../libgui/src/graphics/modeldrawable.cpp | 4 +-- doomsday/liblegacy/include/de/liblegacy.h | 2 +- doomsday/liblegacy/include/de/reader.h | 2 +- doomsday/liblegacy/include/de/writer.h | 2 +- doomsday/liblegacy/liblegacy.pro | 4 +-- .../include/de/shell/abstractlineeditor.h | 2 +- doomsday/libshell/libshell.pro | 4 +-- doomsday/libshell/src/localserver.cpp | 2 +- doomsday/plugins/config_plugin.pri | 10 +++--- doomsday/plugins/dehread/dehread.pro | 6 ++-- doomsday/plugins/dehread/include/dehread.h | 2 +- doomsday/plugins/doom/doom.pro | 2 +- doomsday/plugins/doom64/doom64.pro | 2 +- doomsday/plugins/example/src/example.c | 4 +-- doomsday/plugins/fluidsynth/fluidsynth.pro | 6 ++-- doomsday/plugins/fmod/fmod.pro | 6 ++-- doomsday/plugins/heretic/heretic.pro | 2 +- doomsday/plugins/hexen/hexen.pro | 2 +- doomsday/plugins/openal/openal.pro | 2 +- .../include/savegameconverter.h | 2 +- .../savegameconverter/savegameconverter.pro | 6 ++-- .../plugins/wadmapconverter/src/id1map.cpp | 2 +- .../wadmapconverter/src/id1map_load.cpp | 2 +- .../wadmapconverter/src/id1map_util.cpp | 2 +- .../wadmapconverter/wadmapconverter.pro | 6 ++-- doomsday/postbuild/bundleapp.sh | 4 +-- doomsday/sdk.doxy | 4 +-- doomsday/sdk.pro | 2 +- doomsday/server/include/serversystem.h | 2 +- doomsday/server/server.pro | 4 +-- doomsday/tests/config_test.pri | 4 +-- .../tests/test_glsandbox/test_glsandbox.pro | 2 +- doomsday/tools/savegametool/savegametool.pro | 4 +-- doomsday/tools/shell/shell-gui/shell-gui.pro | 2 +- .../shell/shell-gui/src/errorlogdialog.h | 2 +- .../shell/shell-gui/src/folderselection.h | 2 +- .../shell/shell-gui/src/localserverdialog.cpp | 2 +- doomsday/tools/shell/shell-gui/src/main.cpp | 2 +- .../tools/shell/shell-gui/src/opendialog.cpp | 2 +- .../tools/shell/shell-gui/src/preferences.cpp | 2 +- doomsday/tools/shell/shell-gui/src/qtguiapp.h | 2 +- .../shell/shell-gui/src/statuswidget.cpp | 2 +- .../tools/shell/shell-text/shell-text.pro | 4 +-- .../shell/shell-text/src/localserverdialog.h | 2 +- doomsday/tools/shell/shell-text/src/main.cpp | 2 +- 602 files changed, 476 insertions(+), 516 deletions(-) rename doomsday/{dep_deng2.pri => dep_core.pri} (79%) create mode 100644 doomsday/dep_core_cwrapper.pri delete mode 100644 doomsday/dep_deng2_cwrapper.pri rename doomsday/{libdeng2 => libcore}/api2.doxy (92%) rename doomsday/{libdeng2 => libcore}/concurrency.pri (100%) rename doomsday/{libdeng2 => libcore}/data.pri (100%) rename doomsday/{libdeng2 => libcore}/doxygen.css (100%) rename doomsday/{libdeng2 => libcore}/filesys.pri (100%) rename doomsday/{libdeng2 => libcore}/game.pri (100%) rename doomsday/{libdeng2 => libcore}/include/de/AccessorValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/Action (100%) rename doomsday/{libdeng2 => libcore}/include/de/Address (100%) rename doomsday/{libdeng2 => libcore}/include/de/Animation (100%) rename doomsday/{libdeng2 => libcore}/include/de/AnimationVector (100%) rename doomsday/{libdeng2 => libcore}/include/de/App (100%) rename doomsday/{libdeng2 => libcore}/include/de/Archive (100%) rename doomsday/{libdeng2 => libcore}/include/de/ArchiveEntryFile (100%) rename doomsday/{libdeng2 => libcore}/include/de/ArchiveFeed (100%) rename doomsday/{libdeng2 => libcore}/include/de/ArrayExpression (100%) rename doomsday/{libdeng2 => libcore}/include/de/ArrayValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/Asset (100%) rename doomsday/{libdeng2 => libcore}/include/de/AssignStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/Audience (100%) rename doomsday/{libdeng2 => libcore}/include/de/Bank (100%) rename doomsday/{libdeng2 => libcore}/include/de/Beacon (100%) rename doomsday/{libdeng2 => libcore}/include/de/BigEndianByteOrder (100%) rename doomsday/{libdeng2 => libcore}/include/de/BinaryTree (100%) rename doomsday/{libdeng2 => libcore}/include/de/BitField (100%) rename doomsday/{libdeng2 => libcore}/include/de/Block (100%) rename doomsday/{libdeng2 => libcore}/include/de/BlockPacket (100%) rename doomsday/{libdeng2 => libcore}/include/de/BlockValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/BuiltInExpression (100%) rename doomsday/{libdeng2 => libcore}/include/de/ByteArrayFile (100%) rename doomsday/{libdeng2 => libcore}/include/de/ByteOrder (100%) rename doomsday/{libdeng2 => libcore}/include/de/ByteRefArray (100%) rename doomsday/{libdeng2 => libcore}/include/de/ByteSubArray (100%) rename doomsday/{libdeng2 => libcore}/include/de/CatchStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/Clock (100%) rename doomsday/{libdeng2 => libcore}/include/de/CommandLine (100%) rename doomsday/{libdeng2 => libcore}/include/de/Compound (100%) rename doomsday/{libdeng2 => libcore}/include/de/Config (100%) rename doomsday/{libdeng2 => libcore}/include/de/ConstantExpression (100%) rename doomsday/{libdeng2 => libcore}/include/de/ConstantRule (100%) rename doomsday/{libdeng2 => libcore}/include/de/Context (100%) rename doomsday/{libdeng2 => libcore}/include/de/Counted (100%) rename doomsday/{libdeng2 => libcore}/include/de/Date (100%) rename doomsday/{libdeng2 => libcore}/include/de/DebugLogSink (100%) rename doomsday/{libdeng2 => libcore}/include/de/DeleteStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/DictionaryExpression (100%) rename doomsday/{libdeng2 => libcore}/include/de/DictionaryValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/DirectoryFeed (100%) rename doomsday/{libdeng2 => libcore}/include/de/DotPath (100%) rename doomsday/{libdeng2 => libcore}/include/de/Enumerator (100%) rename doomsday/{libdeng2 => libcore}/include/de/Error (100%) rename doomsday/{libdeng2 => libcore}/include/de/EscapeParser (100%) rename doomsday/{libdeng2 => libcore}/include/de/Evaluator (100%) rename doomsday/{libdeng2 => libcore}/include/de/Event (100%) rename doomsday/{libdeng2 => libcore}/include/de/Expression (100%) rename doomsday/{libdeng2 => libcore}/include/de/ExpressionStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/FIFO (100%) rename doomsday/{libdeng2 => libcore}/include/de/FS (100%) rename doomsday/{libdeng2 => libcore}/include/de/Feed (100%) rename doomsday/{libdeng2 => libcore}/include/de/File (100%) rename doomsday/{libdeng2 => libcore}/include/de/FileLogSink (100%) rename doomsday/{libdeng2 => libcore}/include/de/FileSystem (100%) rename doomsday/{libdeng2 => libcore}/include/de/FixedByteArray (100%) rename doomsday/{libdeng2 => libcore}/include/de/FlowStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/Folder (100%) rename doomsday/{libdeng2 => libcore}/include/de/ForStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/Function (100%) rename doomsday/{libdeng2 => libcore}/include/de/FunctionStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/FunctionValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/Garbage (100%) rename doomsday/{libdeng2 => libcore}/include/de/Guard (100%) rename doomsday/{libdeng2 => libcore}/include/de/HighPerformanceTimer (100%) rename doomsday/{libdeng2 => libcore}/include/de/IBlock (100%) rename doomsday/{libdeng2 => libcore}/include/de/IByteArray (100%) rename doomsday/{libdeng2 => libcore}/include/de/IIOStream (100%) rename doomsday/{libdeng2 => libcore}/include/de/IIStream (100%) rename doomsday/{libdeng2 => libcore}/include/de/IOStream (100%) rename doomsday/{libdeng2 => libcore}/include/de/IParser (100%) rename doomsday/{libdeng2 => libcore}/include/de/IReadable (100%) rename doomsday/{libdeng2 => libcore}/include/de/ISerializable (100%) rename doomsday/{libdeng2 => libcore}/include/de/IWritable (100%) rename doomsday/{libdeng2 => libcore}/include/de/Id (100%) rename doomsday/{libdeng2 => libcore}/include/de/IdentifiedPacket (100%) rename doomsday/{libdeng2 => libcore}/include/de/IfStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/IndirectRule (100%) rename doomsday/{libdeng2 => libcore}/include/de/Info (100%) rename doomsday/{libdeng2 => libcore}/include/de/InfoBank (100%) rename doomsday/{libdeng2 => libcore}/include/de/Lex (100%) rename doomsday/{libdeng2 => libcore}/include/de/Library (100%) rename doomsday/{libdeng2 => libcore}/include/de/LibraryFile (100%) rename doomsday/{libdeng2 => libcore}/include/de/ListenSocket (100%) rename doomsday/{libdeng2 => libcore}/include/de/LittleEndianByteOrder (100%) rename doomsday/{libdeng2 => libcore}/include/de/Lockable (100%) rename doomsday/{libdeng2 => libcore}/include/de/Log (100%) rename doomsday/{libdeng2 => libcore}/include/de/LogBuffer (100%) rename doomsday/{libdeng2 => libcore}/include/de/LogFilter (100%) rename doomsday/{libdeng2 => libcore}/include/de/LogSink (100%) rename doomsday/{libdeng2 => libcore}/include/de/Loop (100%) rename doomsday/{libdeng2 => libcore}/include/de/Matrix (100%) rename doomsday/{libdeng2 => libcore}/include/de/MemoryLogSink (100%) rename doomsday/{libdeng2 => libcore}/include/de/Message (100%) rename doomsday/{libdeng2 => libcore}/include/de/Module (100%) rename doomsday/{libdeng2 => libcore}/include/de/MonospaceLogSinkFormatter (100%) rename doomsday/{libdeng2 => libcore}/include/de/NameExpression (100%) rename doomsday/{libdeng2 => libcore}/include/de/NativeFile (100%) rename doomsday/{libdeng2 => libcore}/include/de/NativePath (100%) rename doomsday/{libdeng2 => libcore}/include/de/NoneValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/NumberValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/Observers (100%) rename doomsday/{libdeng2 => libcore}/include/de/Operator (100%) rename doomsday/{libdeng2 => libcore}/include/de/OperatorExpression (100%) rename doomsday/{libdeng2 => libcore}/include/de/OperatorRule (100%) rename doomsday/{libdeng2 => libcore}/include/de/PackageFolder (100%) rename doomsday/{libdeng2 => libcore}/include/de/Packet (100%) rename doomsday/{libdeng2 => libcore}/include/de/Parser (100%) rename doomsday/{libdeng2 => libcore}/include/de/Path (100%) rename doomsday/{libdeng2 => libcore}/include/de/PathTree (100%) rename doomsday/{libdeng2 => libcore}/include/de/PrintStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/Process (100%) rename doomsday/{libdeng2 => libcore}/include/de/Property (100%) rename doomsday/{libdeng2 => libcore}/include/de/Protocol (100%) rename doomsday/{libdeng2 => libcore}/include/de/Range (100%) rename doomsday/{libdeng2 => libcore}/include/de/ReadWriteLockable (100%) rename doomsday/{libdeng2 => libcore}/include/de/Reader (100%) rename doomsday/{libdeng2 => libcore}/include/de/Record (100%) rename doomsday/{libdeng2 => libcore}/include/de/RecordPacket (100%) rename doomsday/{libdeng2 => libcore}/include/de/RecordValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/Rectangle (100%) rename doomsday/{libdeng2 => libcore}/include/de/RefValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/Refuge (100%) rename doomsday/{libdeng2 => libcore}/include/de/RootWidget (100%) rename doomsday/{libdeng2 => libcore}/include/de/Rule (100%) rename doomsday/{libdeng2 => libcore}/include/de/RuleBank (100%) rename doomsday/{libdeng2 => libcore}/include/de/RuleRectangle (100%) rename doomsday/{libdeng2 => libcore}/include/de/ScalarRule (100%) rename doomsday/{libdeng2 => libcore}/include/de/Script (100%) rename doomsday/{libdeng2 => libcore}/include/de/ScriptLex (100%) rename doomsday/{libdeng2 => libcore}/include/de/ScriptSystem (100%) rename doomsday/{libdeng2 => libcore}/include/de/ScriptedInfo (100%) rename doomsday/{libdeng2 => libcore}/include/de/Shared (100%) rename doomsday/{libdeng2 => libcore}/include/de/SimpleLogFilter (100%) rename doomsday/{libdeng2 => libcore}/include/de/Socket (100%) rename doomsday/{libdeng2 => libcore}/include/de/Statement (100%) rename doomsday/{libdeng2 => libcore}/include/de/String (100%) rename doomsday/{libdeng2 => libcore}/include/de/StringPool (100%) rename doomsday/{libdeng2 => libcore}/include/de/System (100%) rename doomsday/{libdeng2 => libcore}/include/de/Task (100%) rename doomsday/{libdeng2 => libcore}/include/de/TaskPool (100%) rename doomsday/{libdeng2 => libcore}/include/de/TextApp (100%) rename doomsday/{libdeng2 => libcore}/include/de/TextStreamLogSink (100%) rename doomsday/{libdeng2 => libcore}/include/de/TextValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/Time (100%) rename doomsday/{libdeng2 => libcore}/include/de/TimeValue (100%) rename doomsday/{libdeng2 => libcore}/include/de/TokenBuffer (100%) rename doomsday/{libdeng2 => libcore}/include/de/TokenRange (100%) rename doomsday/{libdeng2 => libcore}/include/de/Transmitter (100%) rename doomsday/{libdeng2 => libcore}/include/de/TryStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/UnixInfo (100%) rename doomsday/{libdeng2 => libcore}/include/de/Value (100%) rename doomsday/{libdeng2 => libcore}/include/de/Variable (100%) rename doomsday/{libdeng2 => libcore}/include/de/Vector (100%) rename doomsday/{libdeng2 => libcore}/include/de/Version (100%) rename doomsday/{libdeng2 => libcore}/include/de/Waitable (100%) rename doomsday/{libdeng2 => libcore}/include/de/WaitableFIFO (100%) rename doomsday/{libdeng2 => libcore}/include/de/WhileStatement (100%) rename doomsday/{libdeng2 => libcore}/include/de/Widget (100%) rename doomsday/{libdeng2 => libcore}/include/de/Writer (100%) rename doomsday/{libdeng2 => libcore}/include/de/Zeroed (100%) rename doomsday/{libdeng2 => libcore}/include/de/ZipArchive (100%) rename doomsday/{libdeng2 => libcore}/include/de/c_wrapper.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/charsymbols.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/concurrency/guard.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/concurrency/lockable.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/concurrency/readwritelockable.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/concurrency/task.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/concurrency/taskpool.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/concurrency/waitable.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/core/app.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/core/asset.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/core/clock.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/core/commandline.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/core/config.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/core/debuglogsink.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/event.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/core/filelogsink.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/garbage.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/core/highperformancetimer.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/id.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/core/library.h (94%) rename doomsday/{libdeng2 => libcore}/include/de/core/log.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/core/logbuffer.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/core/logfilter.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/logsink.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/loop.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/matrix.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/core/memorylogsink.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/monospacelogsinkformatter.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/range.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/core/rectangle.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/core/system.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/textapp.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/textstreamlogsink.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/unixinfo.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/core/vector.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/core/version.h (92%) rename doomsday/{libdeng2 => libcore}/include/de/data/accessorvalue.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/data/archive.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/arrayvalue.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/bank.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/binarytree.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/bitfield.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/data/block.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/blockvalue.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/data/byteorder.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/byterefarray.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/bytesubarray.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/data/counted.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/date.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/dictionaryvalue.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/escapeparser.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/fifo.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/fixedbytearray.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/huffman.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/iblock.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/data/ibytearray.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/data/iiostream.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/data/iistream.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/data/info.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/infobank.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/data/iostream.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/data/ireadable.h (95%) rename doomsday/{libdeng2 => libcore}/include/de/data/iserializable.h (95%) rename doomsday/{libdeng2 => libcore}/include/de/data/iwritable.h (95%) rename doomsday/{libdeng2 => libcore}/include/de/data/json.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/data/nonevalue.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/data/numbervalue.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/observers.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/path.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/pathtree.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/data/property.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/data/reader.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/record.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/recordvalue.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/refuge.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/data/refvalue.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/data/shared.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/data/string.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/stringpool.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/textvalue.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/data/time.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/timevalue.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/data/value.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/variable.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/waitablefifo.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/data/writer.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/data/zeroed.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/data/ziparchive.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/error.h (91%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/archiveentryfile.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/archivefeed.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/bytearrayfile.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/directoryfeed.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/feed.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/file.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/filesystem.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/folder.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/libraryfile.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/nativefile.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/nativepath.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/filesys/packagefolder.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/game/Game (100%) rename doomsday/{libdeng2 => libcore}/include/de/game/SavedSession (100%) rename doomsday/{libdeng2 => libcore}/include/de/game/Session (100%) rename doomsday/{libdeng2 => libcore}/include/de/game/game.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/game/savedsession.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/game/session.h (100%) rename doomsday/{libdeng2/include/de/libdeng2.h => libcore/include/de/libcore.h} (98%) rename doomsday/{libdeng2 => libcore}/include/de/math.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/net/address.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/net/beacon.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/net/blockpacket.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/net/identifiedpacket.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/net/listensocket.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/net/message.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/net/packet.h (94%) rename doomsday/{libdeng2 => libcore}/include/de/net/protocol.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/net/recordpacket.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/net/socket.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/net/transmitter.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/arrayexpression.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/assignstatement.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/builtinexpression.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/catchstatement.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/compound.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/constantexpression.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/context.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/deletestatement.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/dictionaryexpression.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/evaluator.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/expression.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/expressionstatement.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/flowstatement.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/forstatement.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/function.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/functionstatement.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/functionvalue.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/ifstatement.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/iparser.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/lex.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/module.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/nameexpression.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/operator.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/operatorexpression.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/parser.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/printstatement.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/process.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/script.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/scriptedinfo.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/scriptlex.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/scriptsystem.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/statement.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/tokenbuffer.h (98%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/tokenrange.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/trystatement.h (96%) rename doomsday/{libdeng2 => libcore}/include/de/scriptsys/whilestatement.h (97%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/action.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/animation.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/animationvector.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/constantrule.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/indirectrule.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/operatorrule.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/rootwidget.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/rule.h (99%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/rulebank.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/rulerectangle.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/rules.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/scalarrule.h (100%) rename doomsday/{libdeng2 => libcore}/include/de/widgets/widget.h (100%) rename doomsday/{libdeng2/libdeng2.pro => libcore/libcore.pro} (92%) rename doomsday/{libdeng2 => libcore}/modules/Config.de (98%) rename doomsday/{libdeng2 => libcore}/modules/Log.de (96%) rename doomsday/{libdeng2 => libcore}/modules/recutil.de (97%) rename doomsday/{libdeng2 => libcore}/network.pri (100%) rename doomsday/{libdeng2 => libcore}/res/win32/.gitignore (100%) rename doomsday/{libdeng2/res/win32/deng2.rc.in => libcore/res/win32/core.rc.in} (94%) rename doomsday/{libdeng2/res/win32/deng2.dll.manifest => libcore/res/win32/deng_core.dll.manifest} (100%) rename doomsday/{libdeng2 => libcore}/res/win32/generate_rc.py (85%) rename doomsday/{libdeng2 => libcore}/res/win32/resource.h (94%) rename doomsday/{libdeng2 => libcore}/scriptsys.pri (100%) rename doomsday/{libdeng2 => libcore}/src/c_wrapper.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/concurrency/guard.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/concurrency/lockable.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/concurrency/readwritelockable.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/concurrency/task.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/concurrency/taskpool.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/concurrency/waitable.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/core/app.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/core/asset.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/callbacktimer.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/callbacktimer.h (100%) rename doomsday/{libdeng2 => libcore}/src/core/clock.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/commandline.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/core/config.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/core/debuglogsink.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/filelogsink.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/garbage.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/highperformancetimer.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/id.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/core/library.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/core/log.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/core/logbuffer.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/core/logfilter.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/logsink.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/logtextstyle.h (96%) rename doomsday/{libdeng2 => libcore}/src/core/loop.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/memorylogsink.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/monospacelogsinkformatter.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/system.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/textapp.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/textstreamlogsink.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/core/unixinfo.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/accessorvalue.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/data/archive.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/arrayvalue.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/bank.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/binarytree_wrapper.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/bitfield.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/bitfield_elements.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/block.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/data/blockvalue.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/data/byteorder.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/byterefarray.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/data/bytesubarray.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/data/counted.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/data/date.cpp (96%) rename doomsday/{libdeng2 => libcore}/src/data/dictionaryvalue.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/escapeparser.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/fixedbytearray.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/data/huffman.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/info.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/infobank.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/json.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/nonevalue.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/data/numbervalue.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/path.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/pathtree.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/pathtreenode.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/reader.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/record.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/recordvalue.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/refuge.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/refvalue.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/data/string.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/stringpool.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/textvalue.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/time.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/timevalue.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/data/value.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/variable.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/writer.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/data/ziparchive.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/error.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/filesys/archiveentryfile.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/filesys/archivefeed.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/filesys/bytearrayfile.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/filesys/directoryfeed.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/filesys/feed.cpp (96%) rename doomsday/{libdeng2 => libcore}/src/filesys/file.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/filesys/filesystem.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/filesys/folder.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/filesys/libraryfile.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/filesys/nativefile.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/filesys/nativepath.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/filesys/packagefolder.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/game/game.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/game/savedsession.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/game/session.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/matrix.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/net/address.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/net/beacon.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/net/blockpacket.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/net/identifiedpacket.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/net/listensocket.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/net/message.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/net/packet.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/net/protocol.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/net/recordpacket.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/net/socket.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/net/transmitter.cpp (96%) rename doomsday/{libdeng2 => libcore}/src/precompiled.h (96%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/arrayexpression.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/assignstatement.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/builtinexpression.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/catchstatement.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/compound.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/constantexpression.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/context.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/deletestatement.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/dictionaryexpression.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/evaluator.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/expression.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/expressionstatement.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/flowstatement.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/forstatement.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/function.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/functionstatement.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/functionvalue.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/ifstatement.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/lex.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/module.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/nameexpression.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/operator.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/operatorexpression.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/parser.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/printstatement.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/process.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/script.cpp (96%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/scriptedinfo.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/scriptlex.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/scriptsystem.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/statement.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/tokenbuffer.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/tokenrange.cpp (99%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/trystatement.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/scriptsys/whilestatement.cpp (97%) rename doomsday/{libdeng2 => libcore}/src/version.cpp (98%) rename doomsday/{libdeng2 => libcore}/src/widgets/action.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/widgets/animation.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/widgets/constantrule.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/widgets/indirectrule.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/widgets/operatorrule.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/widgets/rootwidget.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/widgets/rule.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/widgets/rulebank.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/widgets/rulerectangle.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/widgets/scalarrule.cpp (100%) rename doomsday/{libdeng2 => libcore}/src/widgets/widget.cpp (100%) rename doomsday/{libdeng2 => libcore}/widgets.pri (100%) diff --git a/README.md b/README.md index 7d8c2c57ad..c75d0dd27e 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ For [compilation instructions](http://dengine.net/dew/index.php?title=Compilatio ## Libraries -**libdeng2** is the core of Doomsday 2. It is a C++ class framework containing functionality such as the file system, plugin loading, Doomsday Script, network communications, and generic data structures. Almost everything relies or will rely on this core library. +**libcore** is the core of Doomsday 2. It is a C++ class framework containing functionality such as the file system, plugin loading, Doomsday Script, network communications, and generic data structures. Almost everything relies or will rely on this core library. -**liblegacy** is a collection of C language routines extracted from the old Doomsday 1 code base. Its purpose is to (eventually) act as a C wrapper for libdeng2. (Game plugins are mostly in C.) +**liblegacy** is a collection of C language routines extracted from the old Doomsday 1 code base. Its purpose is to (eventually) act as a C wrapper for libcore. (Game plugins are mostly in C.) -**libgui** builds on libdeng2 to add low-level GUI capabilities such as OpenGL graphics, fonts, images, and input devices. +**libgui** builds on libcore to add low-level GUI capabilities such as OpenGL graphics, fonts, images, and input devices. -**libappfw** contains the Doomsday UI framework: widgets, generic dialogs, abstract data models. libappfw is built on libgui and libdeng2. +**libappfw** contains the Doomsday UI framework: widgets, generic dialogs, abstract data models. libappfw is built on libgui and libcore. **libshell** has functionality related to connecting to and controlling Doomsday servers remotely. diff --git a/distrib/autobuild.py b/distrib/autobuild.py index 8646322957..838fb71ad4 100755 --- a/distrib/autobuild.py +++ b/distrib/autobuild.py @@ -375,7 +375,7 @@ def generate_apidoc(): system_command('wc -l doxyissues-qch.txt') print >> sys.stderr, "\nPublic API 2.0 docs..." - os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/libdeng2')) + os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/libcore')) system_command('doxygen api2.doxy >/dev/null 2>../doxyissues-api2.txt') system_command('wc -l ../doxyissues-api2.txt') diff --git a/distrib/platform_release.py b/distrib/platform_release.py index 1c7af0dd9a..baa2832ce4 100755 --- a/distrib/platform_release.py +++ b/distrib/platform_release.py @@ -379,7 +379,7 @@ def clean_products(): # Build dsFMOD separately. os.chdir('dsfmod') logSuffix = "%s-%s.txt" % (sys.platform, platform.architecture()[0]) - if os.system('LD_LIBRARY_PATH=`pwd`/../builddir/libdeng2:`pwd`/../builddir/libdeng dpkg-buildpackage -b > fmod-out-%s 2> fmod-err-%s' % (logSuffix, logSuffix)): + if os.system('LD_LIBRARY_PATH=`pwd`/../builddir/libcore:`pwd`/../builddir/liblegacy dpkg-buildpackage -b > fmod-out-%s 2> fmod-err-%s' % (logSuffix, logSuffix)): raise Exception("Failure to build dsFMOD from source.") shutil.copy(glob.glob('../doomsday-fmod*.deb')[0], OUTPUT_DIR) shutil.copy(glob.glob('../doomsday-fmod*.changes')[0], OUTPUT_DIR) diff --git a/distrib/win32/setup.iss.template b/distrib/win32/setup.iss.template index 319f07b460..e4cff5f3eb 100644 --- a/distrib/win32/setup.iss.template +++ b/distrib/win32/setup.iss.template @@ -52,6 +52,7 @@ Name: "{app}\doc" ; Obsolete files which should be removed if present when upgrading. [InstallDelete] Type: files; Name: "{app}\bin\deng1.dll" +Type: files; Name: "{app}\bin\deng2.dll" Type: files; Name: "{app}\bin\libcurl.dll" Type: files; Name: "{app}\bin\libpng15.dll" Type: files; Name: "{app}\bin\SDL_net.dll" @@ -92,11 +93,11 @@ Source: "bin\wadtool.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; Component ; Libraries Source: "..\win32\vcredist_x86.exe"; DestDir: "{app}\bin"; Flags: ignoreversion deleteafterinstall; Components: Engine +Source: "bin\deng_appfw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine +Source: "bin\deng_core.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine +Source: "bin\deng_gui.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine Source: "bin\deng_legacy.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine -Source: "bin\deng2.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine Source: "bin\deng_shell.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine -Source: "bin\deng_gui.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine -Source: "bin\deng_appfw.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine Source: "bin\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine Source: "bin\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine Source: "bin\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine diff --git a/doomsday/api/api_uri.h b/doomsday/api/api_uri.h index 7b42c149f3..440bfb372c 100644 --- a/doomsday/api/api_uri.h +++ b/doomsday/api/api_uri.h @@ -1,8 +1,8 @@ -/** @file api_uri.h Public API for Universal Resource Identifiers. +/** @file api_uri.h Public API for Universal Resource Identifiers. * @ingroup base * - * @todo de::Uri will eventually be moved to libdeng2, at which point this API - * is deprecated and the libdeng2 c_wrapper will provide C API functions + * @todo de::Uri will eventually be moved to libcore, at which point this API + * is deprecated and the libcore c_wrapper will provide C API functions * equivalent to these. * * @author Copyright © 2010-2013 Daniel Swanson diff --git a/doomsday/build/scripts/codex.py b/doomsday/build/scripts/codex.py index 7b548dad81..5c0868c868 100755 --- a/doomsday/build/scripts/codex.py +++ b/doomsday/build/scripts/codex.py @@ -229,7 +229,7 @@ def fetch_commits(): ['Test*', 'GLSandbox'], ['Docs', 'Documentation', 'Codex', 'Readme', 'Doxygen', 'Amethyst'], ['Homepage', 'Add-on Repository', 'Build Repository', 'CSS', 'RSS', 'DEW', 'Forums'], - ['libdeng2', 'App', 'Config', 'Log', 'LogBuffer', 'Widgets', 'Garbage', 'Garbages'], + ['libdeng2', 'libcore', 'App', 'Config', 'Log', 'LogBuffer', 'Widgets', 'Garbage', 'Garbages'], ['libgui', 'DisplayMode', 'GL', 'OpenGL', 'GL*', 'Atlas*', 'Image', '*Bank', 'Font'], ['libdeng', 'libdeng1', 'liblegacy', 'Str'], ['libshell', 'Shell', 'AbstractLineEditor', 'Link'], diff --git a/doomsday/build/win32/copy_to_products.py b/doomsday/build/win32/copy_to_products.py index 014d3766f8..c9ca2b0e93 100644 --- a/doomsday/build/win32/copy_to_products.py +++ b/doomsday/build/win32/copy_to_products.py @@ -32,7 +32,7 @@ def copy_if_newer(src, dest): copy_if_newer(os.path.join(solDir, 'libhexen.pk3'), os.path.join(dest, '..', 'data', 'jhexen', 'libhexen.pk3')) copy_if_newer(os.path.join(solDir, 'libdoom64.pk3'), os.path.join(dest, '..', 'data', 'jdoom64', 'libdoom64.pk3')) -targets = ['libdeng2', 'liblegacy', 'libshell', 'libgui', 'libappfw', +targets = ['libcore', 'liblegacy', 'libshell', 'libgui', 'libappfw', 'client', 'server', 'plugins\*', 'tools\*', 'tools\shell\*', 'tests\*'] diff --git a/doomsday/build/win32/qmake_msvc.py b/doomsday/build/win32/qmake_msvc.py index 8d893fb915..4426bfb3cf 100644 --- a/doomsday/build/win32/qmake_msvc.py +++ b/doomsday/build/win32/qmake_msvc.py @@ -53,7 +53,7 @@ def fileRegOff(fn, pattern, startAtPos=0): return found.start() -for proj in ['libdeng2\deng2.vcxproj', 'tools\shell\shell-gui\Doomsday-Shell.vcxproj']: +for proj in ['libcore\core.vcxproj', 'tools\shell\shell-gui\Doomsday-Shell.vcxproj']: fileRegex(proj, r'=\\"([A-Za-z0-9_\-\. ]+)\\"', r'="\1"') diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro index a38eb682c4..5da14e485f 100644 --- a/doomsday/client/client.pro +++ b/doomsday/client/client.pro @@ -32,7 +32,7 @@ include(../dep_lzss.pri) win32 { include(../dep_directx.pri) } -include(../dep_deng2.pri) +include(../dep_core.pri) include(../dep_legacy.pri) include(../dep_shell.pri) include(../dep_gui.pri) @@ -877,7 +877,7 @@ macx { } # Fix the dynamic linker paths so they point to ../Frameworks/ inside the bundle. - fixInstallName(Doomsday.app/Contents/MacOS/Doomsday, libdeng2.2.dylib, ..) + fixInstallName(Doomsday.app/Contents/MacOS/Doomsday, libdeng_core.2.dylib, ..) fixInstallName(Doomsday.app/Contents/MacOS/Doomsday, libdeng_legacy.1.dylib, ..) linkBinaryToBundledLibdengShell(Doomsday.app/Contents/MacOS/Doomsday) diff --git a/doomsday/client/include/def_data.h b/doomsday/client/include/def_data.h index 3df9532d6f..5de171be75 100644 --- a/doomsday/client/include/def_data.h +++ b/doomsday/client/include/def_data.h @@ -27,7 +27,7 @@ #define DENG_DEFINITION_FILE_H #include -#include +#include #include #include "def_share.h" diff --git a/doomsday/client/include/network/masterserver.h b/doomsday/client/include/network/masterserver.h index cd8d16c7ab..faa5d89782 100644 --- a/doomsday/client/include/network/masterserver.h +++ b/doomsday/client/include/network/masterserver.h @@ -26,7 +26,7 @@ #include "dd_share.h" -#include +#include #include #include #include diff --git a/doomsday/client/include/network/protocol.h b/doomsday/client/include/network/protocol.h index d8ea41d1c5..0c5428a421 100644 --- a/doomsday/client/include/network/protocol.h +++ b/doomsday/client/include/network/protocol.h @@ -23,7 +23,7 @@ /** * Server protocol version number. - * @deprecated Will be replaced with the libdeng2 serialization protocol version. + * @deprecated Will be replaced with the libcore serialization protocol version. */ #define SV_VERSION 23 diff --git a/doomsday/client/include/render/biasdigest.h b/doomsday/client/include/render/biasdigest.h index 2d9ba46e40..334762b012 100644 --- a/doomsday/client/include/render/biasdigest.h +++ b/doomsday/client/include/render/biasdigest.h @@ -20,7 +20,7 @@ #ifndef DENG_RENDER_SHADOWBIAS_DIGEST_H #define DENG_RENDER_SHADOWBIAS_DIGEST_H -#include +#include /** * Change digest for updating trackers in the Shadow Bias lighting model. diff --git a/doomsday/client/include/render/consoleeffect.h b/doomsday/client/include/render/consoleeffect.h index 3711e5c0a9..da97744afb 100644 --- a/doomsday/client/include/render/consoleeffect.h +++ b/doomsday/client/include/render/consoleeffect.h @@ -19,7 +19,7 @@ #ifndef DENG_CLIENT_CONSOLEEFFECT_H #define DENG_CLIENT_CONSOLEEFFECT_H -#include +#include #include #include diff --git a/doomsday/client/include/render/ilightsource.h b/doomsday/client/include/render/ilightsource.h index a0f6267458..dc47b70931 100644 --- a/doomsday/client/include/render/ilightsource.h +++ b/doomsday/client/include/render/ilightsource.h @@ -19,7 +19,7 @@ #ifndef DENG_CLIENT_ILIGHTSOURCE_H #define DENG_CLIENT_ILIGHTSOURCE_H -#include +#include #include /** diff --git a/doomsday/client/include/render/lightgrid.h b/doomsday/client/include/render/lightgrid.h index 26344a25e6..d99e02f5ae 100644 --- a/doomsday/client/include/render/lightgrid.h +++ b/doomsday/client/include/render/lightgrid.h @@ -20,7 +20,7 @@ #ifndef DENG_CLIENT_LIGHTGRID_H #define DENG_CLIENT_LIGHTGRID_H -#include +#include #include #include #include "render/ilightsource.h" diff --git a/doomsday/client/include/render/sky.h b/doomsday/client/include/render/sky.h index 2d1ee07b96..d2b9ac79c6 100644 --- a/doomsday/client/include/render/sky.h +++ b/doomsday/client/include/render/sky.h @@ -22,7 +22,7 @@ #define DENG_CLIENT_RENDER_SKY_H #include "Material" -#include +#include #include #include #include diff --git a/doomsday/client/include/render/surfacedecorator.h b/doomsday/client/include/render/surfacedecorator.h index 8eb13568dc..764da93ebf 100644 --- a/doomsday/client/include/render/surfacedecorator.h +++ b/doomsday/client/include/render/surfacedecorator.h @@ -20,7 +20,7 @@ #ifndef DENG_CLIENT_RENDER_SURFACEDECORATOR_H #define DENG_CLIENT_RENDER_SURFACEDECORATOR_H -#include +#include class Surface; diff --git a/doomsday/client/include/render/trianglestripbuilder.h b/doomsday/client/include/render/trianglestripbuilder.h index 0ae7d05af6..4f7db7e55b 100644 --- a/doomsday/client/include/render/trianglestripbuilder.h +++ b/doomsday/client/include/render/trianglestripbuilder.h @@ -22,7 +22,7 @@ #include /// @todo Remove me -#include +#include #include namespace de { diff --git a/doomsday/client/include/resource/colorpalette.h b/doomsday/client/include/resource/colorpalette.h index 39d1876401..6c07d67a3e 100644 --- a/doomsday/client/include/resource/colorpalette.h +++ b/doomsday/client/include/resource/colorpalette.h @@ -20,7 +20,7 @@ #ifndef DENG_RESOURCE_COLORPALETTE_H #define DENG_RESOURCE_COLORPALETTE_H -#include +#include #include #include #include diff --git a/doomsday/client/include/ui/clientwindow.h b/doomsday/client/include/ui/clientwindow.h index 2a5ee98669..45f5e56049 100644 --- a/doomsday/client/include/ui/clientwindow.h +++ b/doomsday/client/include/ui/clientwindow.h @@ -52,7 +52,7 @@ class BusyWidget; class AlertDialog; /** - * Top-level window that contains a libdeng2 UI widgets. @ingroup gui + * Top-level window that contains UI widgets. @ingroup gui */ class ClientWindow : public de::BaseWindow, DENG2_OBSERVES(de::Canvas, GLInit), diff --git a/doomsday/client/include/ui/dd_input.h b/doomsday/client/include/ui/dd_input.h index 1771701d25..4c4cd63267 100644 --- a/doomsday/client/include/ui/dd_input.h +++ b/doomsday/client/include/ui/dd_input.h @@ -211,7 +211,7 @@ byte DD_ModKey(byte key); bool DD_ConvertEvent(ddevent_t const *ddEvent, event_t *ev); /** - * Converts a libdeng2 Event into an old-fashioned ddevent_t. + * Converts a libcore Event into an old-fashioned ddevent_t. * * @param event Event instance. * @param ddEvent ddevent_t instance. diff --git a/doomsday/client/include/ui/widgetactions.h b/doomsday/client/include/ui/widgetactions.h index cb8bc9d76c..6d5f0c0eaa 100644 --- a/doomsday/client/include/ui/widgetactions.h +++ b/doomsday/client/include/ui/widgetactions.h @@ -19,7 +19,7 @@ #ifndef CLIENT_WIDGETACTIONS_H #define CLIENT_WIDGETACTIONS_H -#include +#include #include #include #include diff --git a/doomsday/client/include/updater.h b/doomsday/client/include/updater.h index 204078a632..24d77d2629 100644 --- a/doomsday/client/include/updater.h +++ b/doomsday/client/include/updater.h @@ -33,7 +33,7 @@ #include "dd_types.h" -#include +#include #include #include #include diff --git a/doomsday/client/include/world/entitydatabase.h b/doomsday/client/include/world/entitydatabase.h index 941c4f5b5d..8734b0ee35 100644 --- a/doomsday/client/include/world/entitydatabase.h +++ b/doomsday/client/include/world/entitydatabase.h @@ -20,7 +20,7 @@ #ifndef DENG_WORLD_ENTITYDATABASE_H #define DENG_WORLD_ENTITYDATABASE_H -#include +#include #include #include "api_mapedit.h" // valuetype_t diff --git a/doomsday/client/include/world/linesighttest.h b/doomsday/client/include/world/linesighttest.h index 7ce09a18eb..ef8904f5bf 100644 --- a/doomsday/client/include/world/linesighttest.h +++ b/doomsday/client/include/world/linesighttest.h @@ -22,7 +22,7 @@ #define DENG_WORLD_LINE_SIGHT_TEST_H #include "MapElement" -#include +#include #include namespace de { diff --git a/doomsday/client/src/clientapp.cpp b/doomsday/client/src/clientapp.cpp index 774e2ff6ac..9d5f501e1e 100644 --- a/doomsday/client/src/clientapp.cpp +++ b/doomsday/client/src/clientapp.cpp @@ -320,7 +320,7 @@ void ClientApp::initialize() d->svLink = new ServerLink; - // Config needs DisplayMode, so let's initialize it before the libdeng2 + // Config needs DisplayMode, so let's initialize it before the libcore // subsystems and Config. DisplayMode_Init(); diff --git a/doomsday/client/src/filesys/sys_direc.cpp b/doomsday/client/src/filesys/sys_direc.cpp index a997041fff..46f72c747a 100644 --- a/doomsday/client/src/filesys/sys_direc.cpp +++ b/doomsday/client/src/filesys/sys_direc.cpp @@ -1,7 +1,7 @@ /** @file sys_direc.cpp Native file system directories. * @ingroup system * - * @todo Rewrite using libdeng2's NativePath (and Qt). + * @todo Rewrite using libcore's NativePath (and Qt). * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2007-2013 Daniel Swanson diff --git a/doomsday/client/src/gl/sys_opengl.cpp b/doomsday/client/src/gl/sys_opengl.cpp index dc9e0d53c9..587136f020 100644 --- a/doomsday/client/src/gl/sys_opengl.cpp +++ b/doomsday/client/src/gl/sys_opengl.cpp @@ -26,7 +26,7 @@ #include "gl/sys_opengl.h" -#include +#include #include #include #include diff --git a/doomsday/client/src/library.cpp b/doomsday/client/src/library.cpp index 1549b1c81a..748754e630 100644 --- a/doomsday/client/src/library.cpp +++ b/doomsday/client/src/library.cpp @@ -52,7 +52,7 @@ struct library_s { // typedef Library Str* path; ///< de::FS path of the library (e.g., "/bin/doom.dll"). de::LibraryFile* file; ///< File where the plugin has been loaded from. bool isGamePlugin; ///< Is this a game plugin? (only one should be in use at a time) - std::string typeId; ///< deng2 library type ID e.g., "deng-plugin/game". + std::string typeId; ///< Library type ID e.g., "deng-plugin/game". library_s() : path(0), file(0), isGamePlugin(false) {} }; diff --git a/doomsday/client/src/render/cameralensfx.cpp b/doomsday/client/src/render/cameralensfx.cpp index ae8e638113..34c29212cb 100644 --- a/doomsday/client/src/render/cameralensfx.cpp +++ b/doomsday/client/src/render/cameralensfx.cpp @@ -50,7 +50,7 @@ #include "ui/clientwindow.h" -#include +#include #include #include #include diff --git a/doomsday/client/src/render/rend_main.cpp b/doomsday/client/src/render/rend_main.cpp index 9ca8c57a3d..6736327823 100644 --- a/doomsday/client/src/render/rend_main.cpp +++ b/doomsday/client/src/render/rend_main.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include "de_base.h" diff --git a/doomsday/client/src/resource/patch.cpp b/doomsday/client/src/resource/patch.cpp index 5e123f965f..4e92a988d5 100644 --- a/doomsday/client/src/resource/patch.cpp +++ b/doomsday/client/src/resource/patch.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "resource/patch.h" diff --git a/doomsday/client/src/updater/updatersettings.cpp b/doomsday/client/src/updater/updatersettings.cpp index 8fa041c3f7..17b50edebb 100644 --- a/doomsday/client/src/updater/updatersettings.cpp +++ b/doomsday/client/src/updater/updatersettings.cpp @@ -46,42 +46,6 @@ using namespace de; #define SYMBOL_DEFAULT_DOWNLOAD "${DEFAULT}" -#if 0 -void UpdaterSettings::initialize() -{ - Config &config = App::config(); - - if(!config.names().has(SUBREC_NAME)) - { - /** - * @todo These defaults can be moved to Config.de when libdeng2 has - * knowledge of the release type. - */ - - // Looks like we don't have existing values stored. Let's set up a - // Record with the defaults. - Record *s = new Record; - - s->addNumber(VAR_FREQUENCY, Weekly); - s->addNumber(VAR_CHANNEL, QString(DOOMSDAY_RELEASE_TYPE) == "Stable"? Stable : Unstable); - s->addTime(VAR_LAST_CHECKED, Time::invalidTime()); - - bool checkByDefault = false; -#if defined(UNIX) && !defined(MACOSX) - // On Unix platforms don't do automatic checks by default. - checkByDefault = true; -#endif - s->addBoolean(VAR_ONLY_MANUAL, checkByDefault); - - s->addBoolean(VAR_DELETE, true); - s->addText(VAR_DELETE_PATH, ""); - s->addText(VAR_DOWNLOAD_PATH, SYMBOL_DEFAULT_DOWNLOAD); - - config.names().add(SUBREC_NAME, s); - } -} -#endif - UpdaterSettings::UpdaterSettings() {} diff --git a/doomsday/config.pri b/doomsday/config.pri index f5b29af89c..33593be9ca 100644 --- a/doomsday/config.pri +++ b/doomsday/config.pri @@ -28,9 +28,9 @@ # - deng_notools Do not build and deploy the tools # - deng_openal Build the OpenAL sound driver # - deng_qtautoselect (Mac) Select OS X SDK based on Qt version -# - deng_qtgui Use the QtGui module in dep_deng2.pri -# - deng_qtopengl Use the QtOpenGL module in dep_deng2.pri -# - deng_qtwidgets Use the QtWidgets module in dep_deng2.pri +# - deng_qtgui Use the QtGui module in dep_core.pri +# - deng_qtopengl Use the QtOpenGL module in dep_core.pri +# - deng_qtwidgets Use the QtWidgets module in dep_core.pri # - deng_nopackres Do not package the Doomsday resources # - deng_rangecheck Parameter range checking/value assertions # - deng_snowberry (Unix) Include Snowberry in installation @@ -50,7 +50,7 @@ DENG_INCLUDE_DIR = $$PWD/client/include DENG_UNIX_INCLUDE_DIR = $$DENG_INCLUDE_DIR/unix DENG_MAC_INCLUDE_DIR = $$DENG_INCLUDE_DIR/macx DENG_WIN_INCLUDE_DIR = $$DENG_INCLUDE_DIR/windows -DENG_MODULES_DIR = $$PWD/libdeng2/modules +DENG_MODULES_DIR = $$PWD/libcore/modules # Macros --------------------------------------------------------------------- diff --git a/doomsday/dep_deng2.pri b/doomsday/dep_core.pri similarity index 79% rename from doomsday/dep_deng2.pri rename to doomsday/dep_core.pri index 3bf2f30cff..ca94bfb9e0 100644 --- a/doomsday/dep_deng2.pri +++ b/doomsday/dep_core.pri @@ -1,6 +1,6 @@ -include(dep_deng2_cwrapper.pri) +include(dep_core_cwrapper.pri) -# libdeng2's C++ API requires the following Qt modules. +# libcore's C++ API requires the following Qt modules. QT += core network # Optional modules: @@ -32,18 +32,18 @@ win32 { } macx { - defineTest(linkBinaryToBundledLibdeng2) { - fixInstallName($$1, libdeng2.2.dylib, ..) + defineTest(linkBinaryToBundledLibcore) { + fixInstallName($$1, libdeng_core.2.dylib, ..) fixInstallName($$1, QtCore.framework/Versions/$$QT_MAJOR_VERSION/QtCore, ..) fixInstallName($$1, QtNetwork.framework/Versions/$$QT_MAJOR_VERSION/QtNetwork, ..) deng_qtgui: fixInstallName($$1, QtGui.framework/Versions/$$QT_MAJOR_VERSION/QtGui, ..) deng_qtwidgets: fixInstallName($$1, QtWidgets.framework/Versions/$$QT_MAJOR_VERSION/QtWidgets, ..) deng_qtopengl: fixInstallName($$1, QtOpenGL.framework/Versions/$$QT_MAJOR_VERSION/QtOpenGL, ..) } - defineTest(linkToBundledLibdeng2) { - linkBinaryToBundledLibdeng2($${1}.bundle/$$1) + defineTest(linkToBundledLibcore) { + linkBinaryToBundledLibcore($${1}.bundle/$$1) } - defineTest(linkDylibToBundledLibdeng2) { - linkBinaryToBundledLibdeng2($${1}.dylib) + defineTest(linkDylibToBundledLibcore) { + linkBinaryToBundledLibcore($${1}.dylib) } } diff --git a/doomsday/dep_core_cwrapper.pri b/doomsday/dep_core_cwrapper.pri new file mode 100644 index 0000000000..5552c0638c --- /dev/null +++ b/doomsday/dep_core_cwrapper.pri @@ -0,0 +1,19 @@ +# Build configuration for using the libcore C wrapper. +INCLUDEPATH += $$PWD/libcore/include + +# Use the appropriate library path. +!useLibDir($$OUT_PWD/../libcore) { + !useLibDir($$OUT_PWD/../../libcore) { + !useLibDir($$OUT_PWD/../../../libcore) { + useLibDir($$OUT_PWD/../../builddir/libcore) + } + } +} + +LIBS += -ldeng_core + +macx { + defineTest(linkToBundledLibcore) { + fixInstallName($${1}.bundle/$$1, libdeng_core.2.dylib, ..) + } +} diff --git a/doomsday/dep_deng2_cwrapper.pri b/doomsday/dep_deng2_cwrapper.pri deleted file mode 100644 index 136ff5ab8a..0000000000 --- a/doomsday/dep_deng2_cwrapper.pri +++ /dev/null @@ -1,19 +0,0 @@ -# Build configuration for using the libdeng2 C wrapper. -INCLUDEPATH += $$PWD/libdeng2/include - -# Use the appropriate library path. -!useLibDir($$OUT_PWD/../libdeng2) { - !useLibDir($$OUT_PWD/../../libdeng2) { - !useLibDir($$OUT_PWD/../../../libdeng2) { - useLibDir($$OUT_PWD/../../builddir/libdeng2) - } - } -} - -LIBS += -ldeng2 - -macx { - defineTest(linkToBundledLibdeng2) { - fixInstallName($${1}.bundle/$$1, libdeng2.2.dylib, ..) - } -} diff --git a/doomsday/doomsday.pro b/doomsday/doomsday.pro index 50a5b1c681..729ea03895 100644 --- a/doomsday/doomsday.pro +++ b/doomsday/doomsday.pro @@ -9,7 +9,7 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = \ build \ - libdeng2 \ + libcore \ liblegacy \ libshell diff --git a/doomsday/doomsday_sdk.pri b/doomsday/doomsday_sdk.pri index 0b5110a600..690a3ee908 100644 --- a/doomsday/doomsday_sdk.pri +++ b/doomsday/doomsday_sdk.pri @@ -26,7 +26,7 @@ win32: LIBS += -L$$DENG_SDK_DIR/lib else: QMAKE_LFLAGS = -L$$DENG_SDK_DIR/lib $$QMAKE_LFLAGS # The core library is always required. -LIBS += -ldeng2 +LIBS += -ldeng_core contains(DENG_CONFIG, appfw): DENG_CONFIG *= gui shell @@ -124,7 +124,7 @@ defineTest(dengDeploy) { INSTALLS += target basepack denglibs basepack.files = $$3 - denglibs.files = $$dengSdkLib(deng2) + denglibs.files = $$dengSdkLib(deng_core) contains(DENG_CONFIG, gui): denglibs.files += $$dengSdkLib(deng_gui) contains(DENG_CONFIG, appfw): denglibs.files += $$dengSdkLib(deng_appfw) contains(DENG_CONFIG, shell): denglibs.files += $$dengSdkLib(deng_shell) diff --git a/doomsday/libappfw/include/de/framework/guiwidgetprivate.h b/doomsday/libappfw/include/de/framework/guiwidgetprivate.h index d03187535f..5a2360b12c 100644 --- a/doomsday/libappfw/include/de/framework/guiwidgetprivate.h +++ b/doomsday/libappfw/include/de/framework/guiwidgetprivate.h @@ -19,7 +19,7 @@ #ifndef LIBAPPFW_GUIWIDGETPRIVATE_H #define LIBAPPFW_GUIWIDGETPRIVATE_H -#include +#include #include "../GuiRootWidget" namespace de { diff --git a/doomsday/libappfw/libappfw.pro b/doomsday/libappfw/libappfw.pro index b54ed1ce0b..04092e8cd4 100644 --- a/doomsday/libappfw/libappfw.pro +++ b/doomsday/libappfw/libappfw.pro @@ -1,4 +1,4 @@ -# The Doomsday Engine Project -- GUI application framework for libdeng2 +# The Doomsday Engine Project -- GUI Application Framework # Copyright (c) 2014 Jaakko Keränen # # This program is distributed under the GNU Lesser General Public License @@ -13,7 +13,7 @@ VERSION = $$DENG_VERSION CONFIG += deng_qtgui deng_qtopengl -include(../dep_deng2.pri) +include(../dep_core.pri) include(../dep_shell.pri) include(../dep_gui.pri) include(../dep_opengl.pri) @@ -248,7 +248,7 @@ SOURCES += \ # Installation --------------------------------------------------------------- macx { - linkDylibToBundledLibdeng2(libdeng_appfw) + linkDylibToBundledLibcore(libdeng_appfw) doPostLink("install_name_tool -id @executable_path/../Frameworks/libdeng_appfw.1.dylib libdeng_appfw.1.dylib") diff --git a/doomsday/libappfw/src/precompiled.h b/doomsday/libappfw/src/precompiled.h index 406decc6cc..6c66ec66d2 100644 --- a/doomsday/libappfw/src/precompiled.h +++ b/doomsday/libappfw/src/precompiled.h @@ -53,7 +53,7 @@ #include #include -// libdeng2: +// libcore: #include #include #include diff --git a/doomsday/libdeng2/api2.doxy b/doomsday/libcore/api2.doxy similarity index 92% rename from doomsday/libdeng2/api2.doxy rename to doomsday/libcore/api2.doxy index e8ac7b80ca..97def486e4 100644 --- a/doomsday/libdeng2/api2.doxy +++ b/doomsday/libcore/api2.doxy @@ -1,7 +1,7 @@ -# Public API documentation for libdeng2 +# Public API documentation for libcore @INCLUDE = ../doomsday.doxy -PROJECT_NAME = "libdeng2" +PROJECT_NAME = "libcore" PROJECT_NUMBER = 2.0.0-Dev PROJECT_BRIEF = "Public API" OUTPUT_DIRECTORY = ../apidoc/api2/ diff --git a/doomsday/libdeng2/concurrency.pri b/doomsday/libcore/concurrency.pri similarity index 100% rename from doomsday/libdeng2/concurrency.pri rename to doomsday/libcore/concurrency.pri diff --git a/doomsday/libdeng2/data.pri b/doomsday/libcore/data.pri similarity index 100% rename from doomsday/libdeng2/data.pri rename to doomsday/libcore/data.pri diff --git a/doomsday/libdeng2/doxygen.css b/doomsday/libcore/doxygen.css similarity index 100% rename from doomsday/libdeng2/doxygen.css rename to doomsday/libcore/doxygen.css diff --git a/doomsday/libdeng2/filesys.pri b/doomsday/libcore/filesys.pri similarity index 100% rename from doomsday/libdeng2/filesys.pri rename to doomsday/libcore/filesys.pri diff --git a/doomsday/libdeng2/game.pri b/doomsday/libcore/game.pri similarity index 100% rename from doomsday/libdeng2/game.pri rename to doomsday/libcore/game.pri diff --git a/doomsday/libdeng2/include/de/AccessorValue b/doomsday/libcore/include/de/AccessorValue similarity index 100% rename from doomsday/libdeng2/include/de/AccessorValue rename to doomsday/libcore/include/de/AccessorValue diff --git a/doomsday/libdeng2/include/de/Action b/doomsday/libcore/include/de/Action similarity index 100% rename from doomsday/libdeng2/include/de/Action rename to doomsday/libcore/include/de/Action diff --git a/doomsday/libdeng2/include/de/Address b/doomsday/libcore/include/de/Address similarity index 100% rename from doomsday/libdeng2/include/de/Address rename to doomsday/libcore/include/de/Address diff --git a/doomsday/libdeng2/include/de/Animation b/doomsday/libcore/include/de/Animation similarity index 100% rename from doomsday/libdeng2/include/de/Animation rename to doomsday/libcore/include/de/Animation diff --git a/doomsday/libdeng2/include/de/AnimationVector b/doomsday/libcore/include/de/AnimationVector similarity index 100% rename from doomsday/libdeng2/include/de/AnimationVector rename to doomsday/libcore/include/de/AnimationVector diff --git a/doomsday/libdeng2/include/de/App b/doomsday/libcore/include/de/App similarity index 100% rename from doomsday/libdeng2/include/de/App rename to doomsday/libcore/include/de/App diff --git a/doomsday/libdeng2/include/de/Archive b/doomsday/libcore/include/de/Archive similarity index 100% rename from doomsday/libdeng2/include/de/Archive rename to doomsday/libcore/include/de/Archive diff --git a/doomsday/libdeng2/include/de/ArchiveEntryFile b/doomsday/libcore/include/de/ArchiveEntryFile similarity index 100% rename from doomsday/libdeng2/include/de/ArchiveEntryFile rename to doomsday/libcore/include/de/ArchiveEntryFile diff --git a/doomsday/libdeng2/include/de/ArchiveFeed b/doomsday/libcore/include/de/ArchiveFeed similarity index 100% rename from doomsday/libdeng2/include/de/ArchiveFeed rename to doomsday/libcore/include/de/ArchiveFeed diff --git a/doomsday/libdeng2/include/de/ArrayExpression b/doomsday/libcore/include/de/ArrayExpression similarity index 100% rename from doomsday/libdeng2/include/de/ArrayExpression rename to doomsday/libcore/include/de/ArrayExpression diff --git a/doomsday/libdeng2/include/de/ArrayValue b/doomsday/libcore/include/de/ArrayValue similarity index 100% rename from doomsday/libdeng2/include/de/ArrayValue rename to doomsday/libcore/include/de/ArrayValue diff --git a/doomsday/libdeng2/include/de/Asset b/doomsday/libcore/include/de/Asset similarity index 100% rename from doomsday/libdeng2/include/de/Asset rename to doomsday/libcore/include/de/Asset diff --git a/doomsday/libdeng2/include/de/AssignStatement b/doomsday/libcore/include/de/AssignStatement similarity index 100% rename from doomsday/libdeng2/include/de/AssignStatement rename to doomsday/libcore/include/de/AssignStatement diff --git a/doomsday/libdeng2/include/de/Audience b/doomsday/libcore/include/de/Audience similarity index 100% rename from doomsday/libdeng2/include/de/Audience rename to doomsday/libcore/include/de/Audience diff --git a/doomsday/libdeng2/include/de/Bank b/doomsday/libcore/include/de/Bank similarity index 100% rename from doomsday/libdeng2/include/de/Bank rename to doomsday/libcore/include/de/Bank diff --git a/doomsday/libdeng2/include/de/Beacon b/doomsday/libcore/include/de/Beacon similarity index 100% rename from doomsday/libdeng2/include/de/Beacon rename to doomsday/libcore/include/de/Beacon diff --git a/doomsday/libdeng2/include/de/BigEndianByteOrder b/doomsday/libcore/include/de/BigEndianByteOrder similarity index 100% rename from doomsday/libdeng2/include/de/BigEndianByteOrder rename to doomsday/libcore/include/de/BigEndianByteOrder diff --git a/doomsday/libdeng2/include/de/BinaryTree b/doomsday/libcore/include/de/BinaryTree similarity index 100% rename from doomsday/libdeng2/include/de/BinaryTree rename to doomsday/libcore/include/de/BinaryTree diff --git a/doomsday/libdeng2/include/de/BitField b/doomsday/libcore/include/de/BitField similarity index 100% rename from doomsday/libdeng2/include/de/BitField rename to doomsday/libcore/include/de/BitField diff --git a/doomsday/libdeng2/include/de/Block b/doomsday/libcore/include/de/Block similarity index 100% rename from doomsday/libdeng2/include/de/Block rename to doomsday/libcore/include/de/Block diff --git a/doomsday/libdeng2/include/de/BlockPacket b/doomsday/libcore/include/de/BlockPacket similarity index 100% rename from doomsday/libdeng2/include/de/BlockPacket rename to doomsday/libcore/include/de/BlockPacket diff --git a/doomsday/libdeng2/include/de/BlockValue b/doomsday/libcore/include/de/BlockValue similarity index 100% rename from doomsday/libdeng2/include/de/BlockValue rename to doomsday/libcore/include/de/BlockValue diff --git a/doomsday/libdeng2/include/de/BuiltInExpression b/doomsday/libcore/include/de/BuiltInExpression similarity index 100% rename from doomsday/libdeng2/include/de/BuiltInExpression rename to doomsday/libcore/include/de/BuiltInExpression diff --git a/doomsday/libdeng2/include/de/ByteArrayFile b/doomsday/libcore/include/de/ByteArrayFile similarity index 100% rename from doomsday/libdeng2/include/de/ByteArrayFile rename to doomsday/libcore/include/de/ByteArrayFile diff --git a/doomsday/libdeng2/include/de/ByteOrder b/doomsday/libcore/include/de/ByteOrder similarity index 100% rename from doomsday/libdeng2/include/de/ByteOrder rename to doomsday/libcore/include/de/ByteOrder diff --git a/doomsday/libdeng2/include/de/ByteRefArray b/doomsday/libcore/include/de/ByteRefArray similarity index 100% rename from doomsday/libdeng2/include/de/ByteRefArray rename to doomsday/libcore/include/de/ByteRefArray diff --git a/doomsday/libdeng2/include/de/ByteSubArray b/doomsday/libcore/include/de/ByteSubArray similarity index 100% rename from doomsday/libdeng2/include/de/ByteSubArray rename to doomsday/libcore/include/de/ByteSubArray diff --git a/doomsday/libdeng2/include/de/CatchStatement b/doomsday/libcore/include/de/CatchStatement similarity index 100% rename from doomsday/libdeng2/include/de/CatchStatement rename to doomsday/libcore/include/de/CatchStatement diff --git a/doomsday/libdeng2/include/de/Clock b/doomsday/libcore/include/de/Clock similarity index 100% rename from doomsday/libdeng2/include/de/Clock rename to doomsday/libcore/include/de/Clock diff --git a/doomsday/libdeng2/include/de/CommandLine b/doomsday/libcore/include/de/CommandLine similarity index 100% rename from doomsday/libdeng2/include/de/CommandLine rename to doomsday/libcore/include/de/CommandLine diff --git a/doomsday/libdeng2/include/de/Compound b/doomsday/libcore/include/de/Compound similarity index 100% rename from doomsday/libdeng2/include/de/Compound rename to doomsday/libcore/include/de/Compound diff --git a/doomsday/libdeng2/include/de/Config b/doomsday/libcore/include/de/Config similarity index 100% rename from doomsday/libdeng2/include/de/Config rename to doomsday/libcore/include/de/Config diff --git a/doomsday/libdeng2/include/de/ConstantExpression b/doomsday/libcore/include/de/ConstantExpression similarity index 100% rename from doomsday/libdeng2/include/de/ConstantExpression rename to doomsday/libcore/include/de/ConstantExpression diff --git a/doomsday/libdeng2/include/de/ConstantRule b/doomsday/libcore/include/de/ConstantRule similarity index 100% rename from doomsday/libdeng2/include/de/ConstantRule rename to doomsday/libcore/include/de/ConstantRule diff --git a/doomsday/libdeng2/include/de/Context b/doomsday/libcore/include/de/Context similarity index 100% rename from doomsday/libdeng2/include/de/Context rename to doomsday/libcore/include/de/Context diff --git a/doomsday/libdeng2/include/de/Counted b/doomsday/libcore/include/de/Counted similarity index 100% rename from doomsday/libdeng2/include/de/Counted rename to doomsday/libcore/include/de/Counted diff --git a/doomsday/libdeng2/include/de/Date b/doomsday/libcore/include/de/Date similarity index 100% rename from doomsday/libdeng2/include/de/Date rename to doomsday/libcore/include/de/Date diff --git a/doomsday/libdeng2/include/de/DebugLogSink b/doomsday/libcore/include/de/DebugLogSink similarity index 100% rename from doomsday/libdeng2/include/de/DebugLogSink rename to doomsday/libcore/include/de/DebugLogSink diff --git a/doomsday/libdeng2/include/de/DeleteStatement b/doomsday/libcore/include/de/DeleteStatement similarity index 100% rename from doomsday/libdeng2/include/de/DeleteStatement rename to doomsday/libcore/include/de/DeleteStatement diff --git a/doomsday/libdeng2/include/de/DictionaryExpression b/doomsday/libcore/include/de/DictionaryExpression similarity index 100% rename from doomsday/libdeng2/include/de/DictionaryExpression rename to doomsday/libcore/include/de/DictionaryExpression diff --git a/doomsday/libdeng2/include/de/DictionaryValue b/doomsday/libcore/include/de/DictionaryValue similarity index 100% rename from doomsday/libdeng2/include/de/DictionaryValue rename to doomsday/libcore/include/de/DictionaryValue diff --git a/doomsday/libdeng2/include/de/DirectoryFeed b/doomsday/libcore/include/de/DirectoryFeed similarity index 100% rename from doomsday/libdeng2/include/de/DirectoryFeed rename to doomsday/libcore/include/de/DirectoryFeed diff --git a/doomsday/libdeng2/include/de/DotPath b/doomsday/libcore/include/de/DotPath similarity index 100% rename from doomsday/libdeng2/include/de/DotPath rename to doomsday/libcore/include/de/DotPath diff --git a/doomsday/libdeng2/include/de/Enumerator b/doomsday/libcore/include/de/Enumerator similarity index 100% rename from doomsday/libdeng2/include/de/Enumerator rename to doomsday/libcore/include/de/Enumerator diff --git a/doomsday/libdeng2/include/de/Error b/doomsday/libcore/include/de/Error similarity index 100% rename from doomsday/libdeng2/include/de/Error rename to doomsday/libcore/include/de/Error diff --git a/doomsday/libdeng2/include/de/EscapeParser b/doomsday/libcore/include/de/EscapeParser similarity index 100% rename from doomsday/libdeng2/include/de/EscapeParser rename to doomsday/libcore/include/de/EscapeParser diff --git a/doomsday/libdeng2/include/de/Evaluator b/doomsday/libcore/include/de/Evaluator similarity index 100% rename from doomsday/libdeng2/include/de/Evaluator rename to doomsday/libcore/include/de/Evaluator diff --git a/doomsday/libdeng2/include/de/Event b/doomsday/libcore/include/de/Event similarity index 100% rename from doomsday/libdeng2/include/de/Event rename to doomsday/libcore/include/de/Event diff --git a/doomsday/libdeng2/include/de/Expression b/doomsday/libcore/include/de/Expression similarity index 100% rename from doomsday/libdeng2/include/de/Expression rename to doomsday/libcore/include/de/Expression diff --git a/doomsday/libdeng2/include/de/ExpressionStatement b/doomsday/libcore/include/de/ExpressionStatement similarity index 100% rename from doomsday/libdeng2/include/de/ExpressionStatement rename to doomsday/libcore/include/de/ExpressionStatement diff --git a/doomsday/libdeng2/include/de/FIFO b/doomsday/libcore/include/de/FIFO similarity index 100% rename from doomsday/libdeng2/include/de/FIFO rename to doomsday/libcore/include/de/FIFO diff --git a/doomsday/libdeng2/include/de/FS b/doomsday/libcore/include/de/FS similarity index 100% rename from doomsday/libdeng2/include/de/FS rename to doomsday/libcore/include/de/FS diff --git a/doomsday/libdeng2/include/de/Feed b/doomsday/libcore/include/de/Feed similarity index 100% rename from doomsday/libdeng2/include/de/Feed rename to doomsday/libcore/include/de/Feed diff --git a/doomsday/libdeng2/include/de/File b/doomsday/libcore/include/de/File similarity index 100% rename from doomsday/libdeng2/include/de/File rename to doomsday/libcore/include/de/File diff --git a/doomsday/libdeng2/include/de/FileLogSink b/doomsday/libcore/include/de/FileLogSink similarity index 100% rename from doomsday/libdeng2/include/de/FileLogSink rename to doomsday/libcore/include/de/FileLogSink diff --git a/doomsday/libdeng2/include/de/FileSystem b/doomsday/libcore/include/de/FileSystem similarity index 100% rename from doomsday/libdeng2/include/de/FileSystem rename to doomsday/libcore/include/de/FileSystem diff --git a/doomsday/libdeng2/include/de/FixedByteArray b/doomsday/libcore/include/de/FixedByteArray similarity index 100% rename from doomsday/libdeng2/include/de/FixedByteArray rename to doomsday/libcore/include/de/FixedByteArray diff --git a/doomsday/libdeng2/include/de/FlowStatement b/doomsday/libcore/include/de/FlowStatement similarity index 100% rename from doomsday/libdeng2/include/de/FlowStatement rename to doomsday/libcore/include/de/FlowStatement diff --git a/doomsday/libdeng2/include/de/Folder b/doomsday/libcore/include/de/Folder similarity index 100% rename from doomsday/libdeng2/include/de/Folder rename to doomsday/libcore/include/de/Folder diff --git a/doomsday/libdeng2/include/de/ForStatement b/doomsday/libcore/include/de/ForStatement similarity index 100% rename from doomsday/libdeng2/include/de/ForStatement rename to doomsday/libcore/include/de/ForStatement diff --git a/doomsday/libdeng2/include/de/Function b/doomsday/libcore/include/de/Function similarity index 100% rename from doomsday/libdeng2/include/de/Function rename to doomsday/libcore/include/de/Function diff --git a/doomsday/libdeng2/include/de/FunctionStatement b/doomsday/libcore/include/de/FunctionStatement similarity index 100% rename from doomsday/libdeng2/include/de/FunctionStatement rename to doomsday/libcore/include/de/FunctionStatement diff --git a/doomsday/libdeng2/include/de/FunctionValue b/doomsday/libcore/include/de/FunctionValue similarity index 100% rename from doomsday/libdeng2/include/de/FunctionValue rename to doomsday/libcore/include/de/FunctionValue diff --git a/doomsday/libdeng2/include/de/Garbage b/doomsday/libcore/include/de/Garbage similarity index 100% rename from doomsday/libdeng2/include/de/Garbage rename to doomsday/libcore/include/de/Garbage diff --git a/doomsday/libdeng2/include/de/Guard b/doomsday/libcore/include/de/Guard similarity index 100% rename from doomsday/libdeng2/include/de/Guard rename to doomsday/libcore/include/de/Guard diff --git a/doomsday/libdeng2/include/de/HighPerformanceTimer b/doomsday/libcore/include/de/HighPerformanceTimer similarity index 100% rename from doomsday/libdeng2/include/de/HighPerformanceTimer rename to doomsday/libcore/include/de/HighPerformanceTimer diff --git a/doomsday/libdeng2/include/de/IBlock b/doomsday/libcore/include/de/IBlock similarity index 100% rename from doomsday/libdeng2/include/de/IBlock rename to doomsday/libcore/include/de/IBlock diff --git a/doomsday/libdeng2/include/de/IByteArray b/doomsday/libcore/include/de/IByteArray similarity index 100% rename from doomsday/libdeng2/include/de/IByteArray rename to doomsday/libcore/include/de/IByteArray diff --git a/doomsday/libdeng2/include/de/IIOStream b/doomsday/libcore/include/de/IIOStream similarity index 100% rename from doomsday/libdeng2/include/de/IIOStream rename to doomsday/libcore/include/de/IIOStream diff --git a/doomsday/libdeng2/include/de/IIStream b/doomsday/libcore/include/de/IIStream similarity index 100% rename from doomsday/libdeng2/include/de/IIStream rename to doomsday/libcore/include/de/IIStream diff --git a/doomsday/libdeng2/include/de/IOStream b/doomsday/libcore/include/de/IOStream similarity index 100% rename from doomsday/libdeng2/include/de/IOStream rename to doomsday/libcore/include/de/IOStream diff --git a/doomsday/libdeng2/include/de/IParser b/doomsday/libcore/include/de/IParser similarity index 100% rename from doomsday/libdeng2/include/de/IParser rename to doomsday/libcore/include/de/IParser diff --git a/doomsday/libdeng2/include/de/IReadable b/doomsday/libcore/include/de/IReadable similarity index 100% rename from doomsday/libdeng2/include/de/IReadable rename to doomsday/libcore/include/de/IReadable diff --git a/doomsday/libdeng2/include/de/ISerializable b/doomsday/libcore/include/de/ISerializable similarity index 100% rename from doomsday/libdeng2/include/de/ISerializable rename to doomsday/libcore/include/de/ISerializable diff --git a/doomsday/libdeng2/include/de/IWritable b/doomsday/libcore/include/de/IWritable similarity index 100% rename from doomsday/libdeng2/include/de/IWritable rename to doomsday/libcore/include/de/IWritable diff --git a/doomsday/libdeng2/include/de/Id b/doomsday/libcore/include/de/Id similarity index 100% rename from doomsday/libdeng2/include/de/Id rename to doomsday/libcore/include/de/Id diff --git a/doomsday/libdeng2/include/de/IdentifiedPacket b/doomsday/libcore/include/de/IdentifiedPacket similarity index 100% rename from doomsday/libdeng2/include/de/IdentifiedPacket rename to doomsday/libcore/include/de/IdentifiedPacket diff --git a/doomsday/libdeng2/include/de/IfStatement b/doomsday/libcore/include/de/IfStatement similarity index 100% rename from doomsday/libdeng2/include/de/IfStatement rename to doomsday/libcore/include/de/IfStatement diff --git a/doomsday/libdeng2/include/de/IndirectRule b/doomsday/libcore/include/de/IndirectRule similarity index 100% rename from doomsday/libdeng2/include/de/IndirectRule rename to doomsday/libcore/include/de/IndirectRule diff --git a/doomsday/libdeng2/include/de/Info b/doomsday/libcore/include/de/Info similarity index 100% rename from doomsday/libdeng2/include/de/Info rename to doomsday/libcore/include/de/Info diff --git a/doomsday/libdeng2/include/de/InfoBank b/doomsday/libcore/include/de/InfoBank similarity index 100% rename from doomsday/libdeng2/include/de/InfoBank rename to doomsday/libcore/include/de/InfoBank diff --git a/doomsday/libdeng2/include/de/Lex b/doomsday/libcore/include/de/Lex similarity index 100% rename from doomsday/libdeng2/include/de/Lex rename to doomsday/libcore/include/de/Lex diff --git a/doomsday/libdeng2/include/de/Library b/doomsday/libcore/include/de/Library similarity index 100% rename from doomsday/libdeng2/include/de/Library rename to doomsday/libcore/include/de/Library diff --git a/doomsday/libdeng2/include/de/LibraryFile b/doomsday/libcore/include/de/LibraryFile similarity index 100% rename from doomsday/libdeng2/include/de/LibraryFile rename to doomsday/libcore/include/de/LibraryFile diff --git a/doomsday/libdeng2/include/de/ListenSocket b/doomsday/libcore/include/de/ListenSocket similarity index 100% rename from doomsday/libdeng2/include/de/ListenSocket rename to doomsday/libcore/include/de/ListenSocket diff --git a/doomsday/libdeng2/include/de/LittleEndianByteOrder b/doomsday/libcore/include/de/LittleEndianByteOrder similarity index 100% rename from doomsday/libdeng2/include/de/LittleEndianByteOrder rename to doomsday/libcore/include/de/LittleEndianByteOrder diff --git a/doomsday/libdeng2/include/de/Lockable b/doomsday/libcore/include/de/Lockable similarity index 100% rename from doomsday/libdeng2/include/de/Lockable rename to doomsday/libcore/include/de/Lockable diff --git a/doomsday/libdeng2/include/de/Log b/doomsday/libcore/include/de/Log similarity index 100% rename from doomsday/libdeng2/include/de/Log rename to doomsday/libcore/include/de/Log diff --git a/doomsday/libdeng2/include/de/LogBuffer b/doomsday/libcore/include/de/LogBuffer similarity index 100% rename from doomsday/libdeng2/include/de/LogBuffer rename to doomsday/libcore/include/de/LogBuffer diff --git a/doomsday/libdeng2/include/de/LogFilter b/doomsday/libcore/include/de/LogFilter similarity index 100% rename from doomsday/libdeng2/include/de/LogFilter rename to doomsday/libcore/include/de/LogFilter diff --git a/doomsday/libdeng2/include/de/LogSink b/doomsday/libcore/include/de/LogSink similarity index 100% rename from doomsday/libdeng2/include/de/LogSink rename to doomsday/libcore/include/de/LogSink diff --git a/doomsday/libdeng2/include/de/Loop b/doomsday/libcore/include/de/Loop similarity index 100% rename from doomsday/libdeng2/include/de/Loop rename to doomsday/libcore/include/de/Loop diff --git a/doomsday/libdeng2/include/de/Matrix b/doomsday/libcore/include/de/Matrix similarity index 100% rename from doomsday/libdeng2/include/de/Matrix rename to doomsday/libcore/include/de/Matrix diff --git a/doomsday/libdeng2/include/de/MemoryLogSink b/doomsday/libcore/include/de/MemoryLogSink similarity index 100% rename from doomsday/libdeng2/include/de/MemoryLogSink rename to doomsday/libcore/include/de/MemoryLogSink diff --git a/doomsday/libdeng2/include/de/Message b/doomsday/libcore/include/de/Message similarity index 100% rename from doomsday/libdeng2/include/de/Message rename to doomsday/libcore/include/de/Message diff --git a/doomsday/libdeng2/include/de/Module b/doomsday/libcore/include/de/Module similarity index 100% rename from doomsday/libdeng2/include/de/Module rename to doomsday/libcore/include/de/Module diff --git a/doomsday/libdeng2/include/de/MonospaceLogSinkFormatter b/doomsday/libcore/include/de/MonospaceLogSinkFormatter similarity index 100% rename from doomsday/libdeng2/include/de/MonospaceLogSinkFormatter rename to doomsday/libcore/include/de/MonospaceLogSinkFormatter diff --git a/doomsday/libdeng2/include/de/NameExpression b/doomsday/libcore/include/de/NameExpression similarity index 100% rename from doomsday/libdeng2/include/de/NameExpression rename to doomsday/libcore/include/de/NameExpression diff --git a/doomsday/libdeng2/include/de/NativeFile b/doomsday/libcore/include/de/NativeFile similarity index 100% rename from doomsday/libdeng2/include/de/NativeFile rename to doomsday/libcore/include/de/NativeFile diff --git a/doomsday/libdeng2/include/de/NativePath b/doomsday/libcore/include/de/NativePath similarity index 100% rename from doomsday/libdeng2/include/de/NativePath rename to doomsday/libcore/include/de/NativePath diff --git a/doomsday/libdeng2/include/de/NoneValue b/doomsday/libcore/include/de/NoneValue similarity index 100% rename from doomsday/libdeng2/include/de/NoneValue rename to doomsday/libcore/include/de/NoneValue diff --git a/doomsday/libdeng2/include/de/NumberValue b/doomsday/libcore/include/de/NumberValue similarity index 100% rename from doomsday/libdeng2/include/de/NumberValue rename to doomsday/libcore/include/de/NumberValue diff --git a/doomsday/libdeng2/include/de/Observers b/doomsday/libcore/include/de/Observers similarity index 100% rename from doomsday/libdeng2/include/de/Observers rename to doomsday/libcore/include/de/Observers diff --git a/doomsday/libdeng2/include/de/Operator b/doomsday/libcore/include/de/Operator similarity index 100% rename from doomsday/libdeng2/include/de/Operator rename to doomsday/libcore/include/de/Operator diff --git a/doomsday/libdeng2/include/de/OperatorExpression b/doomsday/libcore/include/de/OperatorExpression similarity index 100% rename from doomsday/libdeng2/include/de/OperatorExpression rename to doomsday/libcore/include/de/OperatorExpression diff --git a/doomsday/libdeng2/include/de/OperatorRule b/doomsday/libcore/include/de/OperatorRule similarity index 100% rename from doomsday/libdeng2/include/de/OperatorRule rename to doomsday/libcore/include/de/OperatorRule diff --git a/doomsday/libdeng2/include/de/PackageFolder b/doomsday/libcore/include/de/PackageFolder similarity index 100% rename from doomsday/libdeng2/include/de/PackageFolder rename to doomsday/libcore/include/de/PackageFolder diff --git a/doomsday/libdeng2/include/de/Packet b/doomsday/libcore/include/de/Packet similarity index 100% rename from doomsday/libdeng2/include/de/Packet rename to doomsday/libcore/include/de/Packet diff --git a/doomsday/libdeng2/include/de/Parser b/doomsday/libcore/include/de/Parser similarity index 100% rename from doomsday/libdeng2/include/de/Parser rename to doomsday/libcore/include/de/Parser diff --git a/doomsday/libdeng2/include/de/Path b/doomsday/libcore/include/de/Path similarity index 100% rename from doomsday/libdeng2/include/de/Path rename to doomsday/libcore/include/de/Path diff --git a/doomsday/libdeng2/include/de/PathTree b/doomsday/libcore/include/de/PathTree similarity index 100% rename from doomsday/libdeng2/include/de/PathTree rename to doomsday/libcore/include/de/PathTree diff --git a/doomsday/libdeng2/include/de/PrintStatement b/doomsday/libcore/include/de/PrintStatement similarity index 100% rename from doomsday/libdeng2/include/de/PrintStatement rename to doomsday/libcore/include/de/PrintStatement diff --git a/doomsday/libdeng2/include/de/Process b/doomsday/libcore/include/de/Process similarity index 100% rename from doomsday/libdeng2/include/de/Process rename to doomsday/libcore/include/de/Process diff --git a/doomsday/libdeng2/include/de/Property b/doomsday/libcore/include/de/Property similarity index 100% rename from doomsday/libdeng2/include/de/Property rename to doomsday/libcore/include/de/Property diff --git a/doomsday/libdeng2/include/de/Protocol b/doomsday/libcore/include/de/Protocol similarity index 100% rename from doomsday/libdeng2/include/de/Protocol rename to doomsday/libcore/include/de/Protocol diff --git a/doomsday/libdeng2/include/de/Range b/doomsday/libcore/include/de/Range similarity index 100% rename from doomsday/libdeng2/include/de/Range rename to doomsday/libcore/include/de/Range diff --git a/doomsday/libdeng2/include/de/ReadWriteLockable b/doomsday/libcore/include/de/ReadWriteLockable similarity index 100% rename from doomsday/libdeng2/include/de/ReadWriteLockable rename to doomsday/libcore/include/de/ReadWriteLockable diff --git a/doomsday/libdeng2/include/de/Reader b/doomsday/libcore/include/de/Reader similarity index 100% rename from doomsday/libdeng2/include/de/Reader rename to doomsday/libcore/include/de/Reader diff --git a/doomsday/libdeng2/include/de/Record b/doomsday/libcore/include/de/Record similarity index 100% rename from doomsday/libdeng2/include/de/Record rename to doomsday/libcore/include/de/Record diff --git a/doomsday/libdeng2/include/de/RecordPacket b/doomsday/libcore/include/de/RecordPacket similarity index 100% rename from doomsday/libdeng2/include/de/RecordPacket rename to doomsday/libcore/include/de/RecordPacket diff --git a/doomsday/libdeng2/include/de/RecordValue b/doomsday/libcore/include/de/RecordValue similarity index 100% rename from doomsday/libdeng2/include/de/RecordValue rename to doomsday/libcore/include/de/RecordValue diff --git a/doomsday/libdeng2/include/de/Rectangle b/doomsday/libcore/include/de/Rectangle similarity index 100% rename from doomsday/libdeng2/include/de/Rectangle rename to doomsday/libcore/include/de/Rectangle diff --git a/doomsday/libdeng2/include/de/RefValue b/doomsday/libcore/include/de/RefValue similarity index 100% rename from doomsday/libdeng2/include/de/RefValue rename to doomsday/libcore/include/de/RefValue diff --git a/doomsday/libdeng2/include/de/Refuge b/doomsday/libcore/include/de/Refuge similarity index 100% rename from doomsday/libdeng2/include/de/Refuge rename to doomsday/libcore/include/de/Refuge diff --git a/doomsday/libdeng2/include/de/RootWidget b/doomsday/libcore/include/de/RootWidget similarity index 100% rename from doomsday/libdeng2/include/de/RootWidget rename to doomsday/libcore/include/de/RootWidget diff --git a/doomsday/libdeng2/include/de/Rule b/doomsday/libcore/include/de/Rule similarity index 100% rename from doomsday/libdeng2/include/de/Rule rename to doomsday/libcore/include/de/Rule diff --git a/doomsday/libdeng2/include/de/RuleBank b/doomsday/libcore/include/de/RuleBank similarity index 100% rename from doomsday/libdeng2/include/de/RuleBank rename to doomsday/libcore/include/de/RuleBank diff --git a/doomsday/libdeng2/include/de/RuleRectangle b/doomsday/libcore/include/de/RuleRectangle similarity index 100% rename from doomsday/libdeng2/include/de/RuleRectangle rename to doomsday/libcore/include/de/RuleRectangle diff --git a/doomsday/libdeng2/include/de/ScalarRule b/doomsday/libcore/include/de/ScalarRule similarity index 100% rename from doomsday/libdeng2/include/de/ScalarRule rename to doomsday/libcore/include/de/ScalarRule diff --git a/doomsday/libdeng2/include/de/Script b/doomsday/libcore/include/de/Script similarity index 100% rename from doomsday/libdeng2/include/de/Script rename to doomsday/libcore/include/de/Script diff --git a/doomsday/libdeng2/include/de/ScriptLex b/doomsday/libcore/include/de/ScriptLex similarity index 100% rename from doomsday/libdeng2/include/de/ScriptLex rename to doomsday/libcore/include/de/ScriptLex diff --git a/doomsday/libdeng2/include/de/ScriptSystem b/doomsday/libcore/include/de/ScriptSystem similarity index 100% rename from doomsday/libdeng2/include/de/ScriptSystem rename to doomsday/libcore/include/de/ScriptSystem diff --git a/doomsday/libdeng2/include/de/ScriptedInfo b/doomsday/libcore/include/de/ScriptedInfo similarity index 100% rename from doomsday/libdeng2/include/de/ScriptedInfo rename to doomsday/libcore/include/de/ScriptedInfo diff --git a/doomsday/libdeng2/include/de/Shared b/doomsday/libcore/include/de/Shared similarity index 100% rename from doomsday/libdeng2/include/de/Shared rename to doomsday/libcore/include/de/Shared diff --git a/doomsday/libdeng2/include/de/SimpleLogFilter b/doomsday/libcore/include/de/SimpleLogFilter similarity index 100% rename from doomsday/libdeng2/include/de/SimpleLogFilter rename to doomsday/libcore/include/de/SimpleLogFilter diff --git a/doomsday/libdeng2/include/de/Socket b/doomsday/libcore/include/de/Socket similarity index 100% rename from doomsday/libdeng2/include/de/Socket rename to doomsday/libcore/include/de/Socket diff --git a/doomsday/libdeng2/include/de/Statement b/doomsday/libcore/include/de/Statement similarity index 100% rename from doomsday/libdeng2/include/de/Statement rename to doomsday/libcore/include/de/Statement diff --git a/doomsday/libdeng2/include/de/String b/doomsday/libcore/include/de/String similarity index 100% rename from doomsday/libdeng2/include/de/String rename to doomsday/libcore/include/de/String diff --git a/doomsday/libdeng2/include/de/StringPool b/doomsday/libcore/include/de/StringPool similarity index 100% rename from doomsday/libdeng2/include/de/StringPool rename to doomsday/libcore/include/de/StringPool diff --git a/doomsday/libdeng2/include/de/System b/doomsday/libcore/include/de/System similarity index 100% rename from doomsday/libdeng2/include/de/System rename to doomsday/libcore/include/de/System diff --git a/doomsday/libdeng2/include/de/Task b/doomsday/libcore/include/de/Task similarity index 100% rename from doomsday/libdeng2/include/de/Task rename to doomsday/libcore/include/de/Task diff --git a/doomsday/libdeng2/include/de/TaskPool b/doomsday/libcore/include/de/TaskPool similarity index 100% rename from doomsday/libdeng2/include/de/TaskPool rename to doomsday/libcore/include/de/TaskPool diff --git a/doomsday/libdeng2/include/de/TextApp b/doomsday/libcore/include/de/TextApp similarity index 100% rename from doomsday/libdeng2/include/de/TextApp rename to doomsday/libcore/include/de/TextApp diff --git a/doomsday/libdeng2/include/de/TextStreamLogSink b/doomsday/libcore/include/de/TextStreamLogSink similarity index 100% rename from doomsday/libdeng2/include/de/TextStreamLogSink rename to doomsday/libcore/include/de/TextStreamLogSink diff --git a/doomsday/libdeng2/include/de/TextValue b/doomsday/libcore/include/de/TextValue similarity index 100% rename from doomsday/libdeng2/include/de/TextValue rename to doomsday/libcore/include/de/TextValue diff --git a/doomsday/libdeng2/include/de/Time b/doomsday/libcore/include/de/Time similarity index 100% rename from doomsday/libdeng2/include/de/Time rename to doomsday/libcore/include/de/Time diff --git a/doomsday/libdeng2/include/de/TimeValue b/doomsday/libcore/include/de/TimeValue similarity index 100% rename from doomsday/libdeng2/include/de/TimeValue rename to doomsday/libcore/include/de/TimeValue diff --git a/doomsday/libdeng2/include/de/TokenBuffer b/doomsday/libcore/include/de/TokenBuffer similarity index 100% rename from doomsday/libdeng2/include/de/TokenBuffer rename to doomsday/libcore/include/de/TokenBuffer diff --git a/doomsday/libdeng2/include/de/TokenRange b/doomsday/libcore/include/de/TokenRange similarity index 100% rename from doomsday/libdeng2/include/de/TokenRange rename to doomsday/libcore/include/de/TokenRange diff --git a/doomsday/libdeng2/include/de/Transmitter b/doomsday/libcore/include/de/Transmitter similarity index 100% rename from doomsday/libdeng2/include/de/Transmitter rename to doomsday/libcore/include/de/Transmitter diff --git a/doomsday/libdeng2/include/de/TryStatement b/doomsday/libcore/include/de/TryStatement similarity index 100% rename from doomsday/libdeng2/include/de/TryStatement rename to doomsday/libcore/include/de/TryStatement diff --git a/doomsday/libdeng2/include/de/UnixInfo b/doomsday/libcore/include/de/UnixInfo similarity index 100% rename from doomsday/libdeng2/include/de/UnixInfo rename to doomsday/libcore/include/de/UnixInfo diff --git a/doomsday/libdeng2/include/de/Value b/doomsday/libcore/include/de/Value similarity index 100% rename from doomsday/libdeng2/include/de/Value rename to doomsday/libcore/include/de/Value diff --git a/doomsday/libdeng2/include/de/Variable b/doomsday/libcore/include/de/Variable similarity index 100% rename from doomsday/libdeng2/include/de/Variable rename to doomsday/libcore/include/de/Variable diff --git a/doomsday/libdeng2/include/de/Vector b/doomsday/libcore/include/de/Vector similarity index 100% rename from doomsday/libdeng2/include/de/Vector rename to doomsday/libcore/include/de/Vector diff --git a/doomsday/libdeng2/include/de/Version b/doomsday/libcore/include/de/Version similarity index 100% rename from doomsday/libdeng2/include/de/Version rename to doomsday/libcore/include/de/Version diff --git a/doomsday/libdeng2/include/de/Waitable b/doomsday/libcore/include/de/Waitable similarity index 100% rename from doomsday/libdeng2/include/de/Waitable rename to doomsday/libcore/include/de/Waitable diff --git a/doomsday/libdeng2/include/de/WaitableFIFO b/doomsday/libcore/include/de/WaitableFIFO similarity index 100% rename from doomsday/libdeng2/include/de/WaitableFIFO rename to doomsday/libcore/include/de/WaitableFIFO diff --git a/doomsday/libdeng2/include/de/WhileStatement b/doomsday/libcore/include/de/WhileStatement similarity index 100% rename from doomsday/libdeng2/include/de/WhileStatement rename to doomsday/libcore/include/de/WhileStatement diff --git a/doomsday/libdeng2/include/de/Widget b/doomsday/libcore/include/de/Widget similarity index 100% rename from doomsday/libdeng2/include/de/Widget rename to doomsday/libcore/include/de/Widget diff --git a/doomsday/libdeng2/include/de/Writer b/doomsday/libcore/include/de/Writer similarity index 100% rename from doomsday/libdeng2/include/de/Writer rename to doomsday/libcore/include/de/Writer diff --git a/doomsday/libdeng2/include/de/Zeroed b/doomsday/libcore/include/de/Zeroed similarity index 100% rename from doomsday/libdeng2/include/de/Zeroed rename to doomsday/libcore/include/de/Zeroed diff --git a/doomsday/libdeng2/include/de/ZipArchive b/doomsday/libcore/include/de/ZipArchive similarity index 100% rename from doomsday/libdeng2/include/de/ZipArchive rename to doomsday/libcore/include/de/ZipArchive diff --git a/doomsday/libdeng2/include/de/c_wrapper.h b/doomsday/libcore/include/de/c_wrapper.h similarity index 98% rename from doomsday/libdeng2/include/de/c_wrapper.h rename to doomsday/libcore/include/de/c_wrapper.h index 5fba7334b9..9e56ed3381 100644 --- a/doomsday/libdeng2/include/de/c_wrapper.h +++ b/doomsday/libcore/include/de/c_wrapper.h @@ -1,6 +1,13 @@ -/** @file c_wrapper.h C wrapper for various libdeng2 classes. +/** @file c_wrapper.h C wrapper for various libcore classes. * @ingroup core * + * Defines a C wrapper API for (some of the) libcore classes. Legacy code + * can use this wrapper API to access libcore functionality. Note that the + * identifiers in this file are @em not in the @c de namespace. + * + * @note The basic de data types (e.g., dint32) are not available for the C + * API; instead, only the standard C data types should be used. + * * @authors Copyright © 2011-2013 Jaakko Keränen * * @par License @@ -20,7 +27,7 @@ #ifndef LIBDENG2_C_WRAPPER_H #define LIBDENG2_C_WRAPPER_H -#include "libdeng2.h" +#include "libcore.h" #if defined(__cplusplus) && !defined(DENG2_C_API_ONLY) using de::dint16; @@ -33,18 +40,6 @@ using de::dfloat; using de::ddouble; #endif -/** - * @file c_wrapper.h - * libdeng2 C wrapper. - * - * Defines a C wrapper API for (some of the) libdeng2 classes. Legacy code - * can use this wrapper API to access libdeng2 functionality. Note that the - * identifiers in this file are _not_ in the de namespace. - * - * @note The basic de data types (e.g., dint32) are not available for the C - * API; instead, only the standard C data types should be used. - */ - #ifdef __cplusplus extern "C" { #endif diff --git a/doomsday/libdeng2/include/de/charsymbols.h b/doomsday/libcore/include/de/charsymbols.h similarity index 100% rename from doomsday/libdeng2/include/de/charsymbols.h rename to doomsday/libcore/include/de/charsymbols.h diff --git a/doomsday/libdeng2/include/de/concurrency/guard.h b/doomsday/libcore/include/de/concurrency/guard.h similarity index 97% rename from doomsday/libdeng2/include/de/concurrency/guard.h rename to doomsday/libcore/include/de/concurrency/guard.h index 8a06f06811..9b50abc433 100644 --- a/doomsday/libdeng2/include/de/concurrency/guard.h +++ b/doomsday/libcore/include/de/concurrency/guard.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2011-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_GUARD_H #define LIBDENG2_GUARD_H -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/concurrency/lockable.h b/doomsday/libcore/include/de/concurrency/lockable.h similarity index 96% rename from doomsday/libdeng2/include/de/concurrency/lockable.h rename to doomsday/libcore/include/de/concurrency/lockable.h index 5a173698f9..8c33e9dcd7 100644 --- a/doomsday/libdeng2/include/de/concurrency/lockable.h +++ b/doomsday/libcore/include/de/concurrency/lockable.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * @authors Copyright © 2004-2014 Jaakko Keränen * @authors Copyright © 2014 Daniel Swanson @@ -21,7 +21,7 @@ #ifndef LIBDENG2_LOCKABLE_H #define LIBDENG2_LOCKABLE_H -#include "../libdeng2.h" +#include "../libcore.h" #include diff --git a/doomsday/libdeng2/include/de/concurrency/readwritelockable.h b/doomsday/libcore/include/de/concurrency/readwritelockable.h similarity index 98% rename from doomsday/libdeng2/include/de/concurrency/readwritelockable.h rename to doomsday/libcore/include/de/concurrency/readwritelockable.h index b6e3cc6206..c0fae00b96 100644 --- a/doomsday/libdeng2/include/de/concurrency/readwritelockable.h +++ b/doomsday/libcore/include/de/concurrency/readwritelockable.h @@ -19,7 +19,7 @@ #ifndef LIBDENG2_READWRITELOCKABLE_H #define LIBDENG2_READWRITELOCKABLE_H -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/concurrency/task.h b/doomsday/libcore/include/de/concurrency/task.h similarity index 98% rename from doomsday/libdeng2/include/de/concurrency/task.h rename to doomsday/libcore/include/de/concurrency/task.h index 07176646cd..48dd08f839 100644 --- a/doomsday/libdeng2/include/de/concurrency/task.h +++ b/doomsday/libcore/include/de/concurrency/task.h @@ -21,7 +21,7 @@ #include -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/concurrency/taskpool.h b/doomsday/libcore/include/de/concurrency/taskpool.h similarity index 99% rename from doomsday/libdeng2/include/de/concurrency/taskpool.h rename to doomsday/libcore/include/de/concurrency/taskpool.h index 8b6e96b8da..acdbeab8a0 100644 --- a/doomsday/libdeng2/include/de/concurrency/taskpool.h +++ b/doomsday/libcore/include/de/concurrency/taskpool.h @@ -21,7 +21,7 @@ #include -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/concurrency/waitable.h b/doomsday/libcore/include/de/concurrency/waitable.h similarity index 96% rename from doomsday/libdeng2/include/de/concurrency/waitable.h rename to doomsday/libcore/include/de/concurrency/waitable.h index 82712574e8..ac431285d5 100644 --- a/doomsday/libdeng2/include/de/concurrency/waitable.h +++ b/doomsday/libcore/include/de/concurrency/waitable.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_WAITABLE_H #define LIBDENG2_WAITABLE_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Time" #include diff --git a/doomsday/libdeng2/include/de/core/app.h b/doomsday/libcore/include/de/core/app.h similarity index 98% rename from doomsday/libdeng2/include/de/core/app.h rename to doomsday/libcore/include/de/core/app.h index b8e7e1ca21..a7e84dacb5 100644 --- a/doomsday/libdeng2/include/de/core/app.h +++ b/doomsday/libcore/include/de/core/app.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2010-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_APP_H #define LIBDENG2_APP_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Clock" #include "../CommandLine" #include "../NativePath" @@ -206,8 +206,8 @@ class DENG2_PUBLIC App : DENG2_OBSERVES(Clock, TimeChange) /** * Returns the native path of the data base folder. * - * In libdeng2, the base folder is the location where all the common - * data files are located, e.g., /usr/share/doomsday on Linux. + * The base folder is the location where all the common data files are located, e.g., + * /usr/share/doomsday on Linux. */ NativePath nativeBasePath(); diff --git a/doomsday/libdeng2/include/de/core/asset.h b/doomsday/libcore/include/de/core/asset.h similarity index 99% rename from doomsday/libdeng2/include/de/core/asset.h rename to doomsday/libcore/include/de/core/asset.h index ec782f5dc8..c53e999ff6 100644 --- a/doomsday/libdeng2/include/de/core/asset.h +++ b/doomsday/libcore/include/de/core/asset.h @@ -19,7 +19,7 @@ #ifndef LIBDENG2_ASSET_H #define LIBDENG2_ASSET_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Observers" #include diff --git a/doomsday/libdeng2/include/de/core/clock.h b/doomsday/libcore/include/de/core/clock.h similarity index 98% rename from doomsday/libdeng2/include/de/core/clock.h rename to doomsday/libcore/include/de/core/clock.h index 87e06b24a6..6eeec5cc0a 100644 --- a/doomsday/libdeng2/include/de/core/clock.h +++ b/doomsday/libcore/include/de/core/clock.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/core/commandline.h b/doomsday/libcore/include/de/core/commandline.h similarity index 99% rename from doomsday/libdeng2/include/de/core/commandline.h rename to doomsday/libcore/include/de/core/commandline.h index de4f311460..7680eb2860 100644 --- a/doomsday/libdeng2/include/de/core/commandline.h +++ b/doomsday/libcore/include/de/core/commandline.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -26,7 +26,7 @@ #include -#include "../libdeng2.h" +#include "../libcore.h" #include "../String" #include "../NativePath" diff --git a/doomsday/libdeng2/include/de/core/config.h b/doomsday/libcore/include/de/core/config.h similarity index 99% rename from doomsday/libdeng2/include/de/core/config.h rename to doomsday/libcore/include/de/core/config.h index a499065239..2fb11be6a3 100644 --- a/doomsday/libdeng2/include/de/core/config.h +++ b/doomsday/libcore/include/de/core/config.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/core/debuglogsink.h b/doomsday/libcore/include/de/core/debuglogsink.h similarity index 100% rename from doomsday/libdeng2/include/de/core/debuglogsink.h rename to doomsday/libcore/include/de/core/debuglogsink.h diff --git a/doomsday/libdeng2/include/de/core/event.h b/doomsday/libcore/include/de/core/event.h similarity index 98% rename from doomsday/libdeng2/include/de/core/event.h rename to doomsday/libcore/include/de/core/event.h index e10abd5e33..b7dad1a9a4 100644 --- a/doomsday/libdeng2/include/de/core/event.h +++ b/doomsday/libcore/include/de/core/event.h @@ -19,7 +19,7 @@ #ifndef LIBDENG2_EVENT_H #define LIBDENG2_EVENT_H -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/core/filelogsink.h b/doomsday/libcore/include/de/core/filelogsink.h similarity index 100% rename from doomsday/libdeng2/include/de/core/filelogsink.h rename to doomsday/libcore/include/de/core/filelogsink.h diff --git a/doomsday/libdeng2/include/de/core/garbage.h b/doomsday/libcore/include/de/core/garbage.h similarity index 99% rename from doomsday/libdeng2/include/de/core/garbage.h rename to doomsday/libcore/include/de/core/garbage.h index b2892a45a0..5ad7094911 100644 --- a/doomsday/libdeng2/include/de/core/garbage.h +++ b/doomsday/libcore/include/de/core/garbage.h @@ -24,7 +24,7 @@ #ifndef LIBDENG2_GARBAGE_COLLECTOR_H #define LIBDENG2_GARBAGE_COLLECTOR_H -#include "../libdeng2.h" +#include "../libcore.h" #ifdef __cplusplus extern "C" { diff --git a/doomsday/libdeng2/include/de/core/highperformancetimer.h b/doomsday/libcore/include/de/core/highperformancetimer.h similarity index 100% rename from doomsday/libdeng2/include/de/core/highperformancetimer.h rename to doomsday/libcore/include/de/core/highperformancetimer.h diff --git a/doomsday/libdeng2/include/de/core/id.h b/doomsday/libcore/include/de/core/id.h similarity index 97% rename from doomsday/libdeng2/include/de/core/id.h rename to doomsday/libcore/include/de/core/id.h index d7379f7030..57dd446222 100644 --- a/doomsday/libdeng2/include/de/core/id.h +++ b/doomsday/libcore/include/de/core/id.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_ID_H #define LIBDENG2_ID_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../ISerializable" #include "../Value" #include "../Log" diff --git a/doomsday/libdeng2/include/de/core/library.h b/doomsday/libcore/include/de/core/library.h similarity index 94% rename from doomsday/libdeng2/include/de/core/library.h rename to doomsday/libcore/include/de/core/library.h index 8633b8f15b..83a41d535e 100644 --- a/doomsday/libdeng2/include/de/core/library.h +++ b/doomsday/libcore/include/de/core/library.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_LIBRARY_H #define LIBDENG2_LIBRARY_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../NativePath" #include @@ -46,7 +46,7 @@ class WorldSystem; * * Library type identifiers; * - library/generic: A shared library with no special function. - * - deng-plugin/generic: Generic libdeng2 plugin. Loaded always. + * - deng-plugin/generic: Generic plugin. Loaded always. * - deng-plugin/game: The game plugin. Only one of these can be loaded. * - deng-plugin/audio: Audio driver. Optional. Loaded on demand by * the audio subsystem. @@ -140,10 +140,10 @@ class DENG2_PUBLIC Library virtual ~Library(); /** - * Returns the type identifier of the library. This affects how - * libdeng2 will treat the library. The type is determined - * automatically when the library is first loaded, and can then be - * queried at any time even after the library has been unloaded. + * Returns the type identifier of the library. This affects how libcore will treat + * the library. The type is determined automatically when the library is first + * loaded, and can then be queried at any time even after the library has been + * unloaded. */ String const &type() const; diff --git a/doomsday/libdeng2/include/de/core/log.h b/doomsday/libcore/include/de/core/log.h similarity index 99% rename from doomsday/libdeng2/include/de/core/log.h rename to doomsday/libcore/include/de/core/log.h index 151ce1c200..d1cd5e8e81 100644 --- a/doomsday/libdeng2/include/de/core/log.h +++ b/doomsday/libcore/include/de/core/log.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/core/logbuffer.h b/doomsday/libcore/include/de/core/logbuffer.h similarity index 99% rename from doomsday/libdeng2/include/de/core/logbuffer.h rename to doomsday/libcore/include/de/core/logbuffer.h index 627d67b1d1..3c0c495b67 100644 --- a/doomsday/libdeng2/include/de/core/logbuffer.h +++ b/doomsday/libcore/include/de/core/logbuffer.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/core/logfilter.h b/doomsday/libcore/include/de/core/logfilter.h similarity index 100% rename from doomsday/libdeng2/include/de/core/logfilter.h rename to doomsday/libcore/include/de/core/logfilter.h diff --git a/doomsday/libdeng2/include/de/core/logsink.h b/doomsday/libcore/include/de/core/logsink.h similarity index 100% rename from doomsday/libdeng2/include/de/core/logsink.h rename to doomsday/libcore/include/de/core/logsink.h diff --git a/doomsday/libdeng2/include/de/core/loop.h b/doomsday/libcore/include/de/core/loop.h similarity index 100% rename from doomsday/libdeng2/include/de/core/loop.h rename to doomsday/libcore/include/de/core/loop.h diff --git a/doomsday/libdeng2/include/de/core/matrix.h b/doomsday/libcore/include/de/core/matrix.h similarity index 99% rename from doomsday/libdeng2/include/de/core/matrix.h rename to doomsday/libcore/include/de/core/matrix.h index 01f2dde81e..c57f2ac082 100644 --- a/doomsday/libdeng2/include/de/core/matrix.h +++ b/doomsday/libcore/include/de/core/matrix.h @@ -19,7 +19,7 @@ #ifndef LIBDENG2_MATRIX_H #define LIBDENG2_MATRIX_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../math.h" #include "../Vector" #include "../Writer" diff --git a/doomsday/libdeng2/include/de/core/memorylogsink.h b/doomsday/libcore/include/de/core/memorylogsink.h similarity index 100% rename from doomsday/libdeng2/include/de/core/memorylogsink.h rename to doomsday/libcore/include/de/core/memorylogsink.h diff --git a/doomsday/libdeng2/include/de/core/monospacelogsinkformatter.h b/doomsday/libcore/include/de/core/monospacelogsinkformatter.h similarity index 100% rename from doomsday/libdeng2/include/de/core/monospacelogsinkformatter.h rename to doomsday/libcore/include/de/core/monospacelogsinkformatter.h diff --git a/doomsday/libdeng2/include/de/core/range.h b/doomsday/libcore/include/de/core/range.h similarity index 99% rename from doomsday/libdeng2/include/de/core/range.h rename to doomsday/libcore/include/de/core/range.h index d6a363677c..7922b081f8 100644 --- a/doomsday/libdeng2/include/de/core/range.h +++ b/doomsday/libcore/include/de/core/range.h @@ -19,7 +19,7 @@ #ifndef LIBDENG2_RANGE_H #define LIBDENG2_RANGE_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../math.h" #include diff --git a/doomsday/libdeng2/include/de/core/rectangle.h b/doomsday/libcore/include/de/core/rectangle.h similarity index 99% rename from doomsday/libdeng2/include/de/core/rectangle.h rename to doomsday/libcore/include/de/core/rectangle.h index 6176550005..d5541e2b39 100644 --- a/doomsday/libdeng2/include/de/core/rectangle.h +++ b/doomsday/libcore/include/de/core/rectangle.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/core/system.h b/doomsday/libcore/include/de/core/system.h similarity index 100% rename from doomsday/libdeng2/include/de/core/system.h rename to doomsday/libcore/include/de/core/system.h diff --git a/doomsday/libdeng2/include/de/core/textapp.h b/doomsday/libcore/include/de/core/textapp.h similarity index 100% rename from doomsday/libdeng2/include/de/core/textapp.h rename to doomsday/libcore/include/de/core/textapp.h diff --git a/doomsday/libdeng2/include/de/core/textstreamlogsink.h b/doomsday/libcore/include/de/core/textstreamlogsink.h similarity index 100% rename from doomsday/libdeng2/include/de/core/textstreamlogsink.h rename to doomsday/libcore/include/de/core/textstreamlogsink.h diff --git a/doomsday/libdeng2/include/de/core/unixinfo.h b/doomsday/libcore/include/de/core/unixinfo.h similarity index 97% rename from doomsday/libdeng2/include/de/core/unixinfo.h rename to doomsday/libcore/include/de/core/unixinfo.h index 183e074760..b44dd71dfb 100644 --- a/doomsday/libdeng2/include/de/core/unixinfo.h +++ b/doomsday/libcore/include/de/core/unixinfo.h @@ -39,7 +39,7 @@ namespace de { * instantiated normally but no input files are parsed. There are equivalent * mechanisms on these platforms (on Windows, the closest is the registry; on * Mac OS X, ~/Library/Preferences/) but these are not directly used by - * libdeng2. Instead of these, one should use Config (or QSettings) for + * Doomsday. Instead of these, one should use Config (or QSettings) for * platform-independent persistent configuration. * * @ingroup core diff --git a/doomsday/libdeng2/include/de/core/vector.h b/doomsday/libcore/include/de/core/vector.h similarity index 100% rename from doomsday/libdeng2/include/de/core/vector.h rename to doomsday/libcore/include/de/core/vector.h diff --git a/doomsday/libdeng2/include/de/core/version.h b/doomsday/libcore/include/de/core/version.h similarity index 92% rename from doomsday/libdeng2/include/de/core/version.h rename to doomsday/libcore/include/de/core/version.h index e5c04b5dd4..e6a3bc6eab 100644 --- a/doomsday/libdeng2/include/de/core/version.h +++ b/doomsday/libcore/include/de/core/version.h @@ -1,6 +1,6 @@ /** * @file version.h - * Version numbering and labeling for libdeng2. + * Version numbering and labeling for libcore. * * @authors Copyright © 2011-2013 Jaakko Keränen * @authors Copyright © 2011-2013 Daniel Swanson @@ -30,11 +30,11 @@ namespace de { /** - * Version information about libdeng2. The version numbers are defined in libdeng2.pro. + * Version information about libcore. The version numbers are defined in libcore.pro. * - * @note For the time being, this is separate from the project version number. libdeng2 + * @note For the time being, this is separate from the project version number. libcore * versioning starts from 2.0.0. When the project as a whole switches to major version 2, - * libdeng2 version will be synced with the rest of the project. Also note that unlike in + * libcore version will be synced with the rest of the project. Also note that unlike in * the past, there is only ever three components in the version (or four, counting the * build number). * diff --git a/doomsday/libdeng2/include/de/data/accessorvalue.h b/doomsday/libcore/include/de/data/accessorvalue.h similarity index 97% rename from doomsday/libdeng2/include/de/data/accessorvalue.h rename to doomsday/libcore/include/de/data/accessorvalue.h index d14e7097fa..89cfabc32b 100644 --- a/doomsday/libdeng2/include/de/data/accessorvalue.h +++ b/doomsday/libcore/include/de/data/accessorvalue.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/archive.h b/doomsday/libcore/include/de/data/archive.h similarity index 99% rename from doomsday/libdeng2/include/de/data/archive.h rename to doomsday/libcore/include/de/data/archive.h index 72e932214a..2a5f124798 100644 --- a/doomsday/libdeng2/include/de/data/archive.h +++ b/doomsday/libcore/include/de/data/archive.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_ARCHIVE_H #define LIBDENG2_ARCHIVE_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../IByteArray" #include "../IWritable" #include "../String" diff --git a/doomsday/libdeng2/include/de/data/arrayvalue.h b/doomsday/libcore/include/de/data/arrayvalue.h similarity index 99% rename from doomsday/libdeng2/include/de/data/arrayvalue.h rename to doomsday/libcore/include/de/data/arrayvalue.h index f88af229a8..e6c1562ed9 100644 --- a/doomsday/libdeng2/include/de/data/arrayvalue.h +++ b/doomsday/libcore/include/de/data/arrayvalue.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/bank.h b/doomsday/libcore/include/de/data/bank.h similarity index 99% rename from doomsday/libdeng2/include/de/data/bank.h rename to doomsday/libcore/include/de/data/bank.h index ff0b3f7bf1..3f0cce5eb5 100644 --- a/doomsday/libdeng2/include/de/data/bank.h +++ b/doomsday/libcore/include/de/data/bank.h @@ -22,7 +22,7 @@ #include #include -#include "../libdeng2.h" +#include "../libcore.h" #include "../DotPath" #include "../PathTree" #include "../ISerializable" diff --git a/doomsday/libdeng2/include/de/data/binarytree.h b/doomsday/libcore/include/de/data/binarytree.h similarity index 99% rename from doomsday/libdeng2/include/de/data/binarytree.h rename to doomsday/libcore/include/de/data/binarytree.h index 01d18daa25..e54d9aa7ab 100644 --- a/doomsday/libdeng2/include/de/data/binarytree.h +++ b/doomsday/libcore/include/de/data/binarytree.h @@ -20,7 +20,7 @@ #ifndef LIBDENG2_BINARYTREE_H #define LIBDENG2_BINARYTREE_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../error.h" #include diff --git a/doomsday/libdeng2/include/de/data/bitfield.h b/doomsday/libcore/include/de/data/bitfield.h similarity index 100% rename from doomsday/libdeng2/include/de/data/bitfield.h rename to doomsday/libcore/include/de/data/bitfield.h diff --git a/doomsday/libdeng2/include/de/data/block.h b/doomsday/libcore/include/de/data/block.h similarity index 98% rename from doomsday/libdeng2/include/de/data/block.h rename to doomsday/libcore/include/de/data/block.h index 7643c94d82..5488506c5c 100644 --- a/doomsday/libdeng2/include/de/data/block.h +++ b/doomsday/libcore/include/de/data/block.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/blockvalue.h b/doomsday/libcore/include/de/data/blockvalue.h similarity index 97% rename from doomsday/libdeng2/include/de/data/blockvalue.h rename to doomsday/libcore/include/de/data/blockvalue.h index 108366acae..71f60f6e97 100644 --- a/doomsday/libdeng2/include/de/data/blockvalue.h +++ b/doomsday/libcore/include/de/data/blockvalue.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/byteorder.h b/doomsday/libcore/include/de/data/byteorder.h similarity index 98% rename from doomsday/libdeng2/include/de/data/byteorder.h rename to doomsday/libcore/include/de/data/byteorder.h index b517243fd7..d70ec3b18e 100644 --- a/doomsday/libdeng2/include/de/data/byteorder.h +++ b/doomsday/libcore/include/de/data/byteorder.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_BYTEORDER_H #define LIBDENG2_BYTEORDER_H -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/data/byterefarray.h b/doomsday/libcore/include/de/data/byterefarray.h similarity index 98% rename from doomsday/libdeng2/include/de/data/byterefarray.h rename to doomsday/libcore/include/de/data/byterefarray.h index 2ee626255a..f5f7593cd4 100644 --- a/doomsday/libdeng2/include/de/data/byterefarray.h +++ b/doomsday/libcore/include/de/data/byterefarray.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2010-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/bytesubarray.h b/doomsday/libcore/include/de/data/bytesubarray.h similarity index 97% rename from doomsday/libdeng2/include/de/data/bytesubarray.h rename to doomsday/libcore/include/de/data/bytesubarray.h index 8782d8fa89..3fd2e409fd 100644 --- a/doomsday/libdeng2/include/de/data/bytesubarray.h +++ b/doomsday/libcore/include/de/data/bytesubarray.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/counted.h b/doomsday/libcore/include/de/data/counted.h similarity index 99% rename from doomsday/libdeng2/include/de/data/counted.h rename to doomsday/libcore/include/de/data/counted.h index e31ad6f520..cb4c51063a 100644 --- a/doomsday/libdeng2/include/de/data/counted.h +++ b/doomsday/libcore/include/de/data/counted.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_COUNTED_H #define LIBDENG2_COUNTED_H -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/data/date.h b/doomsday/libcore/include/de/data/date.h similarity index 98% rename from doomsday/libdeng2/include/de/data/date.h rename to doomsday/libcore/include/de/data/date.h index a72e59cba6..0958fef5f6 100644 --- a/doomsday/libdeng2/include/de/data/date.h +++ b/doomsday/libcore/include/de/data/date.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/dictionaryvalue.h b/doomsday/libcore/include/de/data/dictionaryvalue.h similarity index 98% rename from doomsday/libdeng2/include/de/data/dictionaryvalue.h rename to doomsday/libcore/include/de/data/dictionaryvalue.h index 3e906496fd..90eafd0b86 100644 --- a/doomsday/libdeng2/include/de/data/dictionaryvalue.h +++ b/doomsday/libcore/include/de/data/dictionaryvalue.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/escapeparser.h b/doomsday/libcore/include/de/data/escapeparser.h similarity index 98% rename from doomsday/libdeng2/include/de/data/escapeparser.h rename to doomsday/libcore/include/de/data/escapeparser.h index f606bba1c6..d72cc23721 100644 --- a/doomsday/libdeng2/include/de/data/escapeparser.h +++ b/doomsday/libcore/include/de/data/escapeparser.h @@ -19,7 +19,7 @@ #ifndef LIBDENG2_ESCAPEPARSER_H #define LIBDENG2_ESCAPEPARSER_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../String" #include "../Observers" diff --git a/doomsday/libdeng2/include/de/data/fifo.h b/doomsday/libcore/include/de/data/fifo.h similarity index 98% rename from doomsday/libdeng2/include/de/data/fifo.h rename to doomsday/libcore/include/de/data/fifo.h index 362137782f..77d6830154 100644 --- a/doomsday/libdeng2/include/de/data/fifo.h +++ b/doomsday/libcore/include/de/data/fifo.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/fixedbytearray.h b/doomsday/libcore/include/de/data/fixedbytearray.h similarity index 98% rename from doomsday/libdeng2/include/de/data/fixedbytearray.h rename to doomsday/libcore/include/de/data/fixedbytearray.h index f4ed731d2c..59abd4774f 100644 --- a/doomsday/libdeng2/include/de/data/fixedbytearray.h +++ b/doomsday/libcore/include/de/data/fixedbytearray.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/huffman.h b/doomsday/libcore/include/de/data/huffman.h similarity index 98% rename from doomsday/libdeng2/include/de/data/huffman.h rename to doomsday/libcore/include/de/data/huffman.h index 036cf0e1e7..f73a791d38 100644 --- a/doomsday/libdeng2/include/de/data/huffman.h +++ b/doomsday/libcore/include/de/data/huffman.h @@ -24,7 +24,7 @@ #ifndef LIBDENG2_HUFFMAN_H #define LIBDENG2_HUFFMAN_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Block" namespace de { diff --git a/doomsday/libdeng2/include/de/data/iblock.h b/doomsday/libcore/include/de/data/iblock.h similarity index 97% rename from doomsday/libdeng2/include/de/data/iblock.h rename to doomsday/libcore/include/de/data/iblock.h index 4d17eba690..f73ec4d0dc 100644 --- a/doomsday/libdeng2/include/de/data/iblock.h +++ b/doomsday/libcore/include/de/data/iblock.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/ibytearray.h b/doomsday/libcore/include/de/data/ibytearray.h similarity index 97% rename from doomsday/libdeng2/include/de/data/ibytearray.h rename to doomsday/libcore/include/de/data/ibytearray.h index 58d547b097..0242e94b1a 100644 --- a/doomsday/libdeng2/include/de/data/ibytearray.h +++ b/doomsday/libcore/include/de/data/ibytearray.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_IBYTEARRAY_H #define LIBDENG2_IBYTEARRAY_H -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/data/iiostream.h b/doomsday/libcore/include/de/data/iiostream.h similarity index 100% rename from doomsday/libdeng2/include/de/data/iiostream.h rename to doomsday/libcore/include/de/data/iiostream.h diff --git a/doomsday/libdeng2/include/de/data/iistream.h b/doomsday/libcore/include/de/data/iistream.h similarity index 100% rename from doomsday/libdeng2/include/de/data/iistream.h rename to doomsday/libcore/include/de/data/iistream.h diff --git a/doomsday/libdeng2/include/de/data/info.h b/doomsday/libcore/include/de/data/info.h similarity index 99% rename from doomsday/libdeng2/include/de/data/info.h rename to doomsday/libcore/include/de/data/info.h index e06924b653..dc62c07807 100644 --- a/doomsday/libdeng2/include/de/data/info.h +++ b/doomsday/libcore/include/de/data/info.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2012-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/infobank.h b/doomsday/libcore/include/de/data/infobank.h similarity index 100% rename from doomsday/libdeng2/include/de/data/infobank.h rename to doomsday/libcore/include/de/data/infobank.h diff --git a/doomsday/libdeng2/include/de/data/iostream.h b/doomsday/libcore/include/de/data/iostream.h similarity index 100% rename from doomsday/libdeng2/include/de/data/iostream.h rename to doomsday/libcore/include/de/data/iostream.h diff --git a/doomsday/libdeng2/include/de/data/ireadable.h b/doomsday/libcore/include/de/data/ireadable.h similarity index 95% rename from doomsday/libdeng2/include/de/data/ireadable.h rename to doomsday/libcore/include/de/data/ireadable.h index 36ca8eadf9..165e1ac8e4 100644 --- a/doomsday/libdeng2/include/de/data/ireadable.h +++ b/doomsday/libcore/include/de/data/ireadable.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_IREADABLE_H #define LIBDENG2_IREADABLE_H -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/data/iserializable.h b/doomsday/libcore/include/de/data/iserializable.h similarity index 95% rename from doomsday/libdeng2/include/de/data/iserializable.h rename to doomsday/libcore/include/de/data/iserializable.h index 41c7ffb5b8..a5110e13cc 100644 --- a/doomsday/libdeng2/include/de/data/iserializable.h +++ b/doomsday/libcore/include/de/data/iserializable.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_ISERIALIZABLE_H #define LIBDENG2_ISERIALIZABLE_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../IWritable" #include "../IReadable" diff --git a/doomsday/libdeng2/include/de/data/iwritable.h b/doomsday/libcore/include/de/data/iwritable.h similarity index 95% rename from doomsday/libdeng2/include/de/data/iwritable.h rename to doomsday/libcore/include/de/data/iwritable.h index 04832cd020..499f42f440 100644 --- a/doomsday/libdeng2/include/de/data/iwritable.h +++ b/doomsday/libcore/include/de/data/iwritable.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_IWRITABLE_H #define LIBDENG2_IWRITABLE_H -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/data/json.h b/doomsday/libcore/include/de/data/json.h similarity index 100% rename from doomsday/libdeng2/include/de/data/json.h rename to doomsday/libcore/include/de/data/json.h diff --git a/doomsday/libdeng2/include/de/data/nonevalue.h b/doomsday/libcore/include/de/data/nonevalue.h similarity index 96% rename from doomsday/libdeng2/include/de/data/nonevalue.h rename to doomsday/libcore/include/de/data/nonevalue.h index 5279ed6f6a..69dacb6314 100644 --- a/doomsday/libdeng2/include/de/data/nonevalue.h +++ b/doomsday/libcore/include/de/data/nonevalue.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/numbervalue.h b/doomsday/libcore/include/de/data/numbervalue.h similarity index 98% rename from doomsday/libdeng2/include/de/data/numbervalue.h rename to doomsday/libcore/include/de/data/numbervalue.h index c9c26d87dd..9e25e49f0e 100644 --- a/doomsday/libdeng2/include/de/data/numbervalue.h +++ b/doomsday/libcore/include/de/data/numbervalue.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/observers.h b/doomsday/libcore/include/de/data/observers.h similarity index 99% rename from doomsday/libdeng2/include/de/data/observers.h rename to doomsday/libcore/include/de/data/observers.h index a0a6bd294c..a2e1efe1a1 100644 --- a/doomsday/libdeng2/include/de/data/observers.h +++ b/doomsday/libcore/include/de/data/observers.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_OBSERVERS_H #define LIBDENG2_OBSERVERS_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Lockable" #include "../Guard" diff --git a/doomsday/libdeng2/include/de/data/path.h b/doomsday/libcore/include/de/data/path.h similarity index 99% rename from doomsday/libdeng2/include/de/data/path.h rename to doomsday/libcore/include/de/data/path.h index 5bb7ef442c..57bcf44cfb 100644 --- a/doomsday/libdeng2/include/de/data/path.h +++ b/doomsday/libcore/include/de/data/path.h @@ -22,7 +22,7 @@ #include // std::swap -#include "../libdeng2.h" +#include "../libcore.h" #include "../Error" #include "../Log" #include "../ISerializable" diff --git a/doomsday/libdeng2/include/de/data/pathtree.h b/doomsday/libcore/include/de/data/pathtree.h similarity index 100% rename from doomsday/libdeng2/include/de/data/pathtree.h rename to doomsday/libcore/include/de/data/pathtree.h diff --git a/doomsday/libdeng2/include/de/data/property.h b/doomsday/libcore/include/de/data/property.h similarity index 97% rename from doomsday/libdeng2/include/de/data/property.h rename to doomsday/libcore/include/de/data/property.h index 7204d4ab55..4f05fb12cf 100644 --- a/doomsday/libdeng2/include/de/data/property.h +++ b/doomsday/libcore/include/de/data/property.h @@ -26,7 +26,7 @@ namespace de { /** * Base class for properties. * - * libdeng2 properties are a utility for conveniently defining observable objects that + * libcore properties are a utility for conveniently defining observable objects that * automatically send out a notification when their value changes. * * @ingroup data diff --git a/doomsday/libdeng2/include/de/data/reader.h b/doomsday/libcore/include/de/data/reader.h similarity index 98% rename from doomsday/libdeng2/include/de/data/reader.h rename to doomsday/libcore/include/de/data/reader.h index 4f3f50b485..a710d62cd2 100644 --- a/doomsday/libdeng2/include/de/data/reader.h +++ b/doomsday/libcore/include/de/data/reader.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_READER_HH #define LIBDENG2_READER_HH -#include "../libdeng2.h" +#include "../libcore.h" #include "../IByteArray" #include "../ByteOrder" @@ -52,7 +52,7 @@ class IIStream; * 3. Reader knows the serialization version number, * 4. Reader knows the byte order, which can be verified using appropriate * means (assertion/exception), and - * 5. Reader is the standard way to read all data in libdeng2. + * 5. Reader is the standard way to read all data in libcore. * * @ingroup data */ diff --git a/doomsday/libdeng2/include/de/data/record.h b/doomsday/libcore/include/de/data/record.h similarity index 99% rename from doomsday/libdeng2/include/de/data/record.h rename to doomsday/libcore/include/de/data/record.h index 20a430182f..4743ee5f3d 100644 --- a/doomsday/libdeng2/include/de/data/record.h +++ b/doomsday/libcore/include/de/data/record.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/recordvalue.h b/doomsday/libcore/include/de/data/recordvalue.h similarity index 98% rename from doomsday/libdeng2/include/de/data/recordvalue.h rename to doomsday/libcore/include/de/data/recordvalue.h index f593ac6eba..41ff9f2fee 100644 --- a/doomsday/libdeng2/include/de/data/recordvalue.h +++ b/doomsday/libcore/include/de/data/recordvalue.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/refuge.h b/doomsday/libcore/include/de/data/refuge.h similarity index 100% rename from doomsday/libdeng2/include/de/data/refuge.h rename to doomsday/libcore/include/de/data/refuge.h diff --git a/doomsday/libdeng2/include/de/data/refvalue.h b/doomsday/libcore/include/de/data/refvalue.h similarity index 98% rename from doomsday/libdeng2/include/de/data/refvalue.h rename to doomsday/libcore/include/de/data/refvalue.h index cfd9798de1..1654dfce1b 100644 --- a/doomsday/libdeng2/include/de/data/refvalue.h +++ b/doomsday/libcore/include/de/data/refvalue.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/shared.h b/doomsday/libcore/include/de/data/shared.h similarity index 100% rename from doomsday/libdeng2/include/de/data/shared.h rename to doomsday/libcore/include/de/data/shared.h diff --git a/doomsday/libdeng2/include/de/data/string.h b/doomsday/libcore/include/de/data/string.h similarity index 99% rename from doomsday/libdeng2/include/de/data/string.h rename to doomsday/libcore/include/de/data/string.h index 5cab38abfa..029ee69d56 100644 --- a/doomsday/libdeng2/include/de/data/string.h +++ b/doomsday/libcore/include/de/data/string.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -23,7 +23,7 @@ #include #include -#include "../libdeng2.h" +#include "../libcore.h" #include "../Block" #include "../Range" diff --git a/doomsday/libdeng2/include/de/data/stringpool.h b/doomsday/libcore/include/de/data/stringpool.h similarity index 99% rename from doomsday/libdeng2/include/de/data/stringpool.h rename to doomsday/libcore/include/de/data/stringpool.h index 5afc2d8356..f3497f9403 100644 --- a/doomsday/libdeng2/include/de/data/stringpool.h +++ b/doomsday/libcore/include/de/data/stringpool.h @@ -22,7 +22,7 @@ #ifndef LIBDENG2_STRINGPOOL_H #define LIBDENG2_STRINGPOOL_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../ISerializable" #include "../String" diff --git a/doomsday/libdeng2/include/de/data/textvalue.h b/doomsday/libcore/include/de/data/textvalue.h similarity index 97% rename from doomsday/libdeng2/include/de/data/textvalue.h rename to doomsday/libcore/include/de/data/textvalue.h index 320d9ae77d..204e43b816 100644 --- a/doomsday/libdeng2/include/de/data/textvalue.h +++ b/doomsday/libcore/include/de/data/textvalue.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/time.h b/doomsday/libcore/include/de/data/time.h similarity index 99% rename from doomsday/libdeng2/include/de/data/time.h rename to doomsday/libcore/include/de/data/time.h index 154e1d5746..9216ffabb0 100644 --- a/doomsday/libdeng2/include/de/data/time.h +++ b/doomsday/libcore/include/de/data/time.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_TIME_H #define LIBDENG2_TIME_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../math.h" #include "../ISerializable" diff --git a/doomsday/libdeng2/include/de/data/timevalue.h b/doomsday/libcore/include/de/data/timevalue.h similarity index 100% rename from doomsday/libdeng2/include/de/data/timevalue.h rename to doomsday/libcore/include/de/data/timevalue.h diff --git a/doomsday/libdeng2/include/de/data/value.h b/doomsday/libcore/include/de/data/value.h similarity index 99% rename from doomsday/libdeng2/include/de/data/value.h rename to doomsday/libcore/include/de/data/value.h index b097d8c851..ca7373e8c7 100644 --- a/doomsday/libdeng2/include/de/data/value.h +++ b/doomsday/libcore/include/de/data/value.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_VALUE_H #define LIBDENG2_VALUE_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../ISerializable" #include "../String" diff --git a/doomsday/libdeng2/include/de/data/variable.h b/doomsday/libcore/include/de/data/variable.h similarity index 99% rename from doomsday/libdeng2/include/de/data/variable.h rename to doomsday/libcore/include/de/data/variable.h index 7a6b8d01a7..a89b8052a8 100644 --- a/doomsday/libdeng2/include/de/data/variable.h +++ b/doomsday/libcore/include/de/data/variable.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/waitablefifo.h b/doomsday/libcore/include/de/data/waitablefifo.h similarity index 97% rename from doomsday/libdeng2/include/de/data/waitablefifo.h rename to doomsday/libcore/include/de/data/waitablefifo.h index c61fc1dcf7..9c89c4382c 100644 --- a/doomsday/libdeng2/include/de/data/waitablefifo.h +++ b/doomsday/libcore/include/de/data/waitablefifo.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/data/writer.h b/doomsday/libcore/include/de/data/writer.h similarity index 99% rename from doomsday/libdeng2/include/de/data/writer.h rename to doomsday/libcore/include/de/data/writer.h index a108dd60c9..09f9646374 100644 --- a/doomsday/libdeng2/include/de/data/writer.h +++ b/doomsday/libcore/include/de/data/writer.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_WRITER_H #define LIBDENG2_WRITER_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../IByteArray" #include "../ByteOrder" diff --git a/doomsday/libdeng2/include/de/data/zeroed.h b/doomsday/libcore/include/de/data/zeroed.h similarity index 96% rename from doomsday/libdeng2/include/de/data/zeroed.h rename to doomsday/libcore/include/de/data/zeroed.h index 0bcb5e870b..0ba2953a96 100644 --- a/doomsday/libdeng2/include/de/data/zeroed.h +++ b/doomsday/libcore/include/de/data/zeroed.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_ZEROED_H #define LIBDENG2_ZEROED_H -#include "../libdeng2.h" +#include "../libcore.h" namespace de { diff --git a/doomsday/libdeng2/include/de/data/ziparchive.h b/doomsday/libcore/include/de/data/ziparchive.h similarity index 98% rename from doomsday/libdeng2/include/de/data/ziparchive.h rename to doomsday/libcore/include/de/data/ziparchive.h index 8afc98e132..44e0b444c0 100644 --- a/doomsday/libdeng2/include/de/data/ziparchive.h +++ b/doomsday/libcore/include/de/data/ziparchive.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/error.h b/doomsday/libcore/include/de/error.h similarity index 91% rename from doomsday/libdeng2/include/de/error.h rename to doomsday/libcore/include/de/error.h index a7ccd5f791..f202bcfbce 100644 --- a/doomsday/libdeng2/include/de/error.h +++ b/doomsday/libcore/include/de/error.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_ERROR_H #define LIBDENG2_ERROR_H -#include "libdeng2.h" +#include "libcore.h" #include #include @@ -29,13 +29,13 @@ /** * @defgroup errors Exceptions * - * These are exceptions thrown by libdeng2 when a fatal error occurs. + * These are exceptions thrown by libcore when a fatal error occurs. */ namespace de { /** - * Base class for error exceptions thrown by libdeng2. @ingroup errors + * Base class for error exceptions thrown by libcore. @ingroup errors */ class DENG2_PUBLIC Error : public std::runtime_error { diff --git a/doomsday/libdeng2/include/de/filesys/archiveentryfile.h b/doomsday/libcore/include/de/filesys/archiveentryfile.h similarity index 98% rename from doomsday/libdeng2/include/de/filesys/archiveentryfile.h rename to doomsday/libcore/include/de/filesys/archiveentryfile.h index 8dc908f2eb..f52debde2d 100644 --- a/doomsday/libdeng2/include/de/filesys/archiveentryfile.h +++ b/doomsday/libcore/include/de/filesys/archiveentryfile.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/filesys/archivefeed.h b/doomsday/libcore/include/de/filesys/archivefeed.h similarity index 100% rename from doomsday/libdeng2/include/de/filesys/archivefeed.h rename to doomsday/libcore/include/de/filesys/archivefeed.h diff --git a/doomsday/libdeng2/include/de/filesys/bytearrayfile.h b/doomsday/libcore/include/de/filesys/bytearrayfile.h similarity index 96% rename from doomsday/libdeng2/include/de/filesys/bytearrayfile.h rename to doomsday/libcore/include/de/filesys/bytearrayfile.h index 104ac3a691..17be385411 100644 --- a/doomsday/libdeng2/include/de/filesys/bytearrayfile.h +++ b/doomsday/libcore/include/de/filesys/bytearrayfile.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2012-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_BYTEARRAYFILE_H #define LIBDENG2_BYTEARRAYFILE_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../File" #include "../IByteArray" diff --git a/doomsday/libdeng2/include/de/filesys/directoryfeed.h b/doomsday/libcore/include/de/filesys/directoryfeed.h similarity index 100% rename from doomsday/libdeng2/include/de/filesys/directoryfeed.h rename to doomsday/libcore/include/de/filesys/directoryfeed.h diff --git a/doomsday/libdeng2/include/de/filesys/feed.h b/doomsday/libcore/include/de/filesys/feed.h similarity index 98% rename from doomsday/libdeng2/include/de/filesys/feed.h rename to doomsday/libcore/include/de/filesys/feed.h index a15f412b97..c2e70d331d 100644 --- a/doomsday/libdeng2/include/de/filesys/feed.h +++ b/doomsday/libcore/include/de/filesys/feed.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_FEED_H #define LIBDENG2_FEED_H -#include "../libdeng2.h" +#include "../libcore.h" #include diff --git a/doomsday/libdeng2/include/de/filesys/file.h b/doomsday/libcore/include/de/filesys/file.h similarity index 99% rename from doomsday/libdeng2/include/de/filesys/file.h rename to doomsday/libcore/include/de/filesys/file.h index e773a4a117..47e22b9250 100644 --- a/doomsday/libdeng2/include/de/filesys/file.h +++ b/doomsday/libcore/include/de/filesys/file.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/filesys/filesystem.h b/doomsday/libcore/include/de/filesys/filesystem.h similarity index 98% rename from doomsday/libdeng2/include/de/filesys/filesystem.h rename to doomsday/libcore/include/de/filesys/filesystem.h index 80a31847d5..452c88ab5a 100644 --- a/doomsday/libdeng2/include/de/filesys/filesystem.h +++ b/doomsday/libcore/include/de/filesys/filesystem.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_FILESYSTEM_H #define LIBDENG2_FILESYSTEM_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Folder" #include "../System" @@ -31,7 +31,7 @@ * @defgroup fs File System * * The file system (de::FileSystem) governs a tree of files and folders, and - * provides the means to access all data in libdeng2. It follows the metaphor + * provides the means to access all data in libcore. It follows the metaphor * of a UNIX file system, where not all files are "regular" files, but instead * may represent non-file objects that still support serialization into byte * arrays or have a byte-stream input/output interface. This way it provides a @@ -48,7 +48,7 @@ * drive, one must call de::FileSystem::refresh() for the changes to be reflected * in the de::FileSystem index and tree. * - * ZIP (PK3) archives are visible in the libdeng2 file system as Folder and + * ZIP (PK3) archives are visible in the libcore file system as Folder and * File instances just like regular native files are. This allows one to deploy * a large collection of resources as an archive and treat it at runtime just * like a tree of native files. Files within archives can be read and written diff --git a/doomsday/libdeng2/include/de/filesys/folder.h b/doomsday/libcore/include/de/filesys/folder.h similarity index 99% rename from doomsday/libdeng2/include/de/filesys/folder.h rename to doomsday/libcore/include/de/filesys/folder.h index 376dda5fb6..a90360b4c8 100644 --- a/doomsday/libdeng2/include/de/filesys/folder.h +++ b/doomsday/libcore/include/de/filesys/folder.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_FOLDER_H #define LIBDENG2_FOLDER_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../File" #include diff --git a/doomsday/libdeng2/include/de/filesys/libraryfile.h b/doomsday/libcore/include/de/filesys/libraryfile.h similarity index 98% rename from doomsday/libdeng2/include/de/filesys/libraryfile.h rename to doomsday/libcore/include/de/filesys/libraryfile.h index 794e3805a1..9478602ee5 100644 --- a/doomsday/libdeng2/include/de/filesys/libraryfile.h +++ b/doomsday/libcore/include/de/filesys/libraryfile.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/filesys/nativefile.h b/doomsday/libcore/include/de/filesys/nativefile.h similarity index 97% rename from doomsday/libdeng2/include/de/filesys/nativefile.h rename to doomsday/libcore/include/de/filesys/nativefile.h index 8f41b916dd..571d777788 100644 --- a/doomsday/libdeng2/include/de/filesys/nativefile.h +++ b/doomsday/libcore/include/de/filesys/nativefile.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_NATIVEFILE_H #define LIBDENG2_NATIVEFILE_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../ByteArrayFile" #include "../NativePath" diff --git a/doomsday/libdeng2/include/de/filesys/nativepath.h b/doomsday/libcore/include/de/filesys/nativepath.h similarity index 100% rename from doomsday/libdeng2/include/de/filesys/nativepath.h rename to doomsday/libcore/include/de/filesys/nativepath.h diff --git a/doomsday/libdeng2/include/de/filesys/packagefolder.h b/doomsday/libcore/include/de/filesys/packagefolder.h similarity index 100% rename from doomsday/libdeng2/include/de/filesys/packagefolder.h rename to doomsday/libcore/include/de/filesys/packagefolder.h diff --git a/doomsday/libdeng2/include/de/game/Game b/doomsday/libcore/include/de/game/Game similarity index 100% rename from doomsday/libdeng2/include/de/game/Game rename to doomsday/libcore/include/de/game/Game diff --git a/doomsday/libdeng2/include/de/game/SavedSession b/doomsday/libcore/include/de/game/SavedSession similarity index 100% rename from doomsday/libdeng2/include/de/game/SavedSession rename to doomsday/libcore/include/de/game/SavedSession diff --git a/doomsday/libdeng2/include/de/game/Session b/doomsday/libcore/include/de/game/Session similarity index 100% rename from doomsday/libdeng2/include/de/game/Session rename to doomsday/libcore/include/de/game/Session diff --git a/doomsday/libdeng2/include/de/game/game.h b/doomsday/libcore/include/de/game/game.h similarity index 100% rename from doomsday/libdeng2/include/de/game/game.h rename to doomsday/libcore/include/de/game/game.h diff --git a/doomsday/libdeng2/include/de/game/savedsession.h b/doomsday/libcore/include/de/game/savedsession.h similarity index 100% rename from doomsday/libdeng2/include/de/game/savedsession.h rename to doomsday/libcore/include/de/game/savedsession.h diff --git a/doomsday/libdeng2/include/de/game/session.h b/doomsday/libcore/include/de/game/session.h similarity index 100% rename from doomsday/libdeng2/include/de/game/session.h rename to doomsday/libcore/include/de/game/session.h diff --git a/doomsday/libdeng2/include/de/libdeng2.h b/doomsday/libcore/include/de/libcore.h similarity index 98% rename from doomsday/libdeng2/include/de/libdeng2.h rename to doomsday/libcore/include/de/libcore.h index f17fea7eac..55185186f9 100644 --- a/doomsday/libdeng2/include/de/libdeng2.h +++ b/doomsday/libcore/include/de/libcore.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2011-2013 Jaakko Keränen * @@ -17,11 +17,11 @@ * http://www.gnu.org/licenses */ -#ifndef LIBDENG2_H -#define LIBDENG2_H +#ifndef LIBCORE_H +#define LIBCORE_H /** - * @file libdeng2.h Common definitions for libdeng2. + * @file libcore.h Common definitions for Doomsday 2. */ /** @@ -48,7 +48,7 @@ */ /** - * @mainpage libdeng2 API + * @mainpage Doomsday SDK * * This documentation covers all the functions and data that Doomsday 2 makes * available for games and other plugins. @@ -125,7 +125,7 @@ /* * The DENG2_PUBLIC macro is used for declaring exported symbols. It must be * applied in all exported classes and functions. DEF files are not used for - * exporting symbols out of libdeng2. + * exporting symbols out of libcore. */ #if defined(_WIN32) && defined(_MSC_VER) # ifdef __DENG2__ @@ -546,4 +546,4 @@ typedef unsigned int dsize; // 32-bit size #endif // !__cplusplus -#endif // LIBDENG2_H +#endif // LIBCORE_H diff --git a/doomsday/libdeng2/include/de/math.h b/doomsday/libcore/include/de/math.h similarity index 98% rename from doomsday/libdeng2/include/de/math.h rename to doomsday/libcore/include/de/math.h index 5c251e7496..a7bd8c1174 100644 --- a/doomsday/libdeng2/include/de/math.h +++ b/doomsday/libcore/include/de/math.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_MATH_H #define LIBDENG2_MATH_H -#include +#include #include #ifdef min diff --git a/doomsday/libdeng2/include/de/net/address.h b/doomsday/libcore/include/de/net/address.h similarity index 97% rename from doomsday/libdeng2/include/de/net/address.h rename to doomsday/libcore/include/de/net/address.h index fc0ce171ef..7f445c5708 100644 --- a/doomsday/libdeng2/include/de/net/address.h +++ b/doomsday/libcore/include/de/net/address.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_ADDRESS_H #define LIBDENG2_ADDRESS_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Log" #include diff --git a/doomsday/libdeng2/include/de/net/beacon.h b/doomsday/libcore/include/de/net/beacon.h similarity index 100% rename from doomsday/libdeng2/include/de/net/beacon.h rename to doomsday/libcore/include/de/net/beacon.h diff --git a/doomsday/libdeng2/include/de/net/blockpacket.h b/doomsday/libcore/include/de/net/blockpacket.h similarity index 100% rename from doomsday/libdeng2/include/de/net/blockpacket.h rename to doomsday/libcore/include/de/net/blockpacket.h diff --git a/doomsday/libdeng2/include/de/net/identifiedpacket.h b/doomsday/libcore/include/de/net/identifiedpacket.h similarity index 98% rename from doomsday/libdeng2/include/de/net/identifiedpacket.h rename to doomsday/libcore/include/de/net/identifiedpacket.h index eea592e765..626d4cddec 100644 --- a/doomsday/libdeng2/include/de/net/identifiedpacket.h +++ b/doomsday/libcore/include/de/net/identifiedpacket.h @@ -20,7 +20,7 @@ #ifndef LIBDENG2_IDENTIFIEDPACKET_H #define LIBDENG2_IDENTIFIEDPACKET_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Packet" namespace de { diff --git a/doomsday/libdeng2/include/de/net/listensocket.h b/doomsday/libcore/include/de/net/listensocket.h similarity index 96% rename from doomsday/libdeng2/include/de/net/listensocket.h rename to doomsday/libcore/include/de/net/listensocket.h index cfbfd8ab30..38687404f6 100644 --- a/doomsday/libdeng2/include/de/net/listensocket.h +++ b/doomsday/libcore/include/de/net/listensocket.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_LISTENSOCKET_H #define LIBDENG2_LISTENSOCKET_H -#include "../libdeng2.h" +#include "../libcore.h" #include #include diff --git a/doomsday/libdeng2/include/de/net/message.h b/doomsday/libcore/include/de/net/message.h similarity index 97% rename from doomsday/libdeng2/include/de/net/message.h rename to doomsday/libcore/include/de/net/message.h index 28a35cd565..c593801b5e 100644 --- a/doomsday/libdeng2/include/de/net/message.h +++ b/doomsday/libcore/include/de/net/message.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/net/packet.h b/doomsday/libcore/include/de/net/packet.h similarity index 94% rename from doomsday/libdeng2/include/de/net/packet.h rename to doomsday/libcore/include/de/net/packet.h index 07bc25f1f3..0faf1e9f25 100644 --- a/doomsday/libdeng2/include/de/net/packet.h +++ b/doomsday/libcore/include/de/net/packet.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -30,7 +30,7 @@ namespace de { class String; /** - * Base class for all network packets in the libdeng2 network communications + * Base class for all network packets in the libcore network communications * protocol. All packets are based on this class. * * @ingroup protocol @@ -76,7 +76,7 @@ class DENG2_PUBLIC Packet : public ISerializable /** * Execute whatever action the packet defines. This is called for all * packets once received and interpreted by the protocol. A packet defined - * outside libdeng2 may use this to add functionality to the packet. + * outside libcore may use this to add functionality to the packet. */ virtual void execute() const; diff --git a/doomsday/libdeng2/include/de/net/protocol.h b/doomsday/libcore/include/de/net/protocol.h similarity index 98% rename from doomsday/libdeng2/include/de/net/protocol.h rename to doomsday/libcore/include/de/net/protocol.h index e03a3e5ed7..61df9aefab 100644 --- a/doomsday/libdeng2/include/de/net/protocol.h +++ b/doomsday/libcore/include/de/net/protocol.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_PROTOCOL_H #define LIBDENG2_PROTOCOL_H -#include "../libdeng2.h" +#include "../libcore.h" #include #include diff --git a/doomsday/libdeng2/include/de/net/recordpacket.h b/doomsday/libcore/include/de/net/recordpacket.h similarity index 98% rename from doomsday/libdeng2/include/de/net/recordpacket.h rename to doomsday/libcore/include/de/net/recordpacket.h index 66f30f2a60..9ef093dfd3 100644 --- a/doomsday/libdeng2/include/de/net/recordpacket.h +++ b/doomsday/libcore/include/de/net/recordpacket.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/net/socket.h b/doomsday/libcore/include/de/net/socket.h similarity index 99% rename from doomsday/libdeng2/include/de/net/socket.h rename to doomsday/libcore/include/de/net/socket.h index 0593a7533d..61feee2fe7 100644 --- a/doomsday/libdeng2/include/de/net/socket.h +++ b/doomsday/libcore/include/de/net/socket.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_SOCKET_H #define LIBDENG2_SOCKET_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../IByteArray" #include "../Address" #include "../Transmitter" diff --git a/doomsday/libdeng2/include/de/net/transmitter.h b/doomsday/libcore/include/de/net/transmitter.h similarity index 96% rename from doomsday/libdeng2/include/de/net/transmitter.h rename to doomsday/libcore/include/de/net/transmitter.h index ae91393fbd..35a9093668 100644 --- a/doomsday/libdeng2/include/de/net/transmitter.h +++ b/doomsday/libcore/include/de/net/transmitter.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_TRANSMITTER_H #define LIBDENG2_TRANSMITTER_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../IOStream" namespace de { diff --git a/doomsday/libdeng2/include/de/scriptsys/arrayexpression.h b/doomsday/libcore/include/de/scriptsys/arrayexpression.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/arrayexpression.h rename to doomsday/libcore/include/de/scriptsys/arrayexpression.h index 08edb41897..84dcef0780 100644 --- a/doomsday/libdeng2/include/de/scriptsys/arrayexpression.h +++ b/doomsday/libcore/include/de/scriptsys/arrayexpression.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/assignstatement.h b/doomsday/libcore/include/de/scriptsys/assignstatement.h similarity index 96% rename from doomsday/libdeng2/include/de/scriptsys/assignstatement.h rename to doomsday/libcore/include/de/scriptsys/assignstatement.h index 49ddcaefd4..6307cc120d 100644 --- a/doomsday/libdeng2/include/de/scriptsys/assignstatement.h +++ b/doomsday/libcore/include/de/scriptsys/assignstatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_ASSIGNSTATEMENT_H #define LIBDENG2_ASSIGNSTATEMENT_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Statement" #include "../ArrayExpression" #include diff --git a/doomsday/libdeng2/include/de/scriptsys/builtinexpression.h b/doomsday/libcore/include/de/scriptsys/builtinexpression.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/builtinexpression.h rename to doomsday/libcore/include/de/scriptsys/builtinexpression.h index 61f23b637e..dc4468688f 100644 --- a/doomsday/libdeng2/include/de/scriptsys/builtinexpression.h +++ b/doomsday/libcore/include/de/scriptsys/builtinexpression.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_BUILTINEXPRESSION_H #define LIBDENG2_BUILTINEXPRESSION_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Expression" #include "../String" diff --git a/doomsday/libdeng2/include/de/scriptsys/catchstatement.h b/doomsday/libcore/include/de/scriptsys/catchstatement.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/catchstatement.h rename to doomsday/libcore/include/de/scriptsys/catchstatement.h index 2cef595c85..8fddfd5fbc 100644 --- a/doomsday/libdeng2/include/de/scriptsys/catchstatement.h +++ b/doomsday/libcore/include/de/scriptsys/catchstatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/compound.h b/doomsday/libcore/include/de/scriptsys/compound.h similarity index 96% rename from doomsday/libdeng2/include/de/scriptsys/compound.h rename to doomsday/libcore/include/de/scriptsys/compound.h index a74b43d302..c9992d75fa 100644 --- a/doomsday/libdeng2/include/de/scriptsys/compound.h +++ b/doomsday/libcore/include/de/scriptsys/compound.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -21,7 +21,7 @@ #ifndef LIBDENG2_COMPOUND_H #define LIBDENG2_COMPOUND_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../ISerializable" #include diff --git a/doomsday/libdeng2/include/de/scriptsys/constantexpression.h b/doomsday/libcore/include/de/scriptsys/constantexpression.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/constantexpression.h rename to doomsday/libcore/include/de/scriptsys/constantexpression.h index ef08c8079c..cc0d4d9ade 100644 --- a/doomsday/libdeng2/include/de/scriptsys/constantexpression.h +++ b/doomsday/libcore/include/de/scriptsys/constantexpression.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/context.h b/doomsday/libcore/include/de/scriptsys/context.h similarity index 99% rename from doomsday/libdeng2/include/de/scriptsys/context.h rename to doomsday/libcore/include/de/scriptsys/context.h index f8f1f4c143..47b470b491 100644 --- a/doomsday/libdeng2/include/de/scriptsys/context.h +++ b/doomsday/libcore/include/de/scriptsys/context.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/deletestatement.h b/doomsday/libcore/include/de/scriptsys/deletestatement.h similarity index 96% rename from doomsday/libdeng2/include/de/scriptsys/deletestatement.h rename to doomsday/libcore/include/de/scriptsys/deletestatement.h index de95d4b776..bf5be69aeb 100644 --- a/doomsday/libdeng2/include/de/scriptsys/deletestatement.h +++ b/doomsday/libcore/include/de/scriptsys/deletestatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2012-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_DELETESTATEMENT_H #define LIBDENG2_DELETESTATEMENT_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Statement" #include "../ArrayExpression" #include diff --git a/doomsday/libdeng2/include/de/scriptsys/dictionaryexpression.h b/doomsday/libcore/include/de/scriptsys/dictionaryexpression.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/dictionaryexpression.h rename to doomsday/libcore/include/de/scriptsys/dictionaryexpression.h index 3a4f660301..fa453e2c45 100644 --- a/doomsday/libdeng2/include/de/scriptsys/dictionaryexpression.h +++ b/doomsday/libcore/include/de/scriptsys/dictionaryexpression.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/evaluator.h b/doomsday/libcore/include/de/scriptsys/evaluator.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/evaluator.h rename to doomsday/libcore/include/de/scriptsys/evaluator.h index 642730ad23..96b8885ea2 100644 --- a/doomsday/libdeng2/include/de/scriptsys/evaluator.h +++ b/doomsday/libcore/include/de/scriptsys/evaluator.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_EVALUATOR_H #define LIBDENG2_EVALUATOR_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../NoneValue" #include diff --git a/doomsday/libdeng2/include/de/scriptsys/expression.h b/doomsday/libcore/include/de/scriptsys/expression.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/expression.h rename to doomsday/libcore/include/de/scriptsys/expression.h index 90497fdbdc..310698991d 100644 --- a/doomsday/libdeng2/include/de/scriptsys/expression.h +++ b/doomsday/libcore/include/de/scriptsys/expression.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/expressionstatement.h b/doomsday/libcore/include/de/scriptsys/expressionstatement.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/expressionstatement.h rename to doomsday/libcore/include/de/scriptsys/expressionstatement.h index 64886a3596..5a4e50c3a1 100644 --- a/doomsday/libdeng2/include/de/scriptsys/expressionstatement.h +++ b/doomsday/libcore/include/de/scriptsys/expressionstatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/flowstatement.h b/doomsday/libcore/include/de/scriptsys/flowstatement.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/flowstatement.h rename to doomsday/libcore/include/de/scriptsys/flowstatement.h index ec39a87b25..3edf4345ab 100644 --- a/doomsday/libdeng2/include/de/scriptsys/flowstatement.h +++ b/doomsday/libcore/include/de/scriptsys/flowstatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/forstatement.h b/doomsday/libcore/include/de/scriptsys/forstatement.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/forstatement.h rename to doomsday/libcore/include/de/scriptsys/forstatement.h index 0140125081..09d2cb9348 100644 --- a/doomsday/libdeng2/include/de/scriptsys/forstatement.h +++ b/doomsday/libcore/include/de/scriptsys/forstatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/function.h b/doomsday/libcore/include/de/scriptsys/function.h similarity index 99% rename from doomsday/libdeng2/include/de/scriptsys/function.h rename to doomsday/libcore/include/de/scriptsys/function.h index e7788c8c99..01a866e994 100644 --- a/doomsday/libdeng2/include/de/scriptsys/function.h +++ b/doomsday/libcore/include/de/scriptsys/function.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/functionstatement.h b/doomsday/libcore/include/de/scriptsys/functionstatement.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/functionstatement.h rename to doomsday/libcore/include/de/scriptsys/functionstatement.h index 9be73c53c8..f43548e4cb 100644 --- a/doomsday/libdeng2/include/de/scriptsys/functionstatement.h +++ b/doomsday/libcore/include/de/scriptsys/functionstatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/functionvalue.h b/doomsday/libcore/include/de/scriptsys/functionvalue.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/functionvalue.h rename to doomsday/libcore/include/de/scriptsys/functionvalue.h index e449c53b86..481cc32942 100644 --- a/doomsday/libdeng2/include/de/scriptsys/functionvalue.h +++ b/doomsday/libcore/include/de/scriptsys/functionvalue.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/ifstatement.h b/doomsday/libcore/include/de/scriptsys/ifstatement.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/ifstatement.h rename to doomsday/libcore/include/de/scriptsys/ifstatement.h index b9dd1d07f5..8f59076766 100644 --- a/doomsday/libdeng2/include/de/scriptsys/ifstatement.h +++ b/doomsday/libcore/include/de/scriptsys/ifstatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/iparser.h b/doomsday/libcore/include/de/scriptsys/iparser.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/iparser.h rename to doomsday/libcore/include/de/scriptsys/iparser.h index e5bc34cbee..5b69f32635 100644 --- a/doomsday/libdeng2/include/de/scriptsys/iparser.h +++ b/doomsday/libcore/include/de/scriptsys/iparser.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/lex.h b/doomsday/libcore/include/de/scriptsys/lex.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/lex.h rename to doomsday/libcore/include/de/scriptsys/lex.h index 10fec39b19..63307a1b30 100644 --- a/doomsday/libdeng2/include/de/scriptsys/lex.h +++ b/doomsday/libcore/include/de/scriptsys/lex.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_LEX_H #define LIBDENG2_LEX_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../String" #include diff --git a/doomsday/libdeng2/include/de/scriptsys/module.h b/doomsday/libcore/include/de/scriptsys/module.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/module.h rename to doomsday/libcore/include/de/scriptsys/module.h index 1d77024a74..9684c41e3d 100644 --- a/doomsday/libdeng2/include/de/scriptsys/module.h +++ b/doomsday/libcore/include/de/scriptsys/module.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/nameexpression.h b/doomsday/libcore/include/de/scriptsys/nameexpression.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/nameexpression.h rename to doomsday/libcore/include/de/scriptsys/nameexpression.h index 804911a5bd..317d73cb2a 100644 --- a/doomsday/libdeng2/include/de/scriptsys/nameexpression.h +++ b/doomsday/libcore/include/de/scriptsys/nameexpression.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/operator.h b/doomsday/libcore/include/de/scriptsys/operator.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/operator.h rename to doomsday/libcore/include/de/scriptsys/operator.h index 0b2b20ecef..94b6c69174 100644 --- a/doomsday/libdeng2/include/de/scriptsys/operator.h +++ b/doomsday/libcore/include/de/scriptsys/operator.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/operatorexpression.h b/doomsday/libcore/include/de/scriptsys/operatorexpression.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/operatorexpression.h rename to doomsday/libcore/include/de/scriptsys/operatorexpression.h index b5db45bbe6..611f4e32e6 100644 --- a/doomsday/libdeng2/include/de/scriptsys/operatorexpression.h +++ b/doomsday/libcore/include/de/scriptsys/operatorexpression.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_OPERATOREXPRESSION_H #define LIBDENG2_OPERATOREXPRESSION_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Operator" #include "../Expression" diff --git a/doomsday/libdeng2/include/de/scriptsys/parser.h b/doomsday/libcore/include/de/scriptsys/parser.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/parser.h rename to doomsday/libcore/include/de/scriptsys/parser.h index 418f0aea9f..462f712db1 100644 --- a/doomsday/libdeng2/include/de/scriptsys/parser.h +++ b/doomsday/libcore/include/de/scriptsys/parser.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_PARSER_H #define LIBDENG2_PARSER_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../IParser" #include "../TokenBuffer" #include "../TokenRange" diff --git a/doomsday/libdeng2/include/de/scriptsys/printstatement.h b/doomsday/libcore/include/de/scriptsys/printstatement.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/printstatement.h rename to doomsday/libcore/include/de/scriptsys/printstatement.h index 833ef87229..d60926a88f 100644 --- a/doomsday/libdeng2/include/de/scriptsys/printstatement.h +++ b/doomsday/libcore/include/de/scriptsys/printstatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/process.h b/doomsday/libcore/include/de/scriptsys/process.h similarity index 99% rename from doomsday/libdeng2/include/de/scriptsys/process.h rename to doomsday/libcore/include/de/scriptsys/process.h index 87317c9fd4..072f0c8c47 100644 --- a/doomsday/libdeng2/include/de/scriptsys/process.h +++ b/doomsday/libcore/include/de/scriptsys/process.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/script.h b/doomsday/libcore/include/de/scriptsys/script.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/script.h rename to doomsday/libcore/include/de/scriptsys/script.h index 06550cf8cb..bfd7fdd947 100644 --- a/doomsday/libdeng2/include/de/scriptsys/script.h +++ b/doomsday/libcore/include/de/scriptsys/script.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/scriptedinfo.h b/doomsday/libcore/include/de/scriptsys/scriptedinfo.h similarity index 100% rename from doomsday/libdeng2/include/de/scriptsys/scriptedinfo.h rename to doomsday/libcore/include/de/scriptsys/scriptedinfo.h diff --git a/doomsday/libdeng2/include/de/scriptsys/scriptlex.h b/doomsday/libcore/include/de/scriptsys/scriptlex.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/scriptlex.h rename to doomsday/libcore/include/de/scriptsys/scriptlex.h index a50312800c..378c1b49ac 100644 --- a/doomsday/libdeng2/include/de/scriptsys/scriptlex.h +++ b/doomsday/libcore/include/de/scriptsys/scriptlex.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/scriptsystem.h b/doomsday/libcore/include/de/scriptsys/scriptsystem.h similarity index 100% rename from doomsday/libdeng2/include/de/scriptsys/scriptsystem.h rename to doomsday/libcore/include/de/scriptsys/scriptsystem.h diff --git a/doomsday/libdeng2/include/de/scriptsys/statement.h b/doomsday/libcore/include/de/scriptsys/statement.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/statement.h rename to doomsday/libcore/include/de/scriptsys/statement.h index 8422809c1d..5d74577f39 100644 --- a/doomsday/libdeng2/include/de/scriptsys/statement.h +++ b/doomsday/libcore/include/de/scriptsys/statement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/tokenbuffer.h b/doomsday/libcore/include/de/scriptsys/tokenbuffer.h similarity index 98% rename from doomsday/libdeng2/include/de/scriptsys/tokenbuffer.h rename to doomsday/libcore/include/de/scriptsys/tokenbuffer.h index 0b2a4991b7..12851f2f77 100644 --- a/doomsday/libdeng2/include/de/scriptsys/tokenbuffer.h +++ b/doomsday/libcore/include/de/scriptsys/tokenbuffer.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_TOKENBUFFER_H #define LIBDENG2_TOKENBUFFER_H -#include "../libdeng2.h" +#include "../libcore.h" #include diff --git a/doomsday/libdeng2/include/de/scriptsys/tokenrange.h b/doomsday/libcore/include/de/scriptsys/tokenrange.h similarity index 99% rename from doomsday/libdeng2/include/de/scriptsys/tokenrange.h rename to doomsday/libcore/include/de/scriptsys/tokenrange.h index c142518d58..644a544fac 100644 --- a/doomsday/libdeng2/include/de/scriptsys/tokenrange.h +++ b/doomsday/libcore/include/de/scriptsys/tokenrange.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/trystatement.h b/doomsday/libcore/include/de/scriptsys/trystatement.h similarity index 96% rename from doomsday/libdeng2/include/de/scriptsys/trystatement.h rename to doomsday/libcore/include/de/scriptsys/trystatement.h index 706f8850a6..46a6eee270 100644 --- a/doomsday/libdeng2/include/de/scriptsys/trystatement.h +++ b/doomsday/libcore/include/de/scriptsys/trystatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/scriptsys/whilestatement.h b/doomsday/libcore/include/de/scriptsys/whilestatement.h similarity index 97% rename from doomsday/libdeng2/include/de/scriptsys/whilestatement.h rename to doomsday/libcore/include/de/scriptsys/whilestatement.h index e278371884..6c89821226 100644 --- a/doomsday/libdeng2/include/de/scriptsys/whilestatement.h +++ b/doomsday/libcore/include/de/scriptsys/whilestatement.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/include/de/widgets/action.h b/doomsday/libcore/include/de/widgets/action.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/action.h rename to doomsday/libcore/include/de/widgets/action.h diff --git a/doomsday/libdeng2/include/de/widgets/animation.h b/doomsday/libcore/include/de/widgets/animation.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/animation.h rename to doomsday/libcore/include/de/widgets/animation.h diff --git a/doomsday/libdeng2/include/de/widgets/animationvector.h b/doomsday/libcore/include/de/widgets/animationvector.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/animationvector.h rename to doomsday/libcore/include/de/widgets/animationvector.h diff --git a/doomsday/libdeng2/include/de/widgets/constantrule.h b/doomsday/libcore/include/de/widgets/constantrule.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/constantrule.h rename to doomsday/libcore/include/de/widgets/constantrule.h diff --git a/doomsday/libdeng2/include/de/widgets/indirectrule.h b/doomsday/libcore/include/de/widgets/indirectrule.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/indirectrule.h rename to doomsday/libcore/include/de/widgets/indirectrule.h diff --git a/doomsday/libdeng2/include/de/widgets/operatorrule.h b/doomsday/libcore/include/de/widgets/operatorrule.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/operatorrule.h rename to doomsday/libcore/include/de/widgets/operatorrule.h diff --git a/doomsday/libdeng2/include/de/widgets/rootwidget.h b/doomsday/libcore/include/de/widgets/rootwidget.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/rootwidget.h rename to doomsday/libcore/include/de/widgets/rootwidget.h diff --git a/doomsday/libdeng2/include/de/widgets/rule.h b/doomsday/libcore/include/de/widgets/rule.h similarity index 99% rename from doomsday/libdeng2/include/de/widgets/rule.h rename to doomsday/libcore/include/de/widgets/rule.h index 7a0a91667e..f375bddc2e 100644 --- a/doomsday/libdeng2/include/de/widgets/rule.h +++ b/doomsday/libcore/include/de/widgets/rule.h @@ -20,7 +20,7 @@ #ifndef LIBDENG2_RULE_H #define LIBDENG2_RULE_H -#include "../libdeng2.h" +#include "../libcore.h" #include "../Counted" #include "../Observers" #include "../String" diff --git a/doomsday/libdeng2/include/de/widgets/rulebank.h b/doomsday/libcore/include/de/widgets/rulebank.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/rulebank.h rename to doomsday/libcore/include/de/widgets/rulebank.h diff --git a/doomsday/libdeng2/include/de/widgets/rulerectangle.h b/doomsday/libcore/include/de/widgets/rulerectangle.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/rulerectangle.h rename to doomsday/libcore/include/de/widgets/rulerectangle.h diff --git a/doomsday/libdeng2/include/de/widgets/rules.h b/doomsday/libcore/include/de/widgets/rules.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/rules.h rename to doomsday/libcore/include/de/widgets/rules.h diff --git a/doomsday/libdeng2/include/de/widgets/scalarrule.h b/doomsday/libcore/include/de/widgets/scalarrule.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/scalarrule.h rename to doomsday/libcore/include/de/widgets/scalarrule.h diff --git a/doomsday/libdeng2/include/de/widgets/widget.h b/doomsday/libcore/include/de/widgets/widget.h similarity index 100% rename from doomsday/libdeng2/include/de/widgets/widget.h rename to doomsday/libcore/include/de/widgets/widget.h diff --git a/doomsday/libdeng2/libdeng2.pro b/doomsday/libcore/libcore.pro similarity index 92% rename from doomsday/libdeng2/libdeng2.pro rename to doomsday/libcore/libcore.pro index 97bff2a58f..430d8b12de 100644 --- a/doomsday/libdeng2/libdeng2.pro +++ b/doomsday/libcore/libcore.pro @@ -4,7 +4,7 @@ # Copyright (c) 2011-2014 Daniel Swanson TEMPLATE = lib -TARGET = deng2 +TARGET = deng_core # Build Configuration -------------------------------------------------------- @@ -39,12 +39,12 @@ win32 { TARGET_EXT = .dll # For Windows, an .rc file is generated for embedded version info in the binary. - system(python "$$PWD/res/win32/generate_rc.py" "$$PWD/res/win32/deng2.rc" \ + system(python "$$PWD/res/win32/generate_rc.py" "$$PWD/res/win32/core.rc" \ $$LIBDENG2_MAJOR_VERSION $$LIBDENG2_MINOR_VERSION $$LIBDENG2_PATCHLEVEL \ $$LIBDENG2_RELEASE_LABEL $$DENG_BUILD) - RC_FILE = res/win32/deng2.rc + RC_FILE = res/win32/core.rc - OTHER_FILES += res/win32/deng2.rc.in + OTHER_FILES += res/win32/core.rc.in } # Enable strict warnings for C++ code. @@ -104,7 +104,7 @@ publicHeaders(root, \ include/de/c_wrapper.h \ include/de/charsymbols.h \ include/de/error.h \ - include/de/libdeng2.h \ + include/de/libcore.h \ include/de/math.h \ ) @@ -185,17 +185,17 @@ OTHER_FILES += \ macx { defineTest(fixInstallName) { - doPostLink("install_name_tool -change $$1 @executable_path/../Frameworks/$$1 libdeng2.2.dylib") - doPostLink("install_name_tool -change $$(QTDIR)lib/$$1 @executable_path/../Frameworks/$$1 libdeng2.2.dylib") - doPostLink("install_name_tool -change $$(QTDIR)/lib/$$1 @executable_path/../Frameworks/$$1 libdeng2.2.dylib") + doPostLink("install_name_tool -change $$1 @executable_path/../Frameworks/$$1 libdeng_core.2.dylib") + doPostLink("install_name_tool -change $$(QTDIR)lib/$$1 @executable_path/../Frameworks/$$1 libdeng_core.2.dylib") + doPostLink("install_name_tool -change $$(QTDIR)/lib/$$1 @executable_path/../Frameworks/$$1 libdeng_core.2.dylib") } - doPostLink("install_name_tool -id @executable_path/../Frameworks/libdeng2.2.dylib libdeng2.2.dylib") + doPostLink("install_name_tool -id @executable_path/../Frameworks/libdeng_core.2.dylib libdeng_core.2.dylib") fixInstallName("QtCore.framework/Versions/$$QT_MAJOR_VERSION/QtCore") fixInstallName("QtNetwork.framework/Versions/$$QT_MAJOR_VERSION/QtNetwork") # Update the library included in the main app bundle. doPostLink("mkdir -p ../client/Doomsday.app/Contents/Frameworks") - doPostLink("cp -fRp libdeng2*dylib ../client/Doomsday.app/Contents/Frameworks") + doPostLink("cp -fRp libdeng_core*dylib ../client/Doomsday.app/Contents/Frameworks") } !macx { diff --git a/doomsday/libdeng2/modules/Config.de b/doomsday/libcore/modules/Config.de similarity index 98% rename from doomsday/libdeng2/modules/Config.de rename to doomsday/libcore/modules/Config.de index 19d73ed4b6..e7f384c7aa 100644 --- a/doomsday/libdeng2/modules/Config.de +++ b/doomsday/libcore/modules/Config.de @@ -1,4 +1,4 @@ -# The Doomsday Engine Project -- libdeng2 +# The Doomsday Engine Project -- libcore # # Copyright (c) 2012-2014 Jaakko Keränen # @@ -71,7 +71,7 @@ def setDefaults(d = None) catch: pass # Game mode related information (one for each game plugin): - # TODO: plugins should have their own Config scripts (when libdeng2 loads them) + # TODO: plugins should have their own Config scripts (when libcore loads them) record d.plugin record d.plugin.doom record d.plugin.heretic diff --git a/doomsday/libdeng2/modules/Log.de b/doomsday/libcore/modules/Log.de similarity index 96% rename from doomsday/libdeng2/modules/Log.de rename to doomsday/libcore/modules/Log.de index cc391f363a..63eb1f9058 100644 --- a/doomsday/libdeng2/modules/Log.de +++ b/doomsday/libcore/modules/Log.de @@ -1,4 +1,4 @@ -# The Doomsday Engine Project -- libdeng2 +# The Doomsday Engine Project -- libcore # # Copyright (c) 2014 Jaakko Keränen # diff --git a/doomsday/libdeng2/modules/recutil.de b/doomsday/libcore/modules/recutil.de similarity index 97% rename from doomsday/libdeng2/modules/recutil.de rename to doomsday/libcore/modules/recutil.de index 3bbcea81f8..bb07f1a34b 100644 --- a/doomsday/libdeng2/modules/recutil.de +++ b/doomsday/libcore/modules/recutil.de @@ -1,4 +1,4 @@ -# The Doomsday Engine Project -- libdeng2 +# The Doomsday Engine Project -- libcore # # Copyright (c) 2012-2013 Jaakko Keränen # diff --git a/doomsday/libdeng2/network.pri b/doomsday/libcore/network.pri similarity index 100% rename from doomsday/libdeng2/network.pri rename to doomsday/libcore/network.pri diff --git a/doomsday/libdeng2/res/win32/.gitignore b/doomsday/libcore/res/win32/.gitignore similarity index 100% rename from doomsday/libdeng2/res/win32/.gitignore rename to doomsday/libcore/res/win32/.gitignore diff --git a/doomsday/libdeng2/res/win32/deng2.rc.in b/doomsday/libcore/res/win32/core.rc.in similarity index 94% rename from doomsday/libdeng2/res/win32/deng2.rc.in rename to doomsday/libcore/res/win32/core.rc.in index a7ae22e65f..d38772abd3 100644 --- a/doomsday/libdeng2/res/win32/deng2.rc.in +++ b/doomsday/libcore/res/win32/core.rc.in @@ -1,5 +1,5 @@ /** - * @file deng2.rc + * @file core.rc * Win32 resource script (template). * * @authors Copyright © 2008-2013 Daniel Swanson @@ -49,7 +49,7 @@ END 3 TEXTINCLUDE BEGIN "#ifndef NO_MANIFEST\r\n" - " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""deng2.dll.manifest""\r\n" + " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""deng_core.dll.manifest""\r\n" "#endif\r\n" "\r\n" "VS_VERSION_INFO VERSIONINFO\r\n" diff --git a/doomsday/libdeng2/res/win32/deng2.dll.manifest b/doomsday/libcore/res/win32/deng_core.dll.manifest similarity index 100% rename from doomsday/libdeng2/res/win32/deng2.dll.manifest rename to doomsday/libcore/res/win32/deng_core.dll.manifest diff --git a/doomsday/libdeng2/res/win32/generate_rc.py b/doomsday/libcore/res/win32/generate_rc.py similarity index 85% rename from doomsday/libdeng2/res/win32/generate_rc.py rename to doomsday/libcore/res/win32/generate_rc.py index f8add45e5c..7a39e1bf3d 100644 --- a/doomsday/libdeng2/res/win32/generate_rc.py +++ b/doomsday/libcore/res/win32/generate_rc.py @@ -38,8 +38,8 @@ def quoted(s): .replace('LIBDENG2_DESC_WSTR', quoted('Doomsday 2 core library')) \ .replace('LIBDENG2_DESC', quoted('Doomsday 2 core library')) \ .replace('LIBDENG2_VERSION_TEXT', quoted(VERSION)) \ - .replace('LIBDENG2_NICENAME', quoted('deng2')) \ - .replace('LIBDENG2_COPYRIGHT', quoted('2004-2012 Deng Team')) \ - .replace('LIBDENG2_FILENAME', quoted('deng2.dll')) + .replace('LIBDENG2_NICENAME', quoted('libcore')) \ + .replace('LIBDENG2_COPYRIGHT', quoted('2004-2014 Deng Team')) \ + .replace('LIBDENG2_FILENAME', quoted('deng_core.dll')) outFile.write(line) diff --git a/doomsday/libdeng2/res/win32/resource.h b/doomsday/libcore/res/win32/resource.h similarity index 94% rename from doomsday/libdeng2/res/win32/resource.h rename to doomsday/libcore/res/win32/resource.h index 2085efdc03..4003709dd3 100644 --- a/doomsday/libdeng2/res/win32/resource.h +++ b/doomsday/libcore/res/win32/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by deng2.rc +// Used by core.rc // // Next default values for new objects diff --git a/doomsday/libdeng2/scriptsys.pri b/doomsday/libcore/scriptsys.pri similarity index 100% rename from doomsday/libdeng2/scriptsys.pri rename to doomsday/libcore/scriptsys.pri diff --git a/doomsday/libdeng2/src/c_wrapper.cpp b/doomsday/libcore/src/c_wrapper.cpp similarity index 99% rename from doomsday/libdeng2/src/c_wrapper.cpp rename to doomsday/libcore/src/c_wrapper.cpp index 076b986db1..4037f03fb5 100644 --- a/doomsday/libdeng2/src/c_wrapper.cpp +++ b/doomsday/libcore/src/c_wrapper.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2011-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/concurrency/guard.cpp b/doomsday/libcore/src/concurrency/guard.cpp similarity index 97% rename from doomsday/libdeng2/src/concurrency/guard.cpp rename to doomsday/libcore/src/concurrency/guard.cpp index 872bbbe9f0..e7a53bcc4e 100644 --- a/doomsday/libdeng2/src/concurrency/guard.cpp +++ b/doomsday/libcore/src/concurrency/guard.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2011-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/concurrency/lockable.cpp b/doomsday/libcore/src/concurrency/lockable.cpp similarity index 97% rename from doomsday/libdeng2/src/concurrency/lockable.cpp rename to doomsday/libcore/src/concurrency/lockable.cpp index dd92efb140..d7fd0d8b0c 100644 --- a/doomsday/libdeng2/src/concurrency/lockable.cpp +++ b/doomsday/libcore/src/concurrency/lockable.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * @authors Copyright © 2004-2014 Jaakko Keränen * @authors Copyright © 2014 Daniel Swanson diff --git a/doomsday/libdeng2/src/concurrency/readwritelockable.cpp b/doomsday/libcore/src/concurrency/readwritelockable.cpp similarity index 100% rename from doomsday/libdeng2/src/concurrency/readwritelockable.cpp rename to doomsday/libcore/src/concurrency/readwritelockable.cpp diff --git a/doomsday/libdeng2/src/concurrency/task.cpp b/doomsday/libcore/src/concurrency/task.cpp similarity index 100% rename from doomsday/libdeng2/src/concurrency/task.cpp rename to doomsday/libcore/src/concurrency/task.cpp diff --git a/doomsday/libdeng2/src/concurrency/taskpool.cpp b/doomsday/libcore/src/concurrency/taskpool.cpp similarity index 100% rename from doomsday/libdeng2/src/concurrency/taskpool.cpp rename to doomsday/libcore/src/concurrency/taskpool.cpp diff --git a/doomsday/libdeng2/src/concurrency/waitable.cpp b/doomsday/libcore/src/concurrency/waitable.cpp similarity index 97% rename from doomsday/libdeng2/src/concurrency/waitable.cpp rename to doomsday/libcore/src/concurrency/waitable.cpp index 9fd05c640c..7d7d354108 100644 --- a/doomsday/libdeng2/src/concurrency/waitable.cpp +++ b/doomsday/libcore/src/concurrency/waitable.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/core/app.cpp b/doomsday/libcore/src/core/app.cpp similarity index 99% rename from doomsday/libdeng2/src/core/app.cpp rename to doomsday/libcore/src/core/app.cpp index f3cd372ce3..ed3e75e1e0 100644 --- a/doomsday/libdeng2/src/core/app.cpp +++ b/doomsday/libcore/src/core/app.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2010-2013 Jaakko Keränen * @@ -591,7 +591,7 @@ void App::initSubsystems(SubsystemInitFlags flags) if(allowPlugins) { -#if 0 // not yet handled by libdeng2 +#if 0 // not yet handled by libcore // Load the basic plugins. loadPlugins(); #endif @@ -603,7 +603,7 @@ void App::initSubsystems(SubsystemInitFlags flags) // Now we can start observing progress of time. d->clock.audienceForTimeChange() += this; - LOG_VERBOSE("libdeng2::App %s subsystems initialized.") << Version().asText(); + LOG_VERBOSE("libcore::App %s subsystems initialized.") << Version().asText(); } void App::addSystem(System &system) diff --git a/doomsday/libdeng2/src/core/asset.cpp b/doomsday/libcore/src/core/asset.cpp similarity index 100% rename from doomsday/libdeng2/src/core/asset.cpp rename to doomsday/libcore/src/core/asset.cpp diff --git a/doomsday/libdeng2/src/core/callbacktimer.cpp b/doomsday/libcore/src/core/callbacktimer.cpp similarity index 100% rename from doomsday/libdeng2/src/core/callbacktimer.cpp rename to doomsday/libcore/src/core/callbacktimer.cpp diff --git a/doomsday/libdeng2/src/core/callbacktimer.h b/doomsday/libcore/src/core/callbacktimer.h similarity index 100% rename from doomsday/libdeng2/src/core/callbacktimer.h rename to doomsday/libcore/src/core/callbacktimer.h diff --git a/doomsday/libdeng2/src/core/clock.cpp b/doomsday/libcore/src/core/clock.cpp similarity index 100% rename from doomsday/libdeng2/src/core/clock.cpp rename to doomsday/libcore/src/core/clock.cpp diff --git a/doomsday/libdeng2/src/core/commandline.cpp b/doomsday/libcore/src/core/commandline.cpp similarity index 99% rename from doomsday/libdeng2/src/core/commandline.cpp rename to doomsday/libcore/src/core/commandline.cpp index b3fdcece79..ef136ef59e 100644 --- a/doomsday/libdeng2/src/core/commandline.cpp +++ b/doomsday/libcore/src/core/commandline.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/core/config.cpp b/doomsday/libcore/src/core/config.cpp similarity index 98% rename from doomsday/libdeng2/src/core/config.cpp rename to doomsday/libcore/src/core/config.cpp index bb97424583..2921695042 100644 --- a/doomsday/libdeng2/src/core/config.cpp +++ b/doomsday/libcore/src/core/config.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * @@ -143,7 +143,7 @@ void Config::read() shouldRunScript = true; } - // The version of libdeng2 is automatically included in the namespace. + // The version of libcore is automatically included in the namespace. d->config.globals().add(new Variable("__version__", version.take(), Variable::AllowArray | Variable::ReadOnly)); diff --git a/doomsday/libdeng2/src/core/debuglogsink.cpp b/doomsday/libcore/src/core/debuglogsink.cpp similarity index 100% rename from doomsday/libdeng2/src/core/debuglogsink.cpp rename to doomsday/libcore/src/core/debuglogsink.cpp diff --git a/doomsday/libdeng2/src/core/filelogsink.cpp b/doomsday/libcore/src/core/filelogsink.cpp similarity index 100% rename from doomsday/libdeng2/src/core/filelogsink.cpp rename to doomsday/libcore/src/core/filelogsink.cpp diff --git a/doomsday/libdeng2/src/core/garbage.cpp b/doomsday/libcore/src/core/garbage.cpp similarity index 100% rename from doomsday/libdeng2/src/core/garbage.cpp rename to doomsday/libcore/src/core/garbage.cpp diff --git a/doomsday/libdeng2/src/core/highperformancetimer.cpp b/doomsday/libcore/src/core/highperformancetimer.cpp similarity index 100% rename from doomsday/libdeng2/src/core/highperformancetimer.cpp rename to doomsday/libcore/src/core/highperformancetimer.cpp diff --git a/doomsday/libdeng2/src/core/id.cpp b/doomsday/libcore/src/core/id.cpp similarity index 97% rename from doomsday/libdeng2/src/core/id.cpp rename to doomsday/libcore/src/core/id.cpp index 179948e5e7..a5137a3ce4 100644 --- a/doomsday/libdeng2/src/core/id.cpp +++ b/doomsday/libcore/src/core/id.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/core/library.cpp b/doomsday/libcore/src/core/library.cpp similarity index 98% rename from doomsday/libdeng2/src/core/library.cpp rename to doomsday/libcore/src/core/library.cpp index 002a8fd3b8..02bff1e1ef 100644 --- a/doomsday/libdeng2/src/core/library.cpp +++ b/doomsday/libcore/src/core/library.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -17,7 +17,7 @@ * http://www.gnu.org/licenses */ -#include "de/libdeng2.h" +#include "de/libcore.h" #include "de/Library" #include "de/Log" #include "de/LogBuffer" diff --git a/doomsday/libdeng2/src/core/log.cpp b/doomsday/libcore/src/core/log.cpp similarity index 99% rename from doomsday/libdeng2/src/core/log.cpp rename to doomsday/libcore/src/core/log.cpp index 5e80cea062..66a5d1a191 100644 --- a/doomsday/libdeng2/src/core/log.cpp +++ b/doomsday/libcore/src/core/log.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/core/logbuffer.cpp b/doomsday/libcore/src/core/logbuffer.cpp similarity index 99% rename from doomsday/libdeng2/src/core/logbuffer.cpp rename to doomsday/libcore/src/core/logbuffer.cpp index 54a5db3565..63cc6aada1 100644 --- a/doomsday/libdeng2/src/core/logbuffer.cpp +++ b/doomsday/libcore/src/core/logbuffer.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/core/logfilter.cpp b/doomsday/libcore/src/core/logfilter.cpp similarity index 100% rename from doomsday/libdeng2/src/core/logfilter.cpp rename to doomsday/libcore/src/core/logfilter.cpp diff --git a/doomsday/libdeng2/src/core/logsink.cpp b/doomsday/libcore/src/core/logsink.cpp similarity index 100% rename from doomsday/libdeng2/src/core/logsink.cpp rename to doomsday/libcore/src/core/logsink.cpp diff --git a/doomsday/libdeng2/src/core/logtextstyle.h b/doomsday/libcore/src/core/logtextstyle.h similarity index 96% rename from doomsday/libdeng2/src/core/logtextstyle.h rename to doomsday/libcore/src/core/logtextstyle.h index e0be680131..f923639e8b 100644 --- a/doomsday/libdeng2/src/core/logtextstyle.h +++ b/doomsday/libcore/src/core/logtextstyle.h @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * @@ -20,7 +20,7 @@ #ifndef LIBDENG2_LOGTEXTSTYLE_H #define LIBDENG2_LOGTEXTSTYLE_H -#include "de/libdeng2.h" +#include "de/libcore.h" /** * @file logtextstyle.h diff --git a/doomsday/libdeng2/src/core/loop.cpp b/doomsday/libcore/src/core/loop.cpp similarity index 100% rename from doomsday/libdeng2/src/core/loop.cpp rename to doomsday/libcore/src/core/loop.cpp diff --git a/doomsday/libdeng2/src/core/memorylogsink.cpp b/doomsday/libcore/src/core/memorylogsink.cpp similarity index 100% rename from doomsday/libdeng2/src/core/memorylogsink.cpp rename to doomsday/libcore/src/core/memorylogsink.cpp diff --git a/doomsday/libdeng2/src/core/monospacelogsinkformatter.cpp b/doomsday/libcore/src/core/monospacelogsinkformatter.cpp similarity index 100% rename from doomsday/libdeng2/src/core/monospacelogsinkformatter.cpp rename to doomsday/libcore/src/core/monospacelogsinkformatter.cpp diff --git a/doomsday/libdeng2/src/core/system.cpp b/doomsday/libcore/src/core/system.cpp similarity index 100% rename from doomsday/libdeng2/src/core/system.cpp rename to doomsday/libcore/src/core/system.cpp diff --git a/doomsday/libdeng2/src/core/textapp.cpp b/doomsday/libcore/src/core/textapp.cpp similarity index 100% rename from doomsday/libdeng2/src/core/textapp.cpp rename to doomsday/libcore/src/core/textapp.cpp diff --git a/doomsday/libdeng2/src/core/textstreamlogsink.cpp b/doomsday/libcore/src/core/textstreamlogsink.cpp similarity index 100% rename from doomsday/libdeng2/src/core/textstreamlogsink.cpp rename to doomsday/libcore/src/core/textstreamlogsink.cpp diff --git a/doomsday/libdeng2/src/core/unixinfo.cpp b/doomsday/libcore/src/core/unixinfo.cpp similarity index 100% rename from doomsday/libdeng2/src/core/unixinfo.cpp rename to doomsday/libcore/src/core/unixinfo.cpp diff --git a/doomsday/libdeng2/src/data/accessorvalue.cpp b/doomsday/libcore/src/data/accessorvalue.cpp similarity index 98% rename from doomsday/libdeng2/src/data/accessorvalue.cpp rename to doomsday/libcore/src/data/accessorvalue.cpp index 152813b01b..2203e05a96 100644 --- a/doomsday/libdeng2/src/data/accessorvalue.cpp +++ b/doomsday/libcore/src/data/accessorvalue.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/archive.cpp b/doomsday/libcore/src/data/archive.cpp similarity index 100% rename from doomsday/libdeng2/src/data/archive.cpp rename to doomsday/libcore/src/data/archive.cpp diff --git a/doomsday/libdeng2/src/data/arrayvalue.cpp b/doomsday/libcore/src/data/arrayvalue.cpp similarity index 99% rename from doomsday/libdeng2/src/data/arrayvalue.cpp rename to doomsday/libcore/src/data/arrayvalue.cpp index 713edbe033..07b21296be 100644 --- a/doomsday/libdeng2/src/data/arrayvalue.cpp +++ b/doomsday/libcore/src/data/arrayvalue.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/bank.cpp b/doomsday/libcore/src/data/bank.cpp similarity index 100% rename from doomsday/libdeng2/src/data/bank.cpp rename to doomsday/libcore/src/data/bank.cpp diff --git a/doomsday/libdeng2/src/data/binarytree_wrapper.cpp b/doomsday/libcore/src/data/binarytree_wrapper.cpp similarity index 100% rename from doomsday/libdeng2/src/data/binarytree_wrapper.cpp rename to doomsday/libcore/src/data/binarytree_wrapper.cpp diff --git a/doomsday/libdeng2/src/data/bitfield.cpp b/doomsday/libcore/src/data/bitfield.cpp similarity index 100% rename from doomsday/libdeng2/src/data/bitfield.cpp rename to doomsday/libcore/src/data/bitfield.cpp diff --git a/doomsday/libdeng2/src/data/bitfield_elements.cpp b/doomsday/libcore/src/data/bitfield_elements.cpp similarity index 100% rename from doomsday/libdeng2/src/data/bitfield_elements.cpp rename to doomsday/libcore/src/data/bitfield_elements.cpp diff --git a/doomsday/libdeng2/src/data/block.cpp b/doomsday/libcore/src/data/block.cpp similarity index 98% rename from doomsday/libdeng2/src/data/block.cpp rename to doomsday/libcore/src/data/block.cpp index 39c667b423..72cc20a51f 100644 --- a/doomsday/libdeng2/src/data/block.cpp +++ b/doomsday/libcore/src/data/block.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/blockvalue.cpp b/doomsday/libcore/src/data/blockvalue.cpp similarity index 98% rename from doomsday/libdeng2/src/data/blockvalue.cpp rename to doomsday/libcore/src/data/blockvalue.cpp index 71bfa764a1..364632fe69 100644 --- a/doomsday/libdeng2/src/data/blockvalue.cpp +++ b/doomsday/libcore/src/data/blockvalue.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/byteorder.cpp b/doomsday/libcore/src/data/byteorder.cpp similarity index 99% rename from doomsday/libdeng2/src/data/byteorder.cpp rename to doomsday/libcore/src/data/byteorder.cpp index 3d6c63e0dc..0e8b041778 100644 --- a/doomsday/libdeng2/src/data/byteorder.cpp +++ b/doomsday/libcore/src/data/byteorder.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/byterefarray.cpp b/doomsday/libcore/src/data/byterefarray.cpp similarity index 98% rename from doomsday/libdeng2/src/data/byterefarray.cpp rename to doomsday/libcore/src/data/byterefarray.cpp index ea64a72f53..b3529c4cd2 100644 --- a/doomsday/libdeng2/src/data/byterefarray.cpp +++ b/doomsday/libcore/src/data/byterefarray.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2010-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/bytesubarray.cpp b/doomsday/libcore/src/data/bytesubarray.cpp similarity index 97% rename from doomsday/libdeng2/src/data/bytesubarray.cpp rename to doomsday/libcore/src/data/bytesubarray.cpp index 140fdbe04f..5da042fc22 100644 --- a/doomsday/libdeng2/src/data/bytesubarray.cpp +++ b/doomsday/libcore/src/data/bytesubarray.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/counted.cpp b/doomsday/libcore/src/data/counted.cpp similarity index 97% rename from doomsday/libdeng2/src/data/counted.cpp rename to doomsday/libcore/src/data/counted.cpp index fd206fd840..9528e85ae4 100644 --- a/doomsday/libdeng2/src/data/counted.cpp +++ b/doomsday/libcore/src/data/counted.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/date.cpp b/doomsday/libcore/src/data/date.cpp similarity index 96% rename from doomsday/libdeng2/src/data/date.cpp rename to doomsday/libcore/src/data/date.cpp index a41a0bc5a6..20f82a9f8f 100644 --- a/doomsday/libdeng2/src/data/date.cpp +++ b/doomsday/libcore/src/data/date.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/dictionaryvalue.cpp b/doomsday/libcore/src/data/dictionaryvalue.cpp similarity index 99% rename from doomsday/libdeng2/src/data/dictionaryvalue.cpp rename to doomsday/libcore/src/data/dictionaryvalue.cpp index 18e71b3691..333f02e12a 100644 --- a/doomsday/libdeng2/src/data/dictionaryvalue.cpp +++ b/doomsday/libcore/src/data/dictionaryvalue.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/escapeparser.cpp b/doomsday/libcore/src/data/escapeparser.cpp similarity index 100% rename from doomsday/libdeng2/src/data/escapeparser.cpp rename to doomsday/libcore/src/data/escapeparser.cpp diff --git a/doomsday/libdeng2/src/data/fixedbytearray.cpp b/doomsday/libcore/src/data/fixedbytearray.cpp similarity index 97% rename from doomsday/libdeng2/src/data/fixedbytearray.cpp rename to doomsday/libcore/src/data/fixedbytearray.cpp index 62b5974793..134d7391fe 100644 --- a/doomsday/libdeng2/src/data/fixedbytearray.cpp +++ b/doomsday/libcore/src/data/fixedbytearray.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/huffman.cpp b/doomsday/libcore/src/data/huffman.cpp similarity index 100% rename from doomsday/libdeng2/src/data/huffman.cpp rename to doomsday/libcore/src/data/huffman.cpp diff --git a/doomsday/libdeng2/src/data/info.cpp b/doomsday/libcore/src/data/info.cpp similarity index 99% rename from doomsday/libdeng2/src/data/info.cpp rename to doomsday/libcore/src/data/info.cpp index 973d5514e0..1a95ed06c1 100644 --- a/doomsday/libdeng2/src/data/info.cpp +++ b/doomsday/libcore/src/data/info.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2012-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/infobank.cpp b/doomsday/libcore/src/data/infobank.cpp similarity index 100% rename from doomsday/libdeng2/src/data/infobank.cpp rename to doomsday/libcore/src/data/infobank.cpp diff --git a/doomsday/libdeng2/src/data/json.cpp b/doomsday/libcore/src/data/json.cpp similarity index 100% rename from doomsday/libdeng2/src/data/json.cpp rename to doomsday/libcore/src/data/json.cpp diff --git a/doomsday/libdeng2/src/data/nonevalue.cpp b/doomsday/libcore/src/data/nonevalue.cpp similarity index 97% rename from doomsday/libdeng2/src/data/nonevalue.cpp rename to doomsday/libcore/src/data/nonevalue.cpp index 04d9802fb3..88a4e86f60 100644 --- a/doomsday/libdeng2/src/data/nonevalue.cpp +++ b/doomsday/libcore/src/data/nonevalue.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/numbervalue.cpp b/doomsday/libcore/src/data/numbervalue.cpp similarity index 99% rename from doomsday/libdeng2/src/data/numbervalue.cpp rename to doomsday/libcore/src/data/numbervalue.cpp index 041f88fa99..ee7e238109 100644 --- a/doomsday/libdeng2/src/data/numbervalue.cpp +++ b/doomsday/libcore/src/data/numbervalue.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/path.cpp b/doomsday/libcore/src/data/path.cpp similarity index 100% rename from doomsday/libdeng2/src/data/path.cpp rename to doomsday/libcore/src/data/path.cpp diff --git a/doomsday/libdeng2/src/data/pathtree.cpp b/doomsday/libcore/src/data/pathtree.cpp similarity index 100% rename from doomsday/libdeng2/src/data/pathtree.cpp rename to doomsday/libcore/src/data/pathtree.cpp diff --git a/doomsday/libdeng2/src/data/pathtreenode.cpp b/doomsday/libcore/src/data/pathtreenode.cpp similarity index 100% rename from doomsday/libdeng2/src/data/pathtreenode.cpp rename to doomsday/libcore/src/data/pathtreenode.cpp diff --git a/doomsday/libdeng2/src/data/reader.cpp b/doomsday/libcore/src/data/reader.cpp similarity index 99% rename from doomsday/libdeng2/src/data/reader.cpp rename to doomsday/libcore/src/data/reader.cpp index 6548654d09..4876458078 100644 --- a/doomsday/libdeng2/src/data/reader.cpp +++ b/doomsday/libcore/src/data/reader.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/record.cpp b/doomsday/libcore/src/data/record.cpp similarity index 99% rename from doomsday/libdeng2/src/data/record.cpp rename to doomsday/libcore/src/data/record.cpp index d4607fe3dc..282c5c8380 100644 --- a/doomsday/libdeng2/src/data/record.cpp +++ b/doomsday/libcore/src/data/record.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/recordvalue.cpp b/doomsday/libcore/src/data/recordvalue.cpp similarity index 99% rename from doomsday/libdeng2/src/data/recordvalue.cpp rename to doomsday/libcore/src/data/recordvalue.cpp index 2c68d1f1ee..9150c709ab 100644 --- a/doomsday/libdeng2/src/data/recordvalue.cpp +++ b/doomsday/libcore/src/data/recordvalue.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/refuge.cpp b/doomsday/libcore/src/data/refuge.cpp similarity index 100% rename from doomsday/libdeng2/src/data/refuge.cpp rename to doomsday/libcore/src/data/refuge.cpp diff --git a/doomsday/libdeng2/src/data/refvalue.cpp b/doomsday/libcore/src/data/refvalue.cpp similarity index 98% rename from doomsday/libdeng2/src/data/refvalue.cpp rename to doomsday/libcore/src/data/refvalue.cpp index 5f2a431c02..1ac57b68c3 100644 --- a/doomsday/libdeng2/src/data/refvalue.cpp +++ b/doomsday/libcore/src/data/refvalue.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/string.cpp b/doomsday/libcore/src/data/string.cpp similarity index 99% rename from doomsday/libdeng2/src/data/string.cpp rename to doomsday/libcore/src/data/string.cpp index 6e1916e691..bd38ca0380 100644 --- a/doomsday/libdeng2/src/data/string.cpp +++ b/doomsday/libcore/src/data/string.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/stringpool.cpp b/doomsday/libcore/src/data/stringpool.cpp similarity index 100% rename from doomsday/libdeng2/src/data/stringpool.cpp rename to doomsday/libcore/src/data/stringpool.cpp diff --git a/doomsday/libdeng2/src/data/textvalue.cpp b/doomsday/libcore/src/data/textvalue.cpp similarity index 99% rename from doomsday/libdeng2/src/data/textvalue.cpp rename to doomsday/libcore/src/data/textvalue.cpp index f806cfd6bb..4572060853 100644 --- a/doomsday/libdeng2/src/data/textvalue.cpp +++ b/doomsday/libcore/src/data/textvalue.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/time.cpp b/doomsday/libcore/src/data/time.cpp similarity index 99% rename from doomsday/libdeng2/src/data/time.cpp rename to doomsday/libcore/src/data/time.cpp index 74a7d13228..1b8d289f90 100644 --- a/doomsday/libdeng2/src/data/time.cpp +++ b/doomsday/libcore/src/data/time.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/timevalue.cpp b/doomsday/libcore/src/data/timevalue.cpp similarity index 100% rename from doomsday/libdeng2/src/data/timevalue.cpp rename to doomsday/libcore/src/data/timevalue.cpp diff --git a/doomsday/libdeng2/src/data/value.cpp b/doomsday/libcore/src/data/value.cpp similarity index 99% rename from doomsday/libdeng2/src/data/value.cpp rename to doomsday/libcore/src/data/value.cpp index f128642e08..e44ee55051 100644 --- a/doomsday/libdeng2/src/data/value.cpp +++ b/doomsday/libcore/src/data/value.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/variable.cpp b/doomsday/libcore/src/data/variable.cpp similarity index 99% rename from doomsday/libdeng2/src/data/variable.cpp rename to doomsday/libcore/src/data/variable.cpp index 4c4f0df345..fae04da295 100644 --- a/doomsday/libdeng2/src/data/variable.cpp +++ b/doomsday/libcore/src/data/variable.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/writer.cpp b/doomsday/libcore/src/data/writer.cpp similarity index 99% rename from doomsday/libdeng2/src/data/writer.cpp rename to doomsday/libcore/src/data/writer.cpp index 077539e29b..43b5b88dbc 100644 --- a/doomsday/libdeng2/src/data/writer.cpp +++ b/doomsday/libcore/src/data/writer.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/data/ziparchive.cpp b/doomsday/libcore/src/data/ziparchive.cpp similarity index 99% rename from doomsday/libdeng2/src/data/ziparchive.cpp rename to doomsday/libcore/src/data/ziparchive.cpp index 1d027c421d..a6c8beafff 100644 --- a/doomsday/libdeng2/src/data/ziparchive.cpp +++ b/doomsday/libcore/src/data/ziparchive.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/error.cpp b/doomsday/libcore/src/error.cpp similarity index 100% rename from doomsday/libdeng2/src/error.cpp rename to doomsday/libcore/src/error.cpp diff --git a/doomsday/libdeng2/src/filesys/archiveentryfile.cpp b/doomsday/libcore/src/filesys/archiveentryfile.cpp similarity index 98% rename from doomsday/libdeng2/src/filesys/archiveentryfile.cpp rename to doomsday/libcore/src/filesys/archiveentryfile.cpp index 84c151a110..3a02a8aef2 100644 --- a/doomsday/libdeng2/src/filesys/archiveentryfile.cpp +++ b/doomsday/libcore/src/filesys/archiveentryfile.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/filesys/archivefeed.cpp b/doomsday/libcore/src/filesys/archivefeed.cpp similarity index 100% rename from doomsday/libdeng2/src/filesys/archivefeed.cpp rename to doomsday/libcore/src/filesys/archivefeed.cpp diff --git a/doomsday/libdeng2/src/filesys/bytearrayfile.cpp b/doomsday/libcore/src/filesys/bytearrayfile.cpp similarity index 97% rename from doomsday/libdeng2/src/filesys/bytearrayfile.cpp rename to doomsday/libcore/src/filesys/bytearrayfile.cpp index 47d3295780..66e43bfd0c 100644 --- a/doomsday/libdeng2/src/filesys/bytearrayfile.cpp +++ b/doomsday/libcore/src/filesys/bytearrayfile.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2012-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/filesys/directoryfeed.cpp b/doomsday/libcore/src/filesys/directoryfeed.cpp similarity index 100% rename from doomsday/libdeng2/src/filesys/directoryfeed.cpp rename to doomsday/libcore/src/filesys/directoryfeed.cpp diff --git a/doomsday/libdeng2/src/filesys/feed.cpp b/doomsday/libcore/src/filesys/feed.cpp similarity index 96% rename from doomsday/libdeng2/src/filesys/feed.cpp rename to doomsday/libcore/src/filesys/feed.cpp index 9b5eed52e6..4743872e8a 100644 --- a/doomsday/libdeng2/src/filesys/feed.cpp +++ b/doomsday/libcore/src/filesys/feed.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/filesys/file.cpp b/doomsday/libcore/src/filesys/file.cpp similarity index 99% rename from doomsday/libdeng2/src/filesys/file.cpp rename to doomsday/libcore/src/filesys/file.cpp index 420cff3f6f..09ae3176eb 100644 --- a/doomsday/libdeng2/src/filesys/file.cpp +++ b/doomsday/libcore/src/filesys/file.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/filesys/filesystem.cpp b/doomsday/libcore/src/filesys/filesystem.cpp similarity index 100% rename from doomsday/libdeng2/src/filesys/filesystem.cpp rename to doomsday/libcore/src/filesys/filesystem.cpp diff --git a/doomsday/libdeng2/src/filesys/folder.cpp b/doomsday/libcore/src/filesys/folder.cpp similarity index 99% rename from doomsday/libdeng2/src/filesys/folder.cpp rename to doomsday/libcore/src/filesys/folder.cpp index 7ced9ceeba..63f32b58de 100644 --- a/doomsday/libdeng2/src/filesys/folder.cpp +++ b/doomsday/libcore/src/filesys/folder.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/filesys/libraryfile.cpp b/doomsday/libcore/src/filesys/libraryfile.cpp similarity index 98% rename from doomsday/libdeng2/src/filesys/libraryfile.cpp rename to doomsday/libcore/src/filesys/libraryfile.cpp index 420af1a0b0..c7293f08d9 100644 --- a/doomsday/libdeng2/src/filesys/libraryfile.cpp +++ b/doomsday/libcore/src/filesys/libraryfile.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/filesys/nativefile.cpp b/doomsday/libcore/src/filesys/nativefile.cpp similarity index 99% rename from doomsday/libdeng2/src/filesys/nativefile.cpp rename to doomsday/libcore/src/filesys/nativefile.cpp index 5f4adda074..46440c233b 100644 --- a/doomsday/libdeng2/src/filesys/nativefile.cpp +++ b/doomsday/libcore/src/filesys/nativefile.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/filesys/nativepath.cpp b/doomsday/libcore/src/filesys/nativepath.cpp similarity index 99% rename from doomsday/libdeng2/src/filesys/nativepath.cpp rename to doomsday/libcore/src/filesys/nativepath.cpp index f08e51f5b3..73eb3cabac 100644 --- a/doomsday/libdeng2/src/filesys/nativepath.cpp +++ b/doomsday/libcore/src/filesys/nativepath.cpp @@ -196,7 +196,7 @@ String NativePath::pretty() const return "(app)" + result.mid(contentsPath.length()); } #endif - NativePath homePath = QDir::homePath(); // actual native home dir, not libdeng2 "/home" + NativePath homePath = QDir::homePath(); // actual native home dir, not FS2 "/home" if(result.beginsWith(homePath)) { result = NATIVE_HOME_SYMBOLIC + result.mid(homePath.length()); diff --git a/doomsday/libdeng2/src/filesys/packagefolder.cpp b/doomsday/libcore/src/filesys/packagefolder.cpp similarity index 100% rename from doomsday/libdeng2/src/filesys/packagefolder.cpp rename to doomsday/libcore/src/filesys/packagefolder.cpp diff --git a/doomsday/libdeng2/src/game/game.cpp b/doomsday/libcore/src/game/game.cpp similarity index 100% rename from doomsday/libdeng2/src/game/game.cpp rename to doomsday/libcore/src/game/game.cpp diff --git a/doomsday/libdeng2/src/game/savedsession.cpp b/doomsday/libcore/src/game/savedsession.cpp similarity index 100% rename from doomsday/libdeng2/src/game/savedsession.cpp rename to doomsday/libcore/src/game/savedsession.cpp diff --git a/doomsday/libdeng2/src/game/session.cpp b/doomsday/libcore/src/game/session.cpp similarity index 100% rename from doomsday/libdeng2/src/game/session.cpp rename to doomsday/libcore/src/game/session.cpp diff --git a/doomsday/libdeng2/src/matrix.cpp b/doomsday/libcore/src/matrix.cpp similarity index 100% rename from doomsday/libdeng2/src/matrix.cpp rename to doomsday/libcore/src/matrix.cpp diff --git a/doomsday/libdeng2/src/net/address.cpp b/doomsday/libcore/src/net/address.cpp similarity index 98% rename from doomsday/libdeng2/src/net/address.cpp rename to doomsday/libcore/src/net/address.cpp index f0980d9362..a89c53bcc5 100644 --- a/doomsday/libdeng2/src/net/address.cpp +++ b/doomsday/libcore/src/net/address.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/net/beacon.cpp b/doomsday/libcore/src/net/beacon.cpp similarity index 100% rename from doomsday/libdeng2/src/net/beacon.cpp rename to doomsday/libcore/src/net/beacon.cpp diff --git a/doomsday/libdeng2/src/net/blockpacket.cpp b/doomsday/libcore/src/net/blockpacket.cpp similarity index 100% rename from doomsday/libdeng2/src/net/blockpacket.cpp rename to doomsday/libcore/src/net/blockpacket.cpp diff --git a/doomsday/libdeng2/src/net/identifiedpacket.cpp b/doomsday/libcore/src/net/identifiedpacket.cpp similarity index 100% rename from doomsday/libdeng2/src/net/identifiedpacket.cpp rename to doomsday/libcore/src/net/identifiedpacket.cpp diff --git a/doomsday/libdeng2/src/net/listensocket.cpp b/doomsday/libcore/src/net/listensocket.cpp similarity index 98% rename from doomsday/libdeng2/src/net/listensocket.cpp rename to doomsday/libcore/src/net/listensocket.cpp index 18780510b2..3eba4c37a3 100644 --- a/doomsday/libdeng2/src/net/listensocket.cpp +++ b/doomsday/libcore/src/net/listensocket.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/net/message.cpp b/doomsday/libcore/src/net/message.cpp similarity index 97% rename from doomsday/libdeng2/src/net/message.cpp rename to doomsday/libcore/src/net/message.cpp index 2d90d52b45..a097e4ab37 100644 --- a/doomsday/libdeng2/src/net/message.cpp +++ b/doomsday/libcore/src/net/message.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/net/packet.cpp b/doomsday/libcore/src/net/packet.cpp similarity index 97% rename from doomsday/libdeng2/src/net/packet.cpp rename to doomsday/libcore/src/net/packet.cpp index 662c6d7da4..29513b5451 100644 --- a/doomsday/libdeng2/src/net/packet.cpp +++ b/doomsday/libcore/src/net/packet.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/net/protocol.cpp b/doomsday/libcore/src/net/protocol.cpp similarity index 98% rename from doomsday/libdeng2/src/net/protocol.cpp rename to doomsday/libcore/src/net/protocol.cpp index 94e782c248..6439a6141a 100644 --- a/doomsday/libdeng2/src/net/protocol.cpp +++ b/doomsday/libcore/src/net/protocol.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/net/recordpacket.cpp b/doomsday/libcore/src/net/recordpacket.cpp similarity index 97% rename from doomsday/libdeng2/src/net/recordpacket.cpp rename to doomsday/libcore/src/net/recordpacket.cpp index 81ad2d1693..766e32b4e8 100644 --- a/doomsday/libdeng2/src/net/recordpacket.cpp +++ b/doomsday/libcore/src/net/recordpacket.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/net/socket.cpp b/doomsday/libcore/src/net/socket.cpp similarity index 99% rename from doomsday/libdeng2/src/net/socket.cpp rename to doomsday/libcore/src/net/socket.cpp index 1d7e49ada8..f3e0478a96 100644 --- a/doomsday/libdeng2/src/net/socket.cpp +++ b/doomsday/libcore/src/net/socket.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/net/transmitter.cpp b/doomsday/libcore/src/net/transmitter.cpp similarity index 96% rename from doomsday/libdeng2/src/net/transmitter.cpp rename to doomsday/libcore/src/net/transmitter.cpp index 54557cd581..dcd58995dd 100644 --- a/doomsday/libdeng2/src/net/transmitter.cpp +++ b/doomsday/libcore/src/net/transmitter.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/precompiled.h b/doomsday/libcore/src/precompiled.h similarity index 96% rename from doomsday/libdeng2/src/precompiled.h rename to doomsday/libcore/src/precompiled.h index 79c860354e..4b88cee472 100644 --- a/doomsday/libdeng2/src/precompiled.h +++ b/doomsday/libcore/src/precompiled.h @@ -1,4 +1,4 @@ -/** @file precompiled.h Precompiled headers for libdeng2. +/** @file precompiled.h Precompiled headers for libcore. * * @authors Copyright (c) 2014 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/arrayexpression.cpp b/doomsday/libcore/src/scriptsys/arrayexpression.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/arrayexpression.cpp rename to doomsday/libcore/src/scriptsys/arrayexpression.cpp index 13c9774816..d116f3be3a 100644 --- a/doomsday/libdeng2/src/scriptsys/arrayexpression.cpp +++ b/doomsday/libcore/src/scriptsys/arrayexpression.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/assignstatement.cpp b/doomsday/libcore/src/scriptsys/assignstatement.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/assignstatement.cpp rename to doomsday/libcore/src/scriptsys/assignstatement.cpp index 845c560710..f7d4c65515 100644 --- a/doomsday/libdeng2/src/scriptsys/assignstatement.cpp +++ b/doomsday/libcore/src/scriptsys/assignstatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/builtinexpression.cpp b/doomsday/libcore/src/scriptsys/builtinexpression.cpp similarity index 99% rename from doomsday/libdeng2/src/scriptsys/builtinexpression.cpp rename to doomsday/libcore/src/scriptsys/builtinexpression.cpp index 63d66b4509..f819dafd6f 100644 --- a/doomsday/libdeng2/src/scriptsys/builtinexpression.cpp +++ b/doomsday/libcore/src/scriptsys/builtinexpression.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/catchstatement.cpp b/doomsday/libcore/src/scriptsys/catchstatement.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/catchstatement.cpp rename to doomsday/libcore/src/scriptsys/catchstatement.cpp index 343d5e0086..ed789c792c 100644 --- a/doomsday/libdeng2/src/scriptsys/catchstatement.cpp +++ b/doomsday/libcore/src/scriptsys/catchstatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/compound.cpp b/doomsday/libcore/src/scriptsys/compound.cpp similarity index 97% rename from doomsday/libdeng2/src/scriptsys/compound.cpp rename to doomsday/libcore/src/scriptsys/compound.cpp index a675591cbb..9b2dce12e2 100644 --- a/doomsday/libdeng2/src/scriptsys/compound.cpp +++ b/doomsday/libcore/src/scriptsys/compound.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/constantexpression.cpp b/doomsday/libcore/src/scriptsys/constantexpression.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/constantexpression.cpp rename to doomsday/libcore/src/scriptsys/constantexpression.cpp index 615b7171ec..25e50a6ea2 100644 --- a/doomsday/libdeng2/src/scriptsys/constantexpression.cpp +++ b/doomsday/libcore/src/scriptsys/constantexpression.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/context.cpp b/doomsday/libcore/src/scriptsys/context.cpp similarity index 99% rename from doomsday/libdeng2/src/scriptsys/context.cpp rename to doomsday/libcore/src/scriptsys/context.cpp index 05120e5bbb..9a1c33ed9f 100644 --- a/doomsday/libdeng2/src/scriptsys/context.cpp +++ b/doomsday/libcore/src/scriptsys/context.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/deletestatement.cpp b/doomsday/libcore/src/scriptsys/deletestatement.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/deletestatement.cpp rename to doomsday/libcore/src/scriptsys/deletestatement.cpp index dc117689a0..91f82f0d71 100644 --- a/doomsday/libdeng2/src/scriptsys/deletestatement.cpp +++ b/doomsday/libcore/src/scriptsys/deletestatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2012-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/dictionaryexpression.cpp b/doomsday/libcore/src/scriptsys/dictionaryexpression.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/dictionaryexpression.cpp rename to doomsday/libcore/src/scriptsys/dictionaryexpression.cpp index 02d2f0d837..ec9d589118 100644 --- a/doomsday/libdeng2/src/scriptsys/dictionaryexpression.cpp +++ b/doomsday/libcore/src/scriptsys/dictionaryexpression.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/evaluator.cpp b/doomsday/libcore/src/scriptsys/evaluator.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/evaluator.cpp rename to doomsday/libcore/src/scriptsys/evaluator.cpp index f8028d66b3..6037660537 100644 --- a/doomsday/libdeng2/src/scriptsys/evaluator.cpp +++ b/doomsday/libcore/src/scriptsys/evaluator.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/expression.cpp b/doomsday/libcore/src/scriptsys/expression.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/expression.cpp rename to doomsday/libcore/src/scriptsys/expression.cpp index e84b90fc2e..824694f6f4 100644 --- a/doomsday/libdeng2/src/scriptsys/expression.cpp +++ b/doomsday/libcore/src/scriptsys/expression.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/expressionstatement.cpp b/doomsday/libcore/src/scriptsys/expressionstatement.cpp similarity index 97% rename from doomsday/libdeng2/src/scriptsys/expressionstatement.cpp rename to doomsday/libcore/src/scriptsys/expressionstatement.cpp index 14241f2a78..586f43c144 100644 --- a/doomsday/libdeng2/src/scriptsys/expressionstatement.cpp +++ b/doomsday/libcore/src/scriptsys/expressionstatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/flowstatement.cpp b/doomsday/libcore/src/scriptsys/flowstatement.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/flowstatement.cpp rename to doomsday/libcore/src/scriptsys/flowstatement.cpp index 759af51e7d..73b98f973c 100644 --- a/doomsday/libdeng2/src/scriptsys/flowstatement.cpp +++ b/doomsday/libcore/src/scriptsys/flowstatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/forstatement.cpp b/doomsday/libcore/src/scriptsys/forstatement.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/forstatement.cpp rename to doomsday/libcore/src/scriptsys/forstatement.cpp index 2570283c8c..2ef17473a6 100644 --- a/doomsday/libdeng2/src/scriptsys/forstatement.cpp +++ b/doomsday/libcore/src/scriptsys/forstatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/function.cpp b/doomsday/libcore/src/scriptsys/function.cpp similarity index 99% rename from doomsday/libdeng2/src/scriptsys/function.cpp rename to doomsday/libcore/src/scriptsys/function.cpp index c59a78d21c..ce9900c933 100644 --- a/doomsday/libdeng2/src/scriptsys/function.cpp +++ b/doomsday/libcore/src/scriptsys/function.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/functionstatement.cpp b/doomsday/libcore/src/scriptsys/functionstatement.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/functionstatement.cpp rename to doomsday/libcore/src/scriptsys/functionstatement.cpp index a814412059..e08355f216 100644 --- a/doomsday/libdeng2/src/scriptsys/functionstatement.cpp +++ b/doomsday/libcore/src/scriptsys/functionstatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/functionvalue.cpp b/doomsday/libcore/src/scriptsys/functionvalue.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/functionvalue.cpp rename to doomsday/libcore/src/scriptsys/functionvalue.cpp index 64b126dc43..297438e0a7 100644 --- a/doomsday/libdeng2/src/scriptsys/functionvalue.cpp +++ b/doomsday/libcore/src/scriptsys/functionvalue.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/ifstatement.cpp b/doomsday/libcore/src/scriptsys/ifstatement.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/ifstatement.cpp rename to doomsday/libcore/src/scriptsys/ifstatement.cpp index a5e94b7fe5..cd373fc13b 100644 --- a/doomsday/libdeng2/src/scriptsys/ifstatement.cpp +++ b/doomsday/libcore/src/scriptsys/ifstatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/lex.cpp b/doomsday/libcore/src/scriptsys/lex.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/lex.cpp rename to doomsday/libcore/src/scriptsys/lex.cpp index 2a1e9aa6ce..043a85b50b 100644 --- a/doomsday/libdeng2/src/scriptsys/lex.cpp +++ b/doomsday/libcore/src/scriptsys/lex.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/module.cpp b/doomsday/libcore/src/scriptsys/module.cpp similarity index 97% rename from doomsday/libdeng2/src/scriptsys/module.cpp rename to doomsday/libcore/src/scriptsys/module.cpp index 60495ad3ef..b5a962785b 100644 --- a/doomsday/libdeng2/src/scriptsys/module.cpp +++ b/doomsday/libcore/src/scriptsys/module.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/nameexpression.cpp b/doomsday/libcore/src/scriptsys/nameexpression.cpp similarity index 99% rename from doomsday/libdeng2/src/scriptsys/nameexpression.cpp rename to doomsday/libcore/src/scriptsys/nameexpression.cpp index 669a8345bc..5ba9027e9e 100644 --- a/doomsday/libdeng2/src/scriptsys/nameexpression.cpp +++ b/doomsday/libcore/src/scriptsys/nameexpression.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/operator.cpp b/doomsday/libcore/src/scriptsys/operator.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/operator.cpp rename to doomsday/libcore/src/scriptsys/operator.cpp index a7e8eb7c5c..6ecf308f7f 100644 --- a/doomsday/libdeng2/src/scriptsys/operator.cpp +++ b/doomsday/libcore/src/scriptsys/operator.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/operatorexpression.cpp b/doomsday/libcore/src/scriptsys/operatorexpression.cpp similarity index 99% rename from doomsday/libdeng2/src/scriptsys/operatorexpression.cpp rename to doomsday/libcore/src/scriptsys/operatorexpression.cpp index bc529387b2..51a1927990 100644 --- a/doomsday/libdeng2/src/scriptsys/operatorexpression.cpp +++ b/doomsday/libcore/src/scriptsys/operatorexpression.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/parser.cpp b/doomsday/libcore/src/scriptsys/parser.cpp similarity index 99% rename from doomsday/libdeng2/src/scriptsys/parser.cpp rename to doomsday/libcore/src/scriptsys/parser.cpp index a3754cf858..45cb62d331 100644 --- a/doomsday/libdeng2/src/scriptsys/parser.cpp +++ b/doomsday/libcore/src/scriptsys/parser.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/printstatement.cpp b/doomsday/libcore/src/scriptsys/printstatement.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/printstatement.cpp rename to doomsday/libcore/src/scriptsys/printstatement.cpp index b7da377bc9..a5cf9f951f 100644 --- a/doomsday/libdeng2/src/scriptsys/printstatement.cpp +++ b/doomsday/libcore/src/scriptsys/printstatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/process.cpp b/doomsday/libcore/src/scriptsys/process.cpp similarity index 99% rename from doomsday/libdeng2/src/scriptsys/process.cpp rename to doomsday/libcore/src/scriptsys/process.cpp index eb663f2c57..6f98b4ce22 100644 --- a/doomsday/libdeng2/src/scriptsys/process.cpp +++ b/doomsday/libcore/src/scriptsys/process.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/script.cpp b/doomsday/libcore/src/scriptsys/script.cpp similarity index 96% rename from doomsday/libdeng2/src/scriptsys/script.cpp rename to doomsday/libcore/src/scriptsys/script.cpp index e427e097b6..7837bdf0c7 100644 --- a/doomsday/libdeng2/src/scriptsys/script.cpp +++ b/doomsday/libcore/src/scriptsys/script.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/scriptedinfo.cpp b/doomsday/libcore/src/scriptsys/scriptedinfo.cpp similarity index 100% rename from doomsday/libdeng2/src/scriptsys/scriptedinfo.cpp rename to doomsday/libcore/src/scriptsys/scriptedinfo.cpp diff --git a/doomsday/libdeng2/src/scriptsys/scriptlex.cpp b/doomsday/libcore/src/scriptsys/scriptlex.cpp similarity index 99% rename from doomsday/libdeng2/src/scriptsys/scriptlex.cpp rename to doomsday/libcore/src/scriptsys/scriptlex.cpp index 820f83a005..40b915fef4 100644 --- a/doomsday/libdeng2/src/scriptsys/scriptlex.cpp +++ b/doomsday/libcore/src/scriptsys/scriptlex.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/scriptsystem.cpp b/doomsday/libcore/src/scriptsys/scriptsystem.cpp similarity index 100% rename from doomsday/libdeng2/src/scriptsys/scriptsystem.cpp rename to doomsday/libcore/src/scriptsys/scriptsystem.cpp diff --git a/doomsday/libdeng2/src/scriptsys/statement.cpp b/doomsday/libcore/src/scriptsys/statement.cpp similarity index 98% rename from doomsday/libdeng2/src/scriptsys/statement.cpp rename to doomsday/libcore/src/scriptsys/statement.cpp index b1011c23a7..7fd48e9c07 100644 --- a/doomsday/libdeng2/src/scriptsys/statement.cpp +++ b/doomsday/libcore/src/scriptsys/statement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/tokenbuffer.cpp b/doomsday/libcore/src/scriptsys/tokenbuffer.cpp similarity index 99% rename from doomsday/libdeng2/src/scriptsys/tokenbuffer.cpp rename to doomsday/libcore/src/scriptsys/tokenbuffer.cpp index 326c395585..3c28ad6c5b 100644 --- a/doomsday/libdeng2/src/scriptsys/tokenbuffer.cpp +++ b/doomsday/libcore/src/scriptsys/tokenbuffer.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/tokenrange.cpp b/doomsday/libcore/src/scriptsys/tokenrange.cpp similarity index 99% rename from doomsday/libdeng2/src/scriptsys/tokenrange.cpp rename to doomsday/libcore/src/scriptsys/tokenrange.cpp index 1f60648e05..d5ac0728ff 100644 --- a/doomsday/libdeng2/src/scriptsys/tokenrange.cpp +++ b/doomsday/libcore/src/scriptsys/tokenrange.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/trystatement.cpp b/doomsday/libcore/src/scriptsys/trystatement.cpp similarity index 97% rename from doomsday/libdeng2/src/scriptsys/trystatement.cpp rename to doomsday/libcore/src/scriptsys/trystatement.cpp index 86bd6efa36..bb2348e930 100644 --- a/doomsday/libdeng2/src/scriptsys/trystatement.cpp +++ b/doomsday/libcore/src/scriptsys/trystatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2009-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/scriptsys/whilestatement.cpp b/doomsday/libcore/src/scriptsys/whilestatement.cpp similarity index 97% rename from doomsday/libdeng2/src/scriptsys/whilestatement.cpp rename to doomsday/libcore/src/scriptsys/whilestatement.cpp index 5b967d9a8d..f03fbda68e 100644 --- a/doomsday/libdeng2/src/scriptsys/whilestatement.cpp +++ b/doomsday/libcore/src/scriptsys/whilestatement.cpp @@ -1,5 +1,5 @@ /* - * The Doomsday Engine Project -- libdeng2 + * The Doomsday Engine Project -- libcore * * Copyright © 2004-2013 Jaakko Keränen * diff --git a/doomsday/libdeng2/src/version.cpp b/doomsday/libcore/src/version.cpp similarity index 98% rename from doomsday/libdeng2/src/version.cpp rename to doomsday/libcore/src/version.cpp index e166711cb7..c9aa4b07c8 100644 --- a/doomsday/libdeng2/src/version.cpp +++ b/doomsday/libcore/src/version.cpp @@ -1,6 +1,6 @@ /** * @file version.cpp - * Version numbering and labeling for libdeng2. + * Version numbering and labeling for libcore. * * @authors Copyright © 2011-2013 Jaakko Keränen * @authors Copyright © 2011-2013 Daniel Swanson diff --git a/doomsday/libdeng2/src/widgets/action.cpp b/doomsday/libcore/src/widgets/action.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/action.cpp rename to doomsday/libcore/src/widgets/action.cpp diff --git a/doomsday/libdeng2/src/widgets/animation.cpp b/doomsday/libcore/src/widgets/animation.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/animation.cpp rename to doomsday/libcore/src/widgets/animation.cpp diff --git a/doomsday/libdeng2/src/widgets/constantrule.cpp b/doomsday/libcore/src/widgets/constantrule.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/constantrule.cpp rename to doomsday/libcore/src/widgets/constantrule.cpp diff --git a/doomsday/libdeng2/src/widgets/indirectrule.cpp b/doomsday/libcore/src/widgets/indirectrule.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/indirectrule.cpp rename to doomsday/libcore/src/widgets/indirectrule.cpp diff --git a/doomsday/libdeng2/src/widgets/operatorrule.cpp b/doomsday/libcore/src/widgets/operatorrule.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/operatorrule.cpp rename to doomsday/libcore/src/widgets/operatorrule.cpp diff --git a/doomsday/libdeng2/src/widgets/rootwidget.cpp b/doomsday/libcore/src/widgets/rootwidget.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/rootwidget.cpp rename to doomsday/libcore/src/widgets/rootwidget.cpp diff --git a/doomsday/libdeng2/src/widgets/rule.cpp b/doomsday/libcore/src/widgets/rule.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/rule.cpp rename to doomsday/libcore/src/widgets/rule.cpp diff --git a/doomsday/libdeng2/src/widgets/rulebank.cpp b/doomsday/libcore/src/widgets/rulebank.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/rulebank.cpp rename to doomsday/libcore/src/widgets/rulebank.cpp diff --git a/doomsday/libdeng2/src/widgets/rulerectangle.cpp b/doomsday/libcore/src/widgets/rulerectangle.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/rulerectangle.cpp rename to doomsday/libcore/src/widgets/rulerectangle.cpp diff --git a/doomsday/libdeng2/src/widgets/scalarrule.cpp b/doomsday/libcore/src/widgets/scalarrule.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/scalarrule.cpp rename to doomsday/libcore/src/widgets/scalarrule.cpp diff --git a/doomsday/libdeng2/src/widgets/widget.cpp b/doomsday/libcore/src/widgets/widget.cpp similarity index 100% rename from doomsday/libdeng2/src/widgets/widget.cpp rename to doomsday/libcore/src/widgets/widget.cpp diff --git a/doomsday/libdeng2/widgets.pri b/doomsday/libcore/widgets.pri similarity index 100% rename from doomsday/libdeng2/widgets.pri rename to doomsday/libcore/widgets.pri diff --git a/doomsday/libgui/gui.doxy b/doomsday/libgui/gui.doxy index c12eb8310b..3d9bf77236 100644 --- a/doomsday/libgui/gui.doxy +++ b/doomsday/libgui/gui.doxy @@ -3,7 +3,7 @@ PROJECT_NAME = "libgui" PROJECT_NUMBER = 1.15.0 -PROJECT_BRIEF = "GUI extension for libdeng2" +PROJECT_BRIEF = "Graphics, Audio and Input Library" OUTPUT_DIRECTORY = ../apidoc/gui/ INPUT = include src diff --git a/doomsday/libgui/include/de/graphics/drawable.h b/doomsday/libgui/include/de/graphics/drawable.h index 4d8faf0aef..52e25299c3 100644 --- a/doomsday/libgui/include/de/graphics/drawable.h +++ b/doomsday/libgui/include/de/graphics/drawable.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include diff --git a/doomsday/libgui/include/de/graphics/glbuffer.h b/doomsday/libgui/include/de/graphics/glbuffer.h index a15740639a..025e71c00a 100644 --- a/doomsday/libgui/include/de/graphics/glbuffer.h +++ b/doomsday/libgui/include/de/graphics/glbuffer.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include diff --git a/doomsday/libgui/include/de/graphics/glinfo.h b/doomsday/libgui/include/de/graphics/glinfo.h index 1d345853d4..079b40cfd4 100644 --- a/doomsday/libgui/include/de/graphics/glinfo.h +++ b/doomsday/libgui/include/de/graphics/glinfo.h @@ -21,7 +21,7 @@ #include "../gui/libgui.h" -#include +#include namespace de { diff --git a/doomsday/libgui/include/de/graphics/glprogram.h b/doomsday/libgui/include/de/graphics/glprogram.h index 38dcc045b7..cdfcca2a46 100644 --- a/doomsday/libgui/include/de/graphics/glprogram.h +++ b/doomsday/libgui/include/de/graphics/glprogram.h @@ -19,7 +19,7 @@ #ifndef LIBGUI_GLPROGRAM_H #define LIBGUI_GLPROGRAM_H -#include +#include #include #include #include diff --git a/doomsday/libgui/include/de/graphics/glshader.h b/doomsday/libgui/include/de/graphics/glshader.h index 79f9baca09..c56b6d8923 100644 --- a/doomsday/libgui/include/de/graphics/glshader.h +++ b/doomsday/libgui/include/de/graphics/glshader.h @@ -19,7 +19,7 @@ #ifndef LIBGUI_GLSHADER_H #define LIBGUI_GLSHADER_H -#include +#include #include #include #include diff --git a/doomsday/libgui/include/de/graphics/glstate.h b/doomsday/libgui/include/de/graphics/glstate.h index 06f32e07ec..52c82e20a3 100644 --- a/doomsday/libgui/include/de/graphics/glstate.h +++ b/doomsday/libgui/include/de/graphics/glstate.h @@ -23,7 +23,7 @@ #ifndef LIBGUI_GLSTATE_H #define LIBGUI_GLSTATE_H -#include +#include #include #include diff --git a/doomsday/libgui/include/de/graphics/gltarget.h b/doomsday/libgui/include/de/graphics/gltarget.h index cb48282699..200c69e98e 100644 --- a/doomsday/libgui/include/de/graphics/gltarget.h +++ b/doomsday/libgui/include/de/graphics/gltarget.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include diff --git a/doomsday/libgui/include/de/graphics/gltexture.h b/doomsday/libgui/include/de/graphics/gltexture.h index 5643aa1f46..887109cfca 100644 --- a/doomsday/libgui/include/de/graphics/gltexture.h +++ b/doomsday/libgui/include/de/graphics/gltexture.h @@ -19,7 +19,7 @@ #ifndef LIBGUI_GLTEXTURE_H #define LIBGUI_GLTEXTURE_H -#include +#include #include #include diff --git a/doomsday/libgui/include/de/graphics/gluniform.h b/doomsday/libgui/include/de/graphics/gluniform.h index 9b0c0ff333..712eac1f45 100644 --- a/doomsday/libgui/include/de/graphics/gluniform.h +++ b/doomsday/libgui/include/de/graphics/gluniform.h @@ -19,7 +19,7 @@ #ifndef LIBGUI_GLUNIFORM_H #define LIBGUI_GLUNIFORM_H -#include +#include #include #include #include diff --git a/doomsday/libgui/include/de/gui/canvas.h b/doomsday/libgui/include/de/gui/canvas.h index 480b8da46c..f382cceaa4 100644 --- a/doomsday/libgui/include/de/gui/canvas.h +++ b/doomsday/libgui/include/de/gui/canvas.h @@ -20,7 +20,7 @@ #define LIBGUI_CANVAS_H #include -#include +#include #include #include diff --git a/doomsday/libgui/include/de/gui/displaymode.h b/doomsday/libgui/include/de/gui/displaymode.h index 0da5f27c8c..5f42f095b4 100644 --- a/doomsday/libgui/include/de/gui/displaymode.h +++ b/doomsday/libgui/include/de/gui/displaymode.h @@ -28,7 +28,7 @@ #define LIBGUI_DISPLAYMODE_H #include "libgui.h" -#include "de/libdeng2.h" +#include "de/libcore.h" #ifdef __cplusplus extern "C" { diff --git a/doomsday/libgui/include/de/text/font.h b/doomsday/libgui/include/de/text/font.h index 8267088caf..54889809e2 100644 --- a/doomsday/libgui/include/de/text/font.h +++ b/doomsday/libgui/include/de/text/font.h @@ -19,7 +19,7 @@ #ifndef LIBGUI_FONT_H #define LIBGUI_FONT_H -#include +#include #include #include #include diff --git a/doomsday/libgui/libgui.pro b/doomsday/libgui/libgui.pro index 8a2d72990b..85454e8210 100644 --- a/doomsday/libgui/libgui.pro +++ b/doomsday/libgui/libgui.pro @@ -1,4 +1,4 @@ -# The Doomsday Engine Project -- GUI Extension for libdeng2 +# The Doomsday Engine Project -- Graphics, Audio and Input Library # Copyright (c) 2013 Jaakko Keränen # # This program is distributed under the GNU Lesser General Public License @@ -13,7 +13,7 @@ VERSION = $$DENG_VERSION CONFIG += deng_qtgui deng_qtopengl -include(../dep_deng2.pri) +include(../dep_core.pri) include(../dep_opengl.pri) include(../dep_assimp.pri) @@ -216,7 +216,7 @@ OTHER_FILES += \ # Installation --------------------------------------------------------------- macx { - linkDylibToBundledLibdeng2(libdeng_gui) + linkDylibToBundledLibcore(libdeng_gui) doPostLink("install_name_tool -id @executable_path/../Frameworks/libdeng_gui.1.dylib libdeng_gui.1.dylib") diff --git a/doomsday/libgui/src/displaymode_dummy.cpp b/doomsday/libgui/src/displaymode_dummy.cpp index 1cc86475cd..c43ce8a77f 100644 --- a/doomsday/libgui/src/displaymode_dummy.cpp +++ b/doomsday/libgui/src/displaymode_dummy.cpp @@ -19,7 +19,7 @@ */ #include "de/gui/displaymode_native.h" -#include +#include void DisplayMode_Native_Init(void) { diff --git a/doomsday/libgui/src/displaymode_macx.mm b/doomsday/libgui/src/displaymode_macx.mm index f4a0ed246b..c6059b22b5 100644 --- a/doomsday/libgui/src/displaymode_macx.mm +++ b/doomsday/libgui/src/displaymode_macx.mm @@ -24,7 +24,7 @@ #include #include -//#include "de/libdeng2.h" +//#include "de/libcore.h" #include "de/gui/displaymode_native.h" /// Returns -1 on error. diff --git a/doomsday/libgui/src/graphics/modeldrawable.cpp b/doomsday/libgui/src/graphics/modeldrawable.cpp index 54ed147c20..ab90d7634a 100644 --- a/doomsday/libgui/src/graphics/modeldrawable.cpp +++ b/doomsday/libgui/src/graphics/modeldrawable.cpp @@ -96,7 +96,7 @@ class ImpIOStream : public Assimp::IOStream size_t _pos; }; -/// Adapter between libdeng2 FS and Assimp. +/// Adapter between FS2 and Assimp. struct ImpIOSystem : public Assimp::IOSystem { ImpIOSystem() {} @@ -235,7 +235,7 @@ DENG2_PIMPL(ModelDrawable) , program(0) , uBoneMatrices("uBoneMatrices", GLUniform::Mat4Array, MAX_BONES) { - // Use libdeng2 for file access. + // Use FS2 for file access. importer.SetIOHandler(new ImpIOSystem); // Get most kinds of log output. diff --git a/doomsday/liblegacy/include/de/liblegacy.h b/doomsday/liblegacy/include/de/liblegacy.h index d940356d31..f1cd42284f 100644 --- a/doomsday/liblegacy/include/de/liblegacy.h +++ b/doomsday/liblegacy/include/de/liblegacy.h @@ -38,7 +38,7 @@ /* * The DENG_PUBLIC macro is used for declaring exported symbols. It must be * applied in all exported classes and functions. DEF files are not used for - * exporting symbols out of libdeng2. + * exporting symbols out of liblegacy. */ #if defined(_WIN32) && defined(_MSC_VER) # ifdef __DENG__ diff --git a/doomsday/liblegacy/include/de/reader.h b/doomsday/liblegacy/include/de/reader.h index da23833aea..50c2e8e575 100644 --- a/doomsday/liblegacy/include/de/reader.h +++ b/doomsday/liblegacy/include/de/reader.h @@ -13,7 +13,7 @@ * * @see writer.h, Writer * - * @todo This should be converted into a C wrapper for the libdeng2 de::Reader. + * @todo This should be converted into a C wrapper for de::Reader. * * @authors Copyright © 2011-2013 Jaakko Keränen * diff --git a/doomsday/liblegacy/include/de/writer.h b/doomsday/liblegacy/include/de/writer.h index 7ec61cd5c0..9b807fa6fa 100644 --- a/doomsday/liblegacy/include/de/writer.h +++ b/doomsday/liblegacy/include/de/writer.h @@ -15,7 +15,7 @@ * * @see reader.h, Reader * - * @todo This should be converted into a C wrapper for the libdeng2 de::Writer. + * @todo This should be converted into a C wrapper for de::Writer. * * @authors Copyright © 2011-2013 Jaakko Keränen * diff --git a/doomsday/liblegacy/liblegacy.pro b/doomsday/liblegacy/liblegacy.pro index b3eabf06b4..24ceb35537 100644 --- a/doomsday/liblegacy/liblegacy.pro +++ b/doomsday/liblegacy/liblegacy.pro @@ -14,7 +14,7 @@ VERSION = $$DENG_VERSION # External Dependencies ------------------------------------------------------ -include(../dep_deng2.pri) +include(../dep_core.pri) win32 { LIBS += -lwinmm @@ -126,7 +126,7 @@ else:unix { # Installation --------------------------------------------------------------- macx { - linkDylibToBundledLibdeng2(libdeng_legacy) + linkDylibToBundledLibcore(libdeng_legacy) doPostLink("install_name_tool -id @executable_path/../Frameworks/libdeng_legacy.1.dylib libdeng_legacy.1.dylib") diff --git a/doomsday/libshell/include/de/shell/abstractlineeditor.h b/doomsday/libshell/include/de/shell/abstractlineeditor.h index aa438dd81e..2458c5072e 100644 --- a/doomsday/libshell/include/de/shell/abstractlineeditor.h +++ b/doomsday/libshell/include/de/shell/abstractlineeditor.h @@ -21,7 +21,7 @@ #include "libshell.h" #include "ITextEditor" -#include +#include #include #include diff --git a/doomsday/libshell/libshell.pro b/doomsday/libshell/libshell.pro index 1e1a4a3da9..33df54db9c 100644 --- a/doomsday/libshell/libshell.pro +++ b/doomsday/libshell/libshell.pro @@ -11,7 +11,7 @@ TEMPLATE = lib TARGET = deng_shell VERSION = 0.1.0 -include(../dep_deng2.pri) +include(../dep_core.pri) win32 { # Keep the version number out of the file name. @@ -107,7 +107,7 @@ SOURCES += \ # Installation --------------------------------------------------------------- macx { - linkDylibToBundledLibdeng2(libdeng_shell) + linkDylibToBundledLibcore(libdeng_shell) doPostLink("install_name_tool -id @executable_path/../Frameworks/libdeng_shell.0.dylib libdeng_shell.0.dylib") diff --git a/doomsday/libshell/src/localserver.cpp b/doomsday/libshell/src/localserver.cpp index fa07a377b1..3aee5e908c 100644 --- a/doomsday/libshell/src/localserver.cpp +++ b/doomsday/libshell/src/localserver.cpp @@ -96,7 +96,7 @@ void LocalServer::start(duint16 port, } /** - * @todo These options will be much simpler when libdeng2 FS is used for + * @todo These options will be much simpler when FS2 is used for * all file access. */ diff --git a/doomsday/plugins/config_plugin.pri b/doomsday/plugins/config_plugin.pri index 6ea5ca52b6..68892059e1 100644 --- a/doomsday/plugins/config_plugin.pri +++ b/doomsday/plugins/config_plugin.pri @@ -1,7 +1,7 @@ include(../config.pri) # Use the full API for all plugins. -CONFIG += dengplugin_libdeng2_full +CONFIG += dengplugin_libcore_full deng_noclient { CONFIG += libgui_headers_only @@ -18,11 +18,11 @@ win32 { INCLUDEPATH += $$DENG_API_DIR -!dengplugin_libdeng2_full { - # The libdeng2 C wrapper can be used from all plugins. +!dengplugin_libcore_full { + # The libcore C wrapper can be used from all plugins. DEFINES += DENG_NO_QT DENG2_C_API_ONLY - include(../dep_deng2_cwrapper.pri) + include(../dep_core_cwrapper.pri) } -else: include(../dep_deng2.pri) +else: include(../dep_core.pri) include(../dep_legacy.pri) diff --git a/doomsday/plugins/dehread/dehread.pro b/doomsday/plugins/dehread/dehread.pro index 19e11c043f..f547ce6480 100644 --- a/doomsday/plugins/dehread/dehread.pro +++ b/doomsday/plugins/dehread/dehread.pro @@ -2,8 +2,8 @@ # Copyright (c) 2011-2013 Jaakko Keränen # Copyright (c) 2011-2013 Daniel Swanson -# This plugin uses the full libdeng2 C++ API. -CONFIG += dengplugin_libdeng2_full +# This plugin uses the full libcore C++ API. +CONFIG += dengplugin_libcore_full include(../config_plugin.pri) @@ -42,6 +42,6 @@ win32 { macx { fixPluginInstallId($$TARGET, 2) - linkToBundledLibdeng2($$TARGET) + linkToBundledLibcore($$TARGET) linkToBundledLiblegacy($$TARGET) } diff --git a/doomsday/plugins/dehread/include/dehread.h b/doomsday/plugins/dehread/include/dehread.h index 3eec9400a6..0c1e188ac1 100644 --- a/doomsday/plugins/dehread/include/dehread.h +++ b/doomsday/plugins/dehread/include/dehread.h @@ -39,7 +39,7 @@ struct font_s; #define DENG_INTERNAL_DATA_ACCESS #include -#include +#include #include DENG_EXTERN_C void DP_Initialize(void); diff --git a/doomsday/plugins/doom/doom.pro b/doomsday/plugins/doom/doom.pro index 9c71b931eb..3fd6e52565 100644 --- a/doomsday/plugins/doom/doom.pro +++ b/doomsday/plugins/doom/doom.pro @@ -102,6 +102,6 @@ win32 { macx { fixPluginInstallId($$TARGET, 1) - linkToBundledLibdeng2($$TARGET) + linkToBundledLibcore($$TARGET) linkToBundledLiblegacy($$TARGET) } diff --git a/doomsday/plugins/doom64/doom64.pro b/doomsday/plugins/doom64/doom64.pro index 0c9788fed1..b0d75a4848 100644 --- a/doomsday/plugins/doom64/doom64.pro +++ b/doomsday/plugins/doom64/doom64.pro @@ -94,7 +94,7 @@ win32 { macx { fixPluginInstallId($$TARGET, 1) - linkToBundledLibdeng2($$TARGET) + linkToBundledLibcore($$TARGET) linkToBundledLiblegacy($$TARGET) } diff --git a/doomsday/plugins/example/src/example.c b/doomsday/plugins/example/src/example.c index a5ef882c10..eab9232db0 100644 --- a/doomsday/plugins/example/src/example.c +++ b/doomsday/plugins/example/src/example.c @@ -1,4 +1,4 @@ -/** @file example.c Example of Doomsday plugin which is called at startup. +/** @file example.c Example of Doomsday plugin that is called at startup. * * @authors Copyright © 2003-2013 Jaakko Keränen * @authors Copyright © 2009-2013 Daniel Swanson @@ -18,7 +18,7 @@ */ #include -#include // libdeng2 C API +#include // libcore C API #include "version.h" /* diff --git a/doomsday/plugins/fluidsynth/fluidsynth.pro b/doomsday/plugins/fluidsynth/fluidsynth.pro index ed75996d63..00cb42b374 100644 --- a/doomsday/plugins/fluidsynth/fluidsynth.pro +++ b/doomsday/plugins/fluidsynth/fluidsynth.pro @@ -1,8 +1,8 @@ # The Doomsday Engine Project # Copyright (c) 2011-2013 Jaakko Keränen -# This plugin uses the full libdeng2 C++ API. -CONFIG += dengplugin_libdeng2_full +# This plugin uses the full libcore C++ API. +CONFIG += dengplugin_libcore_full include(../config_plugin.pri) deng_embedfluidsynth: include(../../dep_glib.pri) @@ -28,7 +28,7 @@ win32 { } macx { fixPluginInstallId($$TARGET, 1) - linkToBundledLibdeng2($$TARGET) + linkToBundledLibcore($$TARGET) linkToBundledLiblegacy($$TARGET) } unix:!macx { diff --git a/doomsday/plugins/fmod/fmod.pro b/doomsday/plugins/fmod/fmod.pro index 063136a1ba..960f2806c0 100644 --- a/doomsday/plugins/fmod/fmod.pro +++ b/doomsday/plugins/fmod/fmod.pro @@ -2,8 +2,8 @@ # Copyright (c) 2011-2013 Jaakko Keränen # License: GPLv2 + exception to link against FMOD Ex -# This plugin uses the full libdeng2 C++ API. -CONFIG += dengplugin_libdeng2_full +# This plugin uses the full libcore C++ API. +CONFIG += dengplugin_libcore_full include(../config_plugin.pri) include(../../dep_fmod.pri) @@ -52,6 +52,6 @@ else { } macx { - linkToBundledLibdeng2(audio_fmod) + linkToBundledLibcore(audio_fmod) linkToBundledLiblegacy(audio_fmod) } diff --git a/doomsday/plugins/heretic/heretic.pro b/doomsday/plugins/heretic/heretic.pro index 42498158d9..5ff5020a90 100644 --- a/doomsday/plugins/heretic/heretic.pro +++ b/doomsday/plugins/heretic/heretic.pro @@ -101,6 +101,6 @@ win32 { macx { fixPluginInstallId($$TARGET, 1) - linkToBundledLibdeng2($$TARGET) + linkToBundledLibcore($$TARGET) linkToBundledLiblegacy($$TARGET) } diff --git a/doomsday/plugins/hexen/hexen.pro b/doomsday/plugins/hexen/hexen.pro index 054e0ea319..e737654344 100644 --- a/doomsday/plugins/hexen/hexen.pro +++ b/doomsday/plugins/hexen/hexen.pro @@ -110,6 +110,6 @@ win32 { macx { fixPluginInstallId($$TARGET, 1) - linkToBundledLibdeng2($$TARGET) + linkToBundledLibcore($$TARGET) linkToBundledLiblegacy($$TARGET) } diff --git a/doomsday/plugins/openal/openal.pro b/doomsday/plugins/openal/openal.pro index 063f22d35b..c4e4edd398 100644 --- a/doomsday/plugins/openal/openal.pro +++ b/doomsday/plugins/openal/openal.pro @@ -30,7 +30,7 @@ win32 { } macx { - linkToBundledLibdeng2(audio_openal) + linkToBundledLibcore(audio_openal) linkToBundledLiblegacy(audio_openal) } diff --git a/doomsday/plugins/savegameconverter/include/savegameconverter.h b/doomsday/plugins/savegameconverter/include/savegameconverter.h index dc82628dca..be6faaf11c 100644 --- a/doomsday/plugins/savegameconverter/include/savegameconverter.h +++ b/doomsday/plugins/savegameconverter/include/savegameconverter.h @@ -29,7 +29,7 @@ #define LIBSAVEGAMECONVERTER_MAIN_H #include -#include +#include //#include DENG_EXTERN_C void DP_Initialize(void); diff --git a/doomsday/plugins/savegameconverter/savegameconverter.pro b/doomsday/plugins/savegameconverter/savegameconverter.pro index 98da0cd697..85beca8104 100644 --- a/doomsday/plugins/savegameconverter/savegameconverter.pro +++ b/doomsday/plugins/savegameconverter/savegameconverter.pro @@ -2,8 +2,8 @@ # Copyright (c) 2011-2014 Jaakko Keränen # Copyright (c) 2011-2014 Daniel Swanson -# This plugin uses the full libdeng2 C++ API. -CONFIG += dengplugin_libdeng2_full +# This plugin uses the full libcore C++ API. +CONFIG += dengplugin_libcore_full include(../config_plugin.pri) @@ -34,6 +34,6 @@ win32 { macx { fixPluginInstallId($$TARGET, 1) - linkToBundledLibdeng2($$TARGET) + linkToBundledLibcore($$TARGET) linkToBundledLiblegacy($$TARGET) } diff --git a/doomsday/plugins/wadmapconverter/src/id1map.cpp b/doomsday/plugins/wadmapconverter/src/id1map.cpp index af6b6d8bed..32a8fe5b5f 100644 --- a/doomsday/plugins/wadmapconverter/src/id1map.cpp +++ b/doomsday/plugins/wadmapconverter/src/id1map.cpp @@ -22,7 +22,7 @@ #include "id1map_datatypes.h" #include "id1map_load.h" #include "id1map_util.h" -#include +#include #include #include #include diff --git a/doomsday/plugins/wadmapconverter/src/id1map_load.cpp b/doomsday/plugins/wadmapconverter/src/id1map_load.cpp index 5346c0aaf8..d0cae3d845 100644 --- a/doomsday/plugins/wadmapconverter/src/id1map_load.cpp +++ b/doomsday/plugins/wadmapconverter/src/id1map_load.cpp @@ -22,7 +22,7 @@ #include "id1map_load.h" #include "id1map_datatypes.h" -#include +#include size_t ElementSizeForMapLumpType(Id1Map::Format mapFormat, MapLumpType type) { diff --git a/doomsday/plugins/wadmapconverter/src/id1map_util.cpp b/doomsday/plugins/wadmapconverter/src/id1map_util.cpp index 7e12de1e17..487266156f 100644 --- a/doomsday/plugins/wadmapconverter/src/id1map_util.cpp +++ b/doomsday/plugins/wadmapconverter/src/id1map_util.cpp @@ -21,7 +21,7 @@ */ #include "id1map_util.h" -#include +#include using namespace de; diff --git a/doomsday/plugins/wadmapconverter/wadmapconverter.pro b/doomsday/plugins/wadmapconverter/wadmapconverter.pro index 0181f7d91f..1d64605f8f 100644 --- a/doomsday/plugins/wadmapconverter/wadmapconverter.pro +++ b/doomsday/plugins/wadmapconverter/wadmapconverter.pro @@ -2,8 +2,8 @@ # Copyright (c) 2011-2013 Jaakko Keränen # Copyright (c) 2011-2013 Daniel Swanson -# This plugin uses the full libdeng2 C++ API. -CONFIG += dengplugin_libdeng2_full +# This plugin uses the full libcore C++ API. +CONFIG += dengplugin_libcore_full include(../config_plugin.pri) @@ -44,6 +44,6 @@ win32 { macx { fixPluginInstallId($$TARGET, 1) - linkToBundledLibdeng2($$TARGET) + linkToBundledLibcore($$TARGET) linkToBundledLiblegacy($$TARGET) } diff --git a/doomsday/postbuild/bundleapp.sh b/doomsday/postbuild/bundleapp.sh index 931d57f0fc..19be6ab1c1 100755 --- a/doomsday/postbuild/bundleapp.sh +++ b/doomsday/postbuild/bundleapp.sh @@ -23,7 +23,7 @@ echo "Clearing existing bundles..." rm -rf $BUILDDIR/*.bundle echo "Copying shared libraries..." -$CP $BUILDDIR/../libdeng2/libdeng2*dylib $APPDIR/Frameworks +$CP $BUILDDIR/../libcore/libdeng_core*dylib $APPDIR/Frameworks $CP $BUILDDIR/../liblegacy/libdeng_legacy*dylib $APPDIR/Frameworks $CP $BUILDDIR/../libgui/libdeng_gui*dylib $APPDIR/Frameworks $CP $BUILDDIR/../libgui/libassimp*dylib $APPDIR/Frameworks @@ -129,7 +129,7 @@ APPDIR="$BUILDDIR/Doomsday Shell.app/Contents" mkdir -p "$APPDIR/Frameworks" -$CP libdeng2/libdeng2*dylib "$APPDIR/Frameworks" +$CP libcore/libdeng_core*dylib "$APPDIR/Frameworks" $CP libshell/libdeng_shell*dylib "$APPDIR/Frameworks" if [ -e "$APPDIR/Frameworks/QtCore.framework/Versions/$QT_MAJOR" ]; then diff --git a/doomsday/sdk.doxy b/doomsday/sdk.doxy index 53db17d8af..d4a32e7a98 100644 --- a/doomsday/sdk.doxy +++ b/doomsday/sdk.doxy @@ -6,8 +6,8 @@ PROJECT_NUMBER = 1.15 PROJECT_BRIEF = "Core engine library and supporting libraries" OUTPUT_DIRECTORY = apidoc/sdk/ -INPUT = libdeng2/include libgui/include libappfw/include libshell/include \ - libdeng2/src libgui/src libappfw/src libshell/src +INPUT = libcore/include libgui/include libappfw/include libshell/include \ + libcore/src libgui/src libappfw/src libshell/src FILE_PATTERNS = * EXCLUDE_PATTERNS = .DS_Store PREDEFINED = __cplusplus __DENG2__ __LIBGUI__ __LIBSHELL__ __LIBAPPFW__ \ diff --git a/doomsday/sdk.pro b/doomsday/sdk.pro index b6e723a5a1..2f604e1153 100644 --- a/doomsday/sdk.pro +++ b/doomsday/sdk.pro @@ -11,7 +11,7 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = \ build \ - libdeng2 \ + libcore \ libshell !deng_noclient|macx { diff --git a/doomsday/server/include/serversystem.h b/doomsday/server/include/serversystem.h index adc9529897..ec179604e3 100644 --- a/doomsday/server/include/serversystem.h +++ b/doomsday/server/include/serversystem.h @@ -19,7 +19,7 @@ #ifndef SERVERSYSTEM_H #define SERVERSYSTEM_H -#include +#include #include #include #include diff --git a/doomsday/server/server.pro b/doomsday/server/server.pro index 8a6cb7983a..55d88af7e2 100644 --- a/doomsday/server/server.pro +++ b/doomsday/server/server.pro @@ -26,7 +26,7 @@ CONFIG -= app_bundle include(../dep_zlib.pri) include(../dep_lzss.pri) -include(../dep_deng2.pri) +include(../dep_core.pri) include(../dep_legacy.pri) include(../dep_shell.pri) @@ -453,7 +453,7 @@ macx { QMAKE_INFO_PLIST = ../build/mac/Info.plist - linkBinaryToBundledLibdeng2($$TARGET) + linkBinaryToBundledLibcore($$TARGET) linkBinaryToBundledLibdengShell($$TARGET) } diff --git a/doomsday/tests/config_test.pri b/doomsday/tests/config_test.pri index 98893c49dd..aad1940c48 100644 --- a/doomsday/tests/config_test.pri +++ b/doomsday/tests/config_test.pri @@ -2,7 +2,7 @@ CONFIG += deng_testapp include(../config.pri) -include(../dep_deng2.pri) +include(../dep_core.pri) mod.files = \ $$DENG_MODULES_DIR/Config.de \ @@ -21,7 +21,7 @@ macx { doPostLink("ln -sf \"$$OUT_PWD/../../client/Doomsday.app/Contents/Resources/qt.conf\" \"$$contDir/Resources/qt.conf\"") # Fix the dynamic linker paths so they point to ../Frameworks/ inside the bundle. - fixInstallName($${1}.app/Contents/MacOS/$${1}, libdeng2.2.dylib, ..) + fixInstallName($${1}.app/Contents/MacOS/$${1}, libdeng_core.2.dylib, ..) QMAKE_BUNDLE_DATA += mod export(QMAKE_BUNDLE_DATA) diff --git a/doomsday/tests/test_glsandbox/test_glsandbox.pro b/doomsday/tests/test_glsandbox/test_glsandbox.pro index 6bd34f8fcf..954b64757c 100644 --- a/doomsday/tests/test_glsandbox/test_glsandbox.pro +++ b/doomsday/tests/test_glsandbox/test_glsandbox.pro @@ -20,7 +20,7 @@ gfx.files = testpic.png models.files = $$files(models/*) macx { - linkBinaryToBundledLibdeng2($${TARGET}.app/Contents/MacOS/$${TARGET}) + linkBinaryToBundledLibcore($${TARGET}.app/Contents/MacOS/$${TARGET}) linkBinaryToBundledLibdengGui($${TARGET}.app/Contents/MacOS/$${TARGET}) gfx.path = Contents/Resources/graphics diff --git a/doomsday/tools/savegametool/savegametool.pro b/doomsday/tools/savegametool/savegametool.pro index b8d1b8c590..d7295244e0 100644 --- a/doomsday/tools/savegametool/savegametool.pro +++ b/doomsday/tools/savegametool/savegametool.pro @@ -6,7 +6,7 @@ # http://www.gnu.org/licenses/gpl.html for details. include(../../config.pri) -include(../../dep_deng2.pri) +include(../../dep_core.pri) include(../../dep_legacy.pri) include(../../dep_lzss.pri) @@ -33,7 +33,7 @@ SOURCES += \ # Deployment ------------------------------------------------------------------- macx { - linkBinaryToBundledLibdeng2($$TARGET) + linkBinaryToBundledLibcore($$TARGET) linkBinaryToBundledLiblegacy($$TARGET) } else { diff --git a/doomsday/tools/shell/shell-gui/shell-gui.pro b/doomsday/tools/shell/shell-gui/shell-gui.pro index 312e1b842d..8c6cc75802 100644 --- a/doomsday/tools/shell/shell-gui/shell-gui.pro +++ b/doomsday/tools/shell/shell-gui/shell-gui.pro @@ -21,7 +21,7 @@ DEFINES += SHELL_VERSION=\\\"$$VERSION\\\" CONFIG += deng_qtgui -include(../../../dep_deng2.pri) +include(../../../dep_core.pri) include(../../../dep_shell.pri) greaterThan(QT_MAJOR_VERSION, 4): QT += widgets diff --git a/doomsday/tools/shell/shell-gui/src/errorlogdialog.h b/doomsday/tools/shell/shell-gui/src/errorlogdialog.h index 664cb184f5..cddc0458f2 100644 --- a/doomsday/tools/shell/shell-gui/src/errorlogdialog.h +++ b/doomsday/tools/shell/shell-gui/src/errorlogdialog.h @@ -2,7 +2,7 @@ #define ERRORLOGDIALOG_H #include -#include +#include class ErrorLogDialog : public QDialog { diff --git a/doomsday/tools/shell/shell-gui/src/folderselection.h b/doomsday/tools/shell/shell-gui/src/folderselection.h index f5ba646328..2e85228049 100644 --- a/doomsday/tools/shell/shell-gui/src/folderselection.h +++ b/doomsday/tools/shell/shell-gui/src/folderselection.h @@ -19,7 +19,7 @@ #ifndef FOLDERSELECTION_H #define FOLDERSELECTION_H -#include +#include #include #include diff --git a/doomsday/tools/shell/shell-gui/src/localserverdialog.cpp b/doomsday/tools/shell/shell-gui/src/localserverdialog.cpp index e4a3eb1b28..6aca7c8551 100644 --- a/doomsday/tools/shell/shell-gui/src/localserverdialog.cpp +++ b/doomsday/tools/shell/shell-gui/src/localserverdialog.cpp @@ -19,7 +19,7 @@ #include "localserverdialog.h" #include "folderselection.h" #include "guishellapp.h" -#include +#include #include #include #include diff --git a/doomsday/tools/shell/shell-gui/src/main.cpp b/doomsday/tools/shell/shell-gui/src/main.cpp index 38d361dc51..fa2345ad85 100644 --- a/doomsday/tools/shell/shell-gui/src/main.cpp +++ b/doomsday/tools/shell/shell-gui/src/main.cpp @@ -17,7 +17,7 @@ */ #include "guishellapp.h" -#include +#include #ifdef Q_OS_MACX # include diff --git a/doomsday/tools/shell/shell-gui/src/opendialog.cpp b/doomsday/tools/shell/shell-gui/src/opendialog.cpp index e2eb88cdfa..701597cb83 100644 --- a/doomsday/tools/shell/shell-gui/src/opendialog.cpp +++ b/doomsday/tools/shell/shell-gui/src/opendialog.cpp @@ -18,7 +18,7 @@ #include "opendialog.h" #include "guishellapp.h" -#include +#include #include #include #include diff --git a/doomsday/tools/shell/shell-gui/src/preferences.cpp b/doomsday/tools/shell/shell-gui/src/preferences.cpp index 61de9f5aad..38385b71d8 100644 --- a/doomsday/tools/shell/shell-gui/src/preferences.cpp +++ b/doomsday/tools/shell/shell-gui/src/preferences.cpp @@ -1,7 +1,7 @@ #include "preferences.h" #include "folderselection.h" #include "guishellapp.h" -#include +#include #include #include #include diff --git a/doomsday/tools/shell/shell-gui/src/qtguiapp.h b/doomsday/tools/shell/shell-gui/src/qtguiapp.h index 6b2c689f09..c82f66a5f2 100644 --- a/doomsday/tools/shell/shell-gui/src/qtguiapp.h +++ b/doomsday/tools/shell/shell-gui/src/qtguiapp.h @@ -20,7 +20,7 @@ #define QTGUIAPP_H #include -#include +#include class QtGuiApp : public QApplication { diff --git a/doomsday/tools/shell/shell-gui/src/statuswidget.cpp b/doomsday/tools/shell/shell-gui/src/statuswidget.cpp index d913abc0b1..85d5b5c65f 100644 --- a/doomsday/tools/shell/shell-gui/src/statuswidget.cpp +++ b/doomsday/tools/shell/shell-gui/src/statuswidget.cpp @@ -17,7 +17,7 @@ */ #include "statuswidget.h" -#include +#include #include #include #include diff --git a/doomsday/tools/shell/shell-text/shell-text.pro b/doomsday/tools/shell/shell-text/shell-text.pro index 7ef0b6670d..d3245eb6c6 100644 --- a/doomsday/tools/shell/shell-text/shell-text.pro +++ b/doomsday/tools/shell/shell-text/shell-text.pro @@ -17,7 +17,7 @@ CONFIG -= app_bundle DEFINES += SHELL_VERSION=\\\"$$VERSION\\\" -include(../../../dep_deng2.pri) +include(../../../dep_core.pri) include(../../../dep_shell.pri) include(../../../dep_curses.pri) @@ -48,7 +48,7 @@ SOURCES += \ # Installation -------------------------------------------------------------- macx { - linkBinaryToBundledLibdeng2($$TARGET) + linkBinaryToBundledLibcore($$TARGET) linkBinaryToBundledLibdengShell($$TARGET) } else { diff --git a/doomsday/tools/shell/shell-text/src/localserverdialog.h b/doomsday/tools/shell/shell-text/src/localserverdialog.h index df60329abd..c4e5e500eb 100644 --- a/doomsday/tools/shell/shell-text/src/localserverdialog.h +++ b/doomsday/tools/shell/shell-text/src/localserverdialog.h @@ -19,7 +19,7 @@ #ifndef LOCALSERVERDIALOG_H #define LOCALSERVERDIALOG_H -#include +#include #include class LocalServerDialog : public de::shell::InputDialog diff --git a/doomsday/tools/shell/shell-text/src/main.cpp b/doomsday/tools/shell/shell-text/src/main.cpp index 6497272ba5..755f7c3d24 100644 --- a/doomsday/tools/shell/shell-text/src/main.cpp +++ b/doomsday/tools/shell/shell-text/src/main.cpp @@ -16,7 +16,7 @@ * http://www.gnu.org/licenses */ -#include +#include #include #include "shellapp.h"