diff --git a/init.lua b/init.lua index 5ef3a990..64ddbf10 100644 --- a/init.lua +++ b/init.lua @@ -27,8 +27,8 @@ g_resources.setupUserWriteDir(g_app.getCompactName()) -- search all packages g_resources.searchAndAddPackages('/', '.otpkg', true) --- load configurations -g_configs.load("/config.otml") +-- load settings +g_configs.loadSettings("/config.otml") g_modules.discoverModules() diff --git a/modules/client/client.lua b/modules/client/client.lua index 97ac544c..eb7a81af 100644 --- a/modules/client/client.lua +++ b/modules/client/client.lua @@ -91,9 +91,9 @@ function init() g_keyboard.bindKeyDown('Ctrl+Shift+R', reloadScripts) -- generate machine uuid, this is a security measure for storing passwords - if not g_crypt.setMachineUUID(g_configs.get('uuid')) then - g_configs.set('uuid', g_crypt.getMachineUUID()) - g_configs.save() + if not g_crypt.setMachineUUID(g_settings.get('uuid')) then + g_settings.set('uuid', g_crypt.getMachineUUID()) + g_settings.save() end end diff --git a/modules/client_modulemanager/modulemanager.lua b/modules/client_modulemanager/modulemanager.lua index cf1c2097..1826b181 100644 --- a/modules/client_modulemanager/modulemanager.lua +++ b/modules/client_modulemanager/modulemanager.lua @@ -14,7 +14,8 @@ function init() g_keyboard.bindKeyPress('Up', function() moduleList:focusPreviousChild(KeyboardFocusReason) end, moduleManagerWindow) g_keyboard.bindKeyPress('Down', function() moduleList:focusNextChild(KeyboardFocusReason) end, moduleManagerWindow) - moduleManagerButton = modules.client_topmenu.addLeftButton('moduleManagerButton', tr('Module Manager'), '/images/topbuttons/modulemanager', toggle) + moduleManagerButton = modules.client_topmenu.addLeftButton('moduleManagerButton', + tr('Module Manager'), '/images/topbuttons/modulemanager', toggle) -- refresh modules only after all modules are loaded addEvent(listModules) diff --git a/modules/corelib/config.lua b/modules/corelib/config.lua new file mode 100644 index 00000000..27037ff1 --- /dev/null +++ b/modules/corelib/config.lua @@ -0,0 +1,73 @@ +-- @docclass + +local function convertSettingValue(value) + if type(value) == 'table' then + if value.x and value.width then + return recttostring(value) + elseif value.x then + return pointtostring(value) + elseif value.width then + return sizetostring(value) + elseif value.r then + return colortostring(value) + else + return value + end + elseif value == nil then + return '' + else + return tostring(value) + end +end + +function Config:set(key, value) + self:setValue(key, convertSettingValue(value)) +end + +function Config:setDefault(key, value) + if self:exists(key) then return false end + self:set(key, value) + return true +end + +function Config:get(key, default) + if not self:exists(key) and default ~= nil then + self:set(key, default) + end + return self:getValue(key) +end + +function Config:getString(key, default) + return self:get(key, default) +end + +function Config:getInteger(key, default) + local v = tonumber(self:get(key, default)) or 0 + return v +end + +function Config:getNumber(key, default) + local v = tonumber(self:get(key, default)) or 0 + return v +end + +function Config:getBoolean(key, default) + return toboolean(self:get(key, default)) +end + +function Config:getPoint(key, default) + return topoint(self:get(key, default)) +end + +function Config:getRect(key, default) + return torect(self:get(key, default)) +end + +function Config:getSize(key, default) + return tosize(self:get(key, default)) +end + +function Config:getColor(key, default) + return tocolor(self:get(key, default)) +end + diff --git a/modules/corelib/corelib.otmod b/modules/corelib/corelib.otmod index 56798e1b..7a5bb377 100644 --- a/modules/corelib/corelib.otmod +++ b/modules/corelib/corelib.otmod @@ -14,6 +14,7 @@ Module dofile 'const' dofile 'util' dofile 'globals' + dofile 'config' dofile 'settings' dofile 'keyboard' dofile 'mouse' @@ -22,4 +23,4 @@ Module dofiles 'ui' dofile 'inputmessage' - dofile 'outputmessage' + dofile 'outputmessage' \ No newline at end of file diff --git a/modules/corelib/settings.lua b/modules/corelib/settings.lua index 9abc7c3a..0eeaae81 100644 --- a/modules/corelib/settings.lua +++ b/modules/corelib/settings.lua @@ -1,86 +1,3 @@ --- @docclass -g_settings = {} +g_settings = makesingleton(g_configs.getSettings()) -g_settings.exists = g_configs.exists -g_settings.setNode = g_configs.setNode -g_settings.mergeNode = g_configs.mergeNode -g_settings.getNode = g_configs.getNode -g_settings.remove = g_configs.remove -g_settings.setList = g_configs.setList -g_settings.getList = g_configs.getList -g_settings.save = g_configs.save - -local function convertSettingValue(value) - if type(value) == 'table' then - if value.x and value.width then - return recttostring(value) - elseif value.x then - return pointtostring(value) - elseif value.width then - return sizetostring(value) - elseif value.r then - return colortostring(value) - else - return value - end - elseif value == nil then - return '' - else - return tostring(value) - end -end - -function g_settings.set(key, value) - g_configs.set(key, convertSettingValue(value)) -end - -function g_settings.setDefault(key, value) - if g_settings.exists(key) then return false end - g_settings.set(key, value) - return true -end - -function g_settings.get(key, default) - if not g_settings.exists(key) and default ~= nil then - g_settings.set(key, default) - end - return g_configs.get(key) -end - -function g_settings.getString(key, default) - return g_settings.get(key, default) -end - -function g_settings.getInteger(key, default) - local v = tonumber(g_settings.get(key, default)) or 0 - return v -end - -function g_settings.getNumber(key, default) - local v = tonumber(g_settings.get(key, default)) or 0 - return v -end - -function g_settings.getBoolean(key, default) - return toboolean(g_settings.get(key, default)) -end - -function g_settings.getPoint(key, default) - return topoint(g_settings.get(key, default)) -end - -function g_settings.getRect(key, default) - return torect(g_settings.get(key, default)) -end - -function g_settings.getSize(key, default) - return tosize(g_settings.get(key, default)) -end - -function g_settings.getColor(key, default) - return tocolor(g_settings.get(key, default)) -end - -function g_settings.getColor(key, default) - return tocolor(g_settings.get(key, default)) -end +-- Reserved for future functionality diff --git a/modules/corelib/util.lua b/modules/corelib/util.lua index a827b696..9e8d110f 100644 --- a/modules/corelib/util.lua +++ b/modules/corelib/util.lua @@ -284,6 +284,10 @@ function numbertoboolean(number) end end +function postostring(pos) + return pos.x .. " " .. pos.y .. " " .. pos.z +end + function signalcall(param, ...) if type(param) == 'function' then local status, ret = pcall(param, ...) @@ -328,4 +332,16 @@ function getOppositeAnchor(anchor) return anchor end +function makesingleton(obj) + local singleton = {} + if obj.getClassName then + for key,value in pairs(_G[obj:getClassName()]) do + if type(value) == 'function' then + singleton[key] = function(...) return value(obj, ...) end + end + end + end + return singleton +end + -- @} \ No newline at end of file diff --git a/src/client/animatedtext.cpp b/src/client/animatedtext.cpp index c0c0e10f..8faf09d6 100644 --- a/src/client/animatedtext.cpp +++ b/src/client/animatedtext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/animatedtext.h b/src/client/animatedtext.h index 85970c89..c2444a7d 100644 --- a/src/client/animatedtext.h +++ b/src/client/animatedtext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/client.cpp b/src/client/client.cpp index 374ba21f..2159dcda 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/client.h b/src/client/client.h index 58d1930a..22fca2bd 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/const.h b/src/client/const.h index c8c3289d..f11f0fc1 100644 --- a/src/client/const.h +++ b/src/client/const.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/container.cpp b/src/client/container.cpp index dd43cf34..4d0e06fd 100644 --- a/src/client/container.cpp +++ b/src/client/container.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/container.h b/src/client/container.h index 4631ba9e..f141e605 100644 --- a/src/client/container.h +++ b/src/client/container.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/creature.cpp b/src/client/creature.cpp index 48e0b6ff..5b437722 100644 --- a/src/client/creature.cpp +++ b/src/client/creature.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/creature.h b/src/client/creature.h index eb14c267..e3ecc796 100644 --- a/src/client/creature.h +++ b/src/client/creature.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/creatures.cpp b/src/client/creatures.cpp index 3fd366e6..227a8176 100644 --- a/src/client/creatures.cpp +++ b/src/client/creatures.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/creatures.h b/src/client/creatures.h index 53df0ecd..8117b696 100644 --- a/src/client/creatures.h +++ b/src/client/creatures.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/declarations.h b/src/client/declarations.h index 17c4fe17..b2edbdbe 100644 --- a/src/client/declarations.h +++ b/src/client/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/effect.cpp b/src/client/effect.cpp index 7656c1c4..082cd085 100644 --- a/src/client/effect.cpp +++ b/src/client/effect.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/effect.h b/src/client/effect.h index 75d8822c..ee50b3cd 100644 --- a/src/client/effect.h +++ b/src/client/effect.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/game.cpp b/src/client/game.cpp index 122b83e0..d81f3387 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/game.h b/src/client/game.h index f4f330e1..ada055bd 100644 --- a/src/client/game.h +++ b/src/client/game.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/global.h b/src/client/global.h index f4eb6f88..2986b72b 100644 --- a/src/client/global.h +++ b/src/client/global.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/houses.cpp b/src/client/houses.cpp index 36d76a45..0a476a0c 100644 --- a/src/client/houses.cpp +++ b/src/client/houses.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/houses.h b/src/client/houses.h index d8244648..a556c340 100644 --- a/src/client/houses.h +++ b/src/client/houses.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/item.cpp b/src/client/item.cpp index 672ff933..af0d4c2b 100644 --- a/src/client/item.cpp +++ b/src/client/item.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/item.h b/src/client/item.h index 0311eba7..6c8a3446 100644 --- a/src/client/item.h +++ b/src/client/item.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/itemtype.cpp b/src/client/itemtype.cpp index 2fc8a9d8..d0b9aaeb 100644 --- a/src/client/itemtype.cpp +++ b/src/client/itemtype.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/itemtype.h b/src/client/itemtype.h index 0ea4b440..9790bba7 100644 --- a/src/client/itemtype.h +++ b/src/client/itemtype.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/lightview.cpp b/src/client/lightview.cpp index dccac0e3..e88b5eaf 100644 --- a/src/client/lightview.cpp +++ b/src/client/lightview.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/lightview.h b/src/client/lightview.h index c14363e4..e7c82119 100644 --- a/src/client/lightview.h +++ b/src/client/lightview.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp index 0420aa7f..a09ceb15 100644 --- a/src/client/localplayer.cpp +++ b/src/client/localplayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/localplayer.h b/src/client/localplayer.h index bf898189..cbc1832e 100644 --- a/src/client/localplayer.h +++ b/src/client/localplayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/luafunctions.cpp b/src/client/luafunctions.cpp index 093c651e..038792af 100644 --- a/src/client/luafunctions.cpp +++ b/src/client/luafunctions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/luavaluecasts.cpp b/src/client/luavaluecasts.cpp index 7403b5f1..a4c4e524 100644 --- a/src/client/luavaluecasts.cpp +++ b/src/client/luavaluecasts.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/luavaluecasts.h b/src/client/luavaluecasts.h index 867c94bb..8d35b19b 100644 --- a/src/client/luavaluecasts.h +++ b/src/client/luavaluecasts.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/map.cpp b/src/client/map.cpp index 112290ed..367d6a33 100644 --- a/src/client/map.cpp +++ b/src/client/map.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/map.h b/src/client/map.h index 4c0dc95f..6de2fc08 100644 --- a/src/client/map.h +++ b/src/client/map.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/mapio.cpp b/src/client/mapio.cpp index 9e451a9f..ca6b34da 100644 --- a/src/client/mapio.cpp +++ b/src/client/mapio.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/mapview.cpp b/src/client/mapview.cpp index 6d2f5895..9103a73e 100644 --- a/src/client/mapview.cpp +++ b/src/client/mapview.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/mapview.h b/src/client/mapview.h index 179c6809..958af889 100644 --- a/src/client/mapview.h +++ b/src/client/mapview.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp index 3149053a..9f23ef57 100644 --- a/src/client/minimap.cpp +++ b/src/client/minimap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/minimap.h b/src/client/minimap.h index 22cc3f0c..a89f7320 100644 --- a/src/client/minimap.h +++ b/src/client/minimap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/missile.cpp b/src/client/missile.cpp index 068a5f46..febbda56 100644 --- a/src/client/missile.cpp +++ b/src/client/missile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/missile.h b/src/client/missile.h index 0474de7f..00e30836 100644 --- a/src/client/missile.h +++ b/src/client/missile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/outfit.cpp b/src/client/outfit.cpp index 991e2b6b..1f89eb9b 100644 --- a/src/client/outfit.cpp +++ b/src/client/outfit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/outfit.h b/src/client/outfit.h index 7a1632d4..e71f6ad6 100644 --- a/src/client/outfit.h +++ b/src/client/outfit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/player.cpp b/src/client/player.cpp index 8079235e..95e1510c 100644 --- a/src/client/player.cpp +++ b/src/client/player.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/player.h b/src/client/player.h index e2725fde..d5025bbc 100644 --- a/src/client/player.h +++ b/src/client/player.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/position.h b/src/client/position.h index 656b0cf4..c8ac5c98 100644 --- a/src/client/position.h +++ b/src/client/position.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/protocolcodes.cpp b/src/client/protocolcodes.cpp index 6cc9a95e..6990985e 100644 --- a/src/client/protocolcodes.cpp +++ b/src/client/protocolcodes.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/protocolcodes.h b/src/client/protocolcodes.h index ffe3aaa7..848eabee 100644 --- a/src/client/protocolcodes.h +++ b/src/client/protocolcodes.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/protocolgame.cpp b/src/client/protocolgame.cpp index 1bba2dc0..0e5fd61e 100644 --- a/src/client/protocolgame.cpp +++ b/src/client/protocolgame.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/protocolgame.h b/src/client/protocolgame.h index e78cc631..f6f4a4df 100644 --- a/src/client/protocolgame.h +++ b/src/client/protocolgame.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/protocolgameparse.cpp b/src/client/protocolgameparse.cpp index 08ba09e1..42d552a2 100644 --- a/src/client/protocolgameparse.cpp +++ b/src/client/protocolgameparse.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/protocolgamesend.cpp b/src/client/protocolgamesend.cpp index 85b103b5..502eb820 100644 --- a/src/client/protocolgamesend.cpp +++ b/src/client/protocolgamesend.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/shadermanager.cpp b/src/client/shadermanager.cpp index b84265fb..b414ab20 100644 --- a/src/client/shadermanager.cpp +++ b/src/client/shadermanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/shadermanager.h b/src/client/shadermanager.h index c81bbcc2..6dc958c3 100644 --- a/src/client/shadermanager.h +++ b/src/client/shadermanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/spritemanager.cpp b/src/client/spritemanager.cpp index d1f9871c..a99fea88 100644 --- a/src/client/spritemanager.cpp +++ b/src/client/spritemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/spritemanager.h b/src/client/spritemanager.h index 0c8fa2b7..4462ff6c 100644 --- a/src/client/spritemanager.h +++ b/src/client/spritemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/statictext.cpp b/src/client/statictext.cpp index 4ff1ef78..289415ce 100644 --- a/src/client/statictext.cpp +++ b/src/client/statictext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/statictext.h b/src/client/statictext.h index d03e7896..aa7d4e65 100644 --- a/src/client/statictext.h +++ b/src/client/statictext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/thing.cpp b/src/client/thing.cpp index 27cedada..6858df6d 100644 --- a/src/client/thing.cpp +++ b/src/client/thing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/thing.h b/src/client/thing.h index 03934250..a276ad44 100644 --- a/src/client/thing.h +++ b/src/client/thing.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/thingtype.cpp b/src/client/thingtype.cpp index 5d1c37ec..f59b3314 100644 --- a/src/client/thingtype.cpp +++ b/src/client/thingtype.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/thingtype.h b/src/client/thingtype.h index 94bae6ba..47761f20 100644 --- a/src/client/thingtype.h +++ b/src/client/thingtype.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/thingtypemanager.cpp b/src/client/thingtypemanager.cpp index 53286d20..b00aa0c2 100644 --- a/src/client/thingtypemanager.cpp +++ b/src/client/thingtypemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/thingtypemanager.h b/src/client/thingtypemanager.h index 51e63013..641f784f 100644 --- a/src/client/thingtypemanager.h +++ b/src/client/thingtypemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/tile.cpp b/src/client/tile.cpp index a9d702c4..6e4b8657 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/tile.h b/src/client/tile.h index 4f75e1b2..a197beef 100644 --- a/src/client/tile.h +++ b/src/client/tile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/towns.cpp b/src/client/towns.cpp index a717a667..1e8266e9 100644 --- a/src/client/towns.cpp +++ b/src/client/towns.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/towns.h b/src/client/towns.h index ecae856b..23fedb98 100644 --- a/src/client/towns.h +++ b/src/client/towns.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uicreature.cpp b/src/client/uicreature.cpp index b4a5e9b7..46fe1c11 100644 --- a/src/client/uicreature.cpp +++ b/src/client/uicreature.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uicreature.h b/src/client/uicreature.h index da6eba5b..109f597f 100644 --- a/src/client/uicreature.h +++ b/src/client/uicreature.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uiitem.cpp b/src/client/uiitem.cpp index a17afee4..d005aa78 100644 --- a/src/client/uiitem.cpp +++ b/src/client/uiitem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uiitem.h b/src/client/uiitem.h index cb02bd02..aa6f69cc 100644 --- a/src/client/uiitem.h +++ b/src/client/uiitem.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uimap.cpp b/src/client/uimap.cpp index b31e8ad2..67150489 100644 --- a/src/client/uimap.cpp +++ b/src/client/uimap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uimap.h b/src/client/uimap.h index cfce5191..759f6bbe 100644 --- a/src/client/uimap.h +++ b/src/client/uimap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uimapanchorlayout.cpp b/src/client/uimapanchorlayout.cpp index 663e3dd6..f7f85407 100644 --- a/src/client/uimapanchorlayout.cpp +++ b/src/client/uimapanchorlayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uimapanchorlayout.h b/src/client/uimapanchorlayout.h index 2ff3c28a..a316bb85 100644 --- a/src/client/uimapanchorlayout.h +++ b/src/client/uimapanchorlayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uiminimap.cpp b/src/client/uiminimap.cpp index 42f4bbc6..b3f8a79c 100644 --- a/src/client/uiminimap.cpp +++ b/src/client/uiminimap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uiminimap.h b/src/client/uiminimap.h index aaea30f3..fc69261a 100644 --- a/src/client/uiminimap.h +++ b/src/client/uiminimap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uiprogressrect.cpp b/src/client/uiprogressrect.cpp index f1abfd6c..80305589 100644 --- a/src/client/uiprogressrect.cpp +++ b/src/client/uiprogressrect.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uiprogressrect.h b/src/client/uiprogressrect.h index aeb7e46d..018a33b8 100644 --- a/src/client/uiprogressrect.h +++ b/src/client/uiprogressrect.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uisprite.cpp b/src/client/uisprite.cpp index d6fc3687..c6d616bd 100644 --- a/src/client/uisprite.cpp +++ b/src/client/uisprite.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/client/uisprite.h b/src/client/uisprite.h index e572e5bb..8fe0a0e7 100644 --- a/src/client/uisprite.h +++ b/src/client/uisprite.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt index 924dad91..17af48ae 100644 --- a/src/framework/CMakeLists.txt +++ b/src/framework/CMakeLists.txt @@ -71,6 +71,8 @@ set(framework_SOURCES ${framework_SOURCES} ${CMAKE_CURRENT_LIST_DIR}/core/binarytree.h ${CMAKE_CURRENT_LIST_DIR}/core/clock.cpp ${CMAKE_CURRENT_LIST_DIR}/core/clock.h + ${CMAKE_CURRENT_LIST_DIR}/core/config.cpp + ${CMAKE_CURRENT_LIST_DIR}/core/config.h ${CMAKE_CURRENT_LIST_DIR}/core/configmanager.cpp ${CMAKE_CURRENT_LIST_DIR}/core/configmanager.h ${CMAKE_CURRENT_LIST_DIR}/core/declarations.h diff --git a/src/framework/const.h b/src/framework/const.h index 12a6e2cb..e9f85c6b 100644 --- a/src/framework/const.h +++ b/src/framework/const.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/adaptativeframecounter.cpp b/src/framework/core/adaptativeframecounter.cpp index bab8e09c..4453e63b 100644 --- a/src/framework/core/adaptativeframecounter.cpp +++ b/src/framework/core/adaptativeframecounter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/adaptativeframecounter.h b/src/framework/core/adaptativeframecounter.h index 43a0dbab..37d554f6 100644 --- a/src/framework/core/adaptativeframecounter.h +++ b/src/framework/core/adaptativeframecounter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/application.cpp b/src/framework/core/application.cpp index 6c0016a6..ae07adbb 100644 --- a/src/framework/core/application.cpp +++ b/src/framework/core/application.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -90,6 +90,9 @@ void Application::init(std::vector& args) m_startupOptions = startupOptions; + // initialize configs + g_configs.init(); + // initialize resources g_resources.init(args[0].c_str()); @@ -125,8 +128,8 @@ void Application::terminate() Connection::terminate(); #endif - // save configurations - g_configs.save(); + // release configs + g_configs.terminate(); // release resources g_resources.terminate(); diff --git a/src/framework/core/application.h b/src/framework/core/application.h index 2ae4311e..7bb5473b 100644 --- a/src/framework/core/application.h +++ b/src/framework/core/application.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/asyncdispatcher.cpp b/src/framework/core/asyncdispatcher.cpp index f4ea33b4..ee3b7e65 100644 --- a/src/framework/core/asyncdispatcher.cpp +++ b/src/framework/core/asyncdispatcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/asyncdispatcher.h b/src/framework/core/asyncdispatcher.h index 9e1bd413..e5233811 100644 --- a/src/framework/core/asyncdispatcher.h +++ b/src/framework/core/asyncdispatcher.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/binarytree.cpp b/src/framework/core/binarytree.cpp index 2006f82b..4568c851 100644 --- a/src/framework/core/binarytree.cpp +++ b/src/framework/core/binarytree.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/binarytree.h b/src/framework/core/binarytree.h index b7576548..177e837f 100644 --- a/src/framework/core/binarytree.h +++ b/src/framework/core/binarytree.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/clock.cpp b/src/framework/core/clock.cpp index 701a9a0b..4d9666d6 100644 --- a/src/framework/core/clock.cpp +++ b/src/framework/core/clock.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/clock.h b/src/framework/core/clock.h index 45770a54..7fb2c9f0 100644 --- a/src/framework/core/clock.h +++ b/src/framework/core/clock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/config.cpp b/src/framework/core/config.cpp new file mode 100644 index 00000000..95bbeb08 --- /dev/null +++ b/src/framework/core/config.cpp @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2010-2014 OTClient + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "config.h" +#include "resourcemanager.h" +#include "configmanager.h" + +#include + +Config::Config() +{ + m_confsDoc = OTMLDocument::create(); + m_fileName = ""; +} + +bool Config::load(const std::string& file) +{ + m_fileName = file; + + if(!g_resources.fileExists(file)) + return false; + + try { + OTMLDocumentPtr confsDoc = OTMLDocument::parse(file); + if(confsDoc) + m_confsDoc = confsDoc; + return true; + } catch(stdext::exception& e) { + g_logger.error(stdext::format("Unable to parse configuration file '%s': ", e.what())); + return false; + } +} + +bool Config::unload() +{ + if(isLoaded()) { + m_confsDoc = nullptr; + m_fileName = ""; + g_configs.remove(this); + return true; + } + return false; +} + +bool Config::save() +{ + if(m_fileName.length() == 0) + return false; + return m_confsDoc->save(m_fileName); +} + +void Config::clear() +{ + m_confsDoc->clear(); +} + +void Config::setValue(const std::string& key, const std::string& value) +{ + if(key == "") { + remove(key); + return; + } + + OTMLNodePtr child = OTMLNode::create(key, value); + m_confsDoc->addChild(child); +} + +void Config::setList(const std::string& key, const std::vector& list) +{ + remove(key); + + if(list.size() == 0) + return; + + OTMLNodePtr child = OTMLNode::create(key, true); + for(const std::string& value : list) + child->writeIn(value); + m_confsDoc->addChild(child); +} + +bool Config::exists(const std::string& key) +{ + return m_confsDoc->hasChildAt(key); +} + +std::string Config::getValue(const std::string& key) +{ + OTMLNodePtr child = m_confsDoc->get(key); + if(child) + return child->value(); + else + return ""; +} + +std::vector Config::getList(const std::string& key) +{ + std::vector list; + OTMLNodePtr child = m_confsDoc->get(key); + if(child) { + for(const OTMLNodePtr& subchild : child->children()) + list.push_back(subchild->value()); + } + return list; +} + +void Config::remove(const std::string& key) +{ + OTMLNodePtr child = m_confsDoc->get(key); + if(child) + m_confsDoc->removeChild(child); +} + +void Config::setNode(const std::string& key, const OTMLNodePtr& node) +{ + remove(key); + mergeNode(key, node); +} + +void Config::mergeNode(const std::string& key, const OTMLNodePtr& node) +{ + OTMLNodePtr clone = node->clone(); + node->setTag(key); + node->setUnique(true); + m_confsDoc->addChild(node); +} + +OTMLNodePtr Config::getNode(const std::string& key) +{ + return m_confsDoc->get(key); +} + +bool Config::isLoaded() +{ + return !m_fileName.empty() && m_confsDoc; +} + +std::string Config::getFileName() +{ + return m_fileName; +} diff --git a/src/framework/core/config.h b/src/framework/core/config.h new file mode 100644 index 00000000..57c0d784 --- /dev/null +++ b/src/framework/core/config.h @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2010-2014 OTClient + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "declarations.h" + +#include +#include + +// @bindclass +class Config : public LuaObject +{ +public: + Config(); + + bool load(const std::string& file); + bool unload(); + bool save(); + void clear(); + + void setValue(const std::string& key, const std::string& value); + void setList(const std::string& key, const std::vector& list); + std::string getValue(const std::string& key); + std::vector getList(const std::string& key); + + void setNode(const std::string& key, const OTMLNodePtr& node); + void mergeNode(const std::string& key, const OTMLNodePtr& node); + OTMLNodePtr getNode(const std::string& key); + + bool exists(const std::string& key); + void remove(const std::string& key); + + std::string getFileName(); + bool isLoaded(); + + // @dontbind + ConfigPtr asConfig() { return static_self_cast(); } + +private: + std::string m_fileName; + OTMLDocumentPtr m_confsDoc; +}; + +#endif diff --git a/src/framework/core/configmanager.cpp b/src/framework/core/configmanager.cpp index f0ec36e8..12f0fa73 100644 --- a/src/framework/core/configmanager.cpp +++ b/src/framework/core/configmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,118 +21,109 @@ */ #include "configmanager.h" -#include "resourcemanager.h" - -#include ConfigManager g_configs; -ConfigManager::ConfigManager() +void ConfigManager::init() { - m_confsDoc = OTMLDocument::create(); + m_settings = ConfigPtr(new Config()); } -bool ConfigManager::load(const std::string& file) +void ConfigManager::terminate() { - m_fileName = file; + if(m_settings) { + // ensure settings are saved + m_settings->save(); - if(!g_resources.fileExists(file)) - return false; + m_settings->unload(); + m_settings = nullptr; + } - try { - OTMLDocumentPtr confsDoc = OTMLDocument::parse(file); - if(confsDoc) - m_confsDoc = confsDoc; - return true; - } catch(stdext::exception& e) { - g_logger.error(stdext::format("Unable to parse configuration file '%s': ", e.what())); - return false; + for(ConfigPtr config : m_configs) { + config->unload(); + config = nullptr; } -} -bool ConfigManager::save() -{ - if(m_fileName.length() == 0) - return false; - return m_confsDoc->save(m_fileName); + m_configs.clear(); } -void ConfigManager::clear() +ConfigPtr ConfigManager::getSettings() { - m_confsDoc->clear(); + return m_settings; } -void ConfigManager::set(const std::string& key, const std::string& value) +ConfigPtr ConfigManager::get(const std::string& file) { - if(key == "") { - remove(key); - return; + for(const ConfigPtr config : m_configs) { + if(config->getFileName() == file) { + return config; + } } - - OTMLNodePtr child = OTMLNode::create(key, value); - m_confsDoc->addChild(child); + return nullptr; } -void ConfigManager::setList(const std::string& key, const std::vector& list) +ConfigPtr ConfigManager::loadSettings(const std::string file) { - remove(key); - - if(list.size() == 0) - return; - - OTMLNodePtr child = OTMLNode::create(key, true); - for(const std::string& value : list) - child->writeIn(value); - m_confsDoc->addChild(child); + if(file.empty()) { + g_logger.error("Must provide a configuration file to load."); + } + else { + if(m_settings->load(file)) { + return m_settings; + } + } + return nullptr; } -bool ConfigManager::exists(const std::string& key) +ConfigPtr ConfigManager::create(const std::string& file) { - return m_confsDoc->hasChildAt(key); -} + ConfigPtr config = load(file); + if(!config) { + config = ConfigPtr(new Config()); -std::string ConfigManager::get(const std::string& key) -{ - OTMLNodePtr child = m_confsDoc->get(key); - if(child) - return child->value(); - else - return ""; -} + config->load(file); + config->save(); -std::vector ConfigManager::getList(const std::string& key) -{ - std::vector list; - OTMLNodePtr child = m_confsDoc->get(key); - if(child) { - for(const OTMLNodePtr& subchild : child->children()) - list.push_back(subchild->value()); + m_configs.push_back(config); } - return list; -} - -void ConfigManager::remove(const std::string& key) -{ - OTMLNodePtr child = m_confsDoc->get(key); - if(child) - m_confsDoc->removeChild(child); + return config; } -void ConfigManager::setNode(const std::string& key, const OTMLNodePtr& node) +ConfigPtr ConfigManager::load(const std::string& file) { - remove(key); - mergeNode(key, node); + if(file.empty()) { + g_logger.error("Must provide a configuration file to load."); + return nullptr; + } + else { + ConfigPtr config = get(file); + if(!config) { + config = ConfigPtr(new Config()); + + if(config->load(file)) { + m_configs.push_back(config); + } + else { + // cannot load config + config = nullptr; + } + } + return config; + } } -void ConfigManager::mergeNode(const std::string& key, const OTMLNodePtr& node) +bool ConfigManager::unload(const std::string& file) { - OTMLNodePtr clone = node->clone(); - node->setTag(key); - node->setUnique(true); - m_confsDoc->addChild(node); + ConfigPtr config = get(file); + if(config) { + config->unload(); + config = nullptr; + return true; + } + return false; } -OTMLNodePtr ConfigManager::getNode(const std::string& key) +void ConfigManager::remove(const ConfigPtr config) { - return m_confsDoc->get(key); + m_configs.remove(config); } diff --git a/src/framework/core/configmanager.h b/src/framework/core/configmanager.h index 2f5cb70e..772983e8 100644 --- a/src/framework/core/configmanager.h +++ b/src/framework/core/configmanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,34 +23,30 @@ #ifndef CONFIGMANAGER_H #define CONFIGMANAGER_H -#include "declarations.h" -#include +#include "config.h" // @bindsingleton g_configs class ConfigManager { public: - ConfigManager(); + void init(); + void terminate(); - bool load(const std::string& file); - bool save(); - void clear(); + ConfigPtr getSettings(); + ConfigPtr get(const std::string& file); - void set(const std::string& key, const std::string& value); - void setList(const std::string& key, const std::vector& list); - std::string get(const std::string& key); - std::vector getList(const std::string& key); + ConfigPtr create(const std::string& file); + ConfigPtr loadSettings(const std::string file); + ConfigPtr load(const std::string& file); - void setNode(const std::string& key, const OTMLNodePtr& node); - void mergeNode(const std::string& key, const OTMLNodePtr& node); - OTMLNodePtr getNode(const std::string& key); + bool unload(const std::string& file); + void remove(const ConfigPtr config); - bool exists(const std::string& key); - void remove(const std::string& key); +protected: + ConfigPtr m_settings; private: - std::string m_fileName; - OTMLDocumentPtr m_confsDoc; + std::list m_configs; }; extern ConfigManager g_configs; diff --git a/src/framework/core/declarations.h b/src/framework/core/declarations.h index 5f943623..e145f464 100644 --- a/src/framework/core/declarations.h +++ b/src/framework/core/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,9 +25,11 @@ #include +class ConfigManager; class ModuleManager; class ResourceManager; class Module; +class Config; class Event; class ScheduledEvent; class FileStream; @@ -35,6 +37,7 @@ class BinaryTree; class OutputBinaryTree; typedef stdext::shared_object_ptr ModulePtr; +typedef stdext::shared_object_ptr ConfigPtr; typedef stdext::shared_object_ptr EventPtr; typedef stdext::shared_object_ptr ScheduledEventPtr; typedef stdext::shared_object_ptr FileStreamPtr; diff --git a/src/framework/core/event.cpp b/src/framework/core/event.cpp index ec33ed68..0ce5cf26 100644 --- a/src/framework/core/event.cpp +++ b/src/framework/core/event.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/event.h b/src/framework/core/event.h index 036a1acb..e3f68d35 100644 --- a/src/framework/core/event.h +++ b/src/framework/core/event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/eventdispatcher.cpp b/src/framework/core/eventdispatcher.cpp index 5f7547cb..70c500cd 100644 --- a/src/framework/core/eventdispatcher.cpp +++ b/src/framework/core/eventdispatcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/eventdispatcher.h b/src/framework/core/eventdispatcher.h index 2b837e12..6444d73d 100644 --- a/src/framework/core/eventdispatcher.h +++ b/src/framework/core/eventdispatcher.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/filestream.cpp b/src/framework/core/filestream.cpp index 0bc26b8e..fa2ab64e 100644 --- a/src/framework/core/filestream.cpp +++ b/src/framework/core/filestream.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/filestream.h b/src/framework/core/filestream.h index 0d52c236..69fe7b42 100644 --- a/src/framework/core/filestream.h +++ b/src/framework/core/filestream.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/graphicalapplication.cpp b/src/framework/core/graphicalapplication.cpp index c4bd1bc9..bb2d31b7 100644 --- a/src/framework/core/graphicalapplication.cpp +++ b/src/framework/core/graphicalapplication.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/graphicalapplication.h b/src/framework/core/graphicalapplication.h index 73cbec49..1e8ca88c 100644 --- a/src/framework/core/graphicalapplication.h +++ b/src/framework/core/graphicalapplication.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/inputevent.h b/src/framework/core/inputevent.h index e7cd6752..1fc6a47d 100644 --- a/src/framework/core/inputevent.h +++ b/src/framework/core/inputevent.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/logger.cpp b/src/framework/core/logger.cpp index 51e10f02..22936d62 100644 --- a/src/framework/core/logger.cpp +++ b/src/framework/core/logger.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/logger.h b/src/framework/core/logger.h index d56c4060..5537938a 100644 --- a/src/framework/core/logger.h +++ b/src/framework/core/logger.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/module.cpp b/src/framework/core/module.cpp index 5f526dbb..9de4cc9f 100644 --- a/src/framework/core/module.cpp +++ b/src/framework/core/module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/module.h b/src/framework/core/module.h index 900f05c4..2b273d05 100644 --- a/src/framework/core/module.h +++ b/src/framework/core/module.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/modulemanager.cpp b/src/framework/core/modulemanager.cpp index 45537e67..ee2e48ea 100644 --- a/src/framework/core/modulemanager.cpp +++ b/src/framework/core/modulemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/modulemanager.h b/src/framework/core/modulemanager.h index ed6a035f..0f52890f 100644 --- a/src/framework/core/modulemanager.h +++ b/src/framework/core/modulemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/resourcemanager.cpp b/src/framework/core/resourcemanager.cpp index 35d3160b..9dbe18ac 100644 --- a/src/framework/core/resourcemanager.cpp +++ b/src/framework/core/resourcemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/resourcemanager.h b/src/framework/core/resourcemanager.h index 129ee42c..5a6398d4 100644 --- a/src/framework/core/resourcemanager.h +++ b/src/framework/core/resourcemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/scheduledevent.cpp b/src/framework/core/scheduledevent.cpp index 0c6a5e94..7142af66 100644 --- a/src/framework/core/scheduledevent.cpp +++ b/src/framework/core/scheduledevent.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/scheduledevent.h b/src/framework/core/scheduledevent.h index 6e7f0c61..516e61fa 100644 --- a/src/framework/core/scheduledevent.h +++ b/src/framework/core/scheduledevent.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/timer.cpp b/src/framework/core/timer.cpp index 2ecb4a8e..c166d806 100644 --- a/src/framework/core/timer.cpp +++ b/src/framework/core/timer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/timer.h b/src/framework/core/timer.h index 52bbb74f..509de6d6 100644 --- a/src/framework/core/timer.h +++ b/src/framework/core/timer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/global.h b/src/framework/global.h index 2eafbf68..188e892d 100644 --- a/src/framework/global.h +++ b/src/framework/global.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/animatedtexture.cpp b/src/framework/graphics/animatedtexture.cpp index 0359dc32..299eef49 100644 --- a/src/framework/graphics/animatedtexture.cpp +++ b/src/framework/graphics/animatedtexture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/animatedtexture.h b/src/framework/graphics/animatedtexture.h index 7fa72fe0..55b7b999 100644 --- a/src/framework/graphics/animatedtexture.h +++ b/src/framework/graphics/animatedtexture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/apngloader.h b/src/framework/graphics/apngloader.h index 5e95bb5b..43425ec0 100644 --- a/src/framework/graphics/apngloader.h +++ b/src/framework/graphics/apngloader.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/bitmapfont.cpp b/src/framework/graphics/bitmapfont.cpp index 43b9d6eb..c343a76e 100644 --- a/src/framework/graphics/bitmapfont.cpp +++ b/src/framework/graphics/bitmapfont.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/bitmapfont.h b/src/framework/graphics/bitmapfont.h index 0ee9d477..b9ae8c6c 100644 --- a/src/framework/graphics/bitmapfont.h +++ b/src/framework/graphics/bitmapfont.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/cachedtext.cpp b/src/framework/graphics/cachedtext.cpp index e7693688..d686d631 100644 --- a/src/framework/graphics/cachedtext.cpp +++ b/src/framework/graphics/cachedtext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/cachedtext.h b/src/framework/graphics/cachedtext.h index 39c347c9..edb737cc 100644 --- a/src/framework/graphics/cachedtext.h +++ b/src/framework/graphics/cachedtext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/coordsbuffer.cpp b/src/framework/graphics/coordsbuffer.cpp index 6f27a09e..dba88805 100644 --- a/src/framework/graphics/coordsbuffer.cpp +++ b/src/framework/graphics/coordsbuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/coordsbuffer.h b/src/framework/graphics/coordsbuffer.h index 5c16d0b9..948c7f5e 100644 --- a/src/framework/graphics/coordsbuffer.h +++ b/src/framework/graphics/coordsbuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/declarations.h b/src/framework/graphics/declarations.h index 9acfcca6..56c3e1bd 100644 --- a/src/framework/graphics/declarations.h +++ b/src/framework/graphics/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/fontmanager.cpp b/src/framework/graphics/fontmanager.cpp index 00c1ffbe..b5e56503 100644 --- a/src/framework/graphics/fontmanager.cpp +++ b/src/framework/graphics/fontmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/fontmanager.h b/src/framework/graphics/fontmanager.h index 4cba5174..ce400f5d 100644 --- a/src/framework/graphics/fontmanager.h +++ b/src/framework/graphics/fontmanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/framebuffer.cpp b/src/framework/graphics/framebuffer.cpp index f2fb53ac..4561e2d5 100644 --- a/src/framework/graphics/framebuffer.cpp +++ b/src/framework/graphics/framebuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/framebuffer.h b/src/framework/graphics/framebuffer.h index 70df4870..d6255f81 100644 --- a/src/framework/graphics/framebuffer.h +++ b/src/framework/graphics/framebuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/framebuffermanager.cpp b/src/framework/graphics/framebuffermanager.cpp index ccf40abf..5fec791c 100644 --- a/src/framework/graphics/framebuffermanager.cpp +++ b/src/framework/graphics/framebuffermanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/framebuffermanager.h b/src/framework/graphics/framebuffermanager.h index 327e635f..545e5f05 100644 --- a/src/framework/graphics/framebuffermanager.h +++ b/src/framework/graphics/framebuffermanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/glutil.h b/src/framework/graphics/glutil.h index d3c1a262..53bf84e4 100644 --- a/src/framework/graphics/glutil.h +++ b/src/framework/graphics/glutil.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/graphics.cpp b/src/framework/graphics/graphics.cpp index 8fcd8e04..993858fa 100644 --- a/src/framework/graphics/graphics.cpp +++ b/src/framework/graphics/graphics.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/graphics.h b/src/framework/graphics/graphics.h index 6a5d6ab6..ed69b901 100644 --- a/src/framework/graphics/graphics.h +++ b/src/framework/graphics/graphics.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/hardwarebuffer.cpp b/src/framework/graphics/hardwarebuffer.cpp index ce159ec7..37e72303 100644 --- a/src/framework/graphics/hardwarebuffer.cpp +++ b/src/framework/graphics/hardwarebuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/hardwarebuffer.h b/src/framework/graphics/hardwarebuffer.h index 3b9570b0..63034cf6 100644 --- a/src/framework/graphics/hardwarebuffer.h +++ b/src/framework/graphics/hardwarebuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/image.cpp b/src/framework/graphics/image.cpp index 333fb38c..c7d79197 100644 --- a/src/framework/graphics/image.cpp +++ b/src/framework/graphics/image.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/image.h b/src/framework/graphics/image.h index 083cf5b8..e1749fab 100644 --- a/src/framework/graphics/image.h +++ b/src/framework/graphics/image.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/ogl/painterogl.cpp b/src/framework/graphics/ogl/painterogl.cpp index 866851b1..d67f8d22 100644 --- a/src/framework/graphics/ogl/painterogl.cpp +++ b/src/framework/graphics/ogl/painterogl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/ogl/painterogl.h b/src/framework/graphics/ogl/painterogl.h index 39bd9967..5bc32bbd 100644 --- a/src/framework/graphics/ogl/painterogl.h +++ b/src/framework/graphics/ogl/painterogl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/ogl/painterogl1.cpp b/src/framework/graphics/ogl/painterogl1.cpp index 2d98a78d..4e908b94 100644 --- a/src/framework/graphics/ogl/painterogl1.cpp +++ b/src/framework/graphics/ogl/painterogl1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/ogl/painterogl1.h b/src/framework/graphics/ogl/painterogl1.h index 2e0afdd2..43b5baff 100644 --- a/src/framework/graphics/ogl/painterogl1.h +++ b/src/framework/graphics/ogl/painterogl1.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/ogl/painterogl2.cpp b/src/framework/graphics/ogl/painterogl2.cpp index 5dc817e2..77b11647 100644 --- a/src/framework/graphics/ogl/painterogl2.cpp +++ b/src/framework/graphics/ogl/painterogl2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/ogl/painterogl2.h b/src/framework/graphics/ogl/painterogl2.h index 08ab078a..ffab9575 100644 --- a/src/framework/graphics/ogl/painterogl2.h +++ b/src/framework/graphics/ogl/painterogl2.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/ogl/painterogl2_shadersources.h b/src/framework/graphics/ogl/painterogl2_shadersources.h index 207da35d..c1db3c36 100644 --- a/src/framework/graphics/ogl/painterogl2_shadersources.h +++ b/src/framework/graphics/ogl/painterogl2_shadersources.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/painter.cpp b/src/framework/graphics/painter.cpp index 7a739497..076308f2 100644 --- a/src/framework/graphics/painter.cpp +++ b/src/framework/graphics/painter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/painter.h b/src/framework/graphics/painter.h index c08d23d8..f4335a51 100644 --- a/src/framework/graphics/painter.h +++ b/src/framework/graphics/painter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/paintershaderprogram.cpp b/src/framework/graphics/paintershaderprogram.cpp index b64d1475..70ba6e11 100644 --- a/src/framework/graphics/paintershaderprogram.cpp +++ b/src/framework/graphics/paintershaderprogram.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/paintershaderprogram.h b/src/framework/graphics/paintershaderprogram.h index 67d6bfb7..bfdc63de 100644 --- a/src/framework/graphics/paintershaderprogram.h +++ b/src/framework/graphics/paintershaderprogram.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particle.cpp b/src/framework/graphics/particle.cpp index 96b120a2..2c9642fa 100644 --- a/src/framework/graphics/particle.cpp +++ b/src/framework/graphics/particle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particle.h b/src/framework/graphics/particle.h index f75f2dad..c73cced9 100644 --- a/src/framework/graphics/particle.h +++ b/src/framework/graphics/particle.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleaffector.cpp b/src/framework/graphics/particleaffector.cpp index ea735925..c3b8ca60 100644 --- a/src/framework/graphics/particleaffector.cpp +++ b/src/framework/graphics/particleaffector.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleaffector.h b/src/framework/graphics/particleaffector.h index 0f15549d..09d7cbc7 100644 --- a/src/framework/graphics/particleaffector.h +++ b/src/framework/graphics/particleaffector.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleeffect.cpp b/src/framework/graphics/particleeffect.cpp index 386146d4..ce622b09 100644 --- a/src/framework/graphics/particleeffect.cpp +++ b/src/framework/graphics/particleeffect.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleeffect.h b/src/framework/graphics/particleeffect.h index 795c3636..7c681824 100644 --- a/src/framework/graphics/particleeffect.h +++ b/src/framework/graphics/particleeffect.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleemitter.cpp b/src/framework/graphics/particleemitter.cpp index cfc94071..c6fcf0a0 100644 --- a/src/framework/graphics/particleemitter.cpp +++ b/src/framework/graphics/particleemitter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleemitter.h b/src/framework/graphics/particleemitter.h index 7836ded7..44c6b19c 100644 --- a/src/framework/graphics/particleemitter.h +++ b/src/framework/graphics/particleemitter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particlemanager.cpp b/src/framework/graphics/particlemanager.cpp index d1008710..ad0e086f 100644 --- a/src/framework/graphics/particlemanager.cpp +++ b/src/framework/graphics/particlemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particlemanager.h b/src/framework/graphics/particlemanager.h index 3f5adeb1..5e456ee7 100644 --- a/src/framework/graphics/particlemanager.h +++ b/src/framework/graphics/particlemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particlesystem.cpp b/src/framework/graphics/particlesystem.cpp index 80ab10af..4e8c1ffd 100644 --- a/src/framework/graphics/particlesystem.cpp +++ b/src/framework/graphics/particlesystem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particlesystem.h b/src/framework/graphics/particlesystem.h index 316769b9..bb27e2b2 100644 --- a/src/framework/graphics/particlesystem.h +++ b/src/framework/graphics/particlesystem.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particletype.cpp b/src/framework/graphics/particletype.cpp index e741a4d2..f8192c9f 100644 --- a/src/framework/graphics/particletype.cpp +++ b/src/framework/graphics/particletype.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particletype.h b/src/framework/graphics/particletype.h index fbad2136..e044a05c 100644 --- a/src/framework/graphics/particletype.h +++ b/src/framework/graphics/particletype.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/shader.cpp b/src/framework/graphics/shader.cpp index 1a3d3e39..9ca7ba9d 100644 --- a/src/framework/graphics/shader.cpp +++ b/src/framework/graphics/shader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/shader.h b/src/framework/graphics/shader.h index 064f66d1..1605df62 100644 --- a/src/framework/graphics/shader.h +++ b/src/framework/graphics/shader.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/shaderprogram.cpp b/src/framework/graphics/shaderprogram.cpp index b2efc6f2..3e0569c3 100644 --- a/src/framework/graphics/shaderprogram.cpp +++ b/src/framework/graphics/shaderprogram.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/shaderprogram.h b/src/framework/graphics/shaderprogram.h index 2e4149c6..e63e566f 100644 --- a/src/framework/graphics/shaderprogram.h +++ b/src/framework/graphics/shaderprogram.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/texture.cpp b/src/framework/graphics/texture.cpp index 59923094..38d51e3d 100644 --- a/src/framework/graphics/texture.cpp +++ b/src/framework/graphics/texture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/texture.h b/src/framework/graphics/texture.h index 2ef0bfb0..32c19144 100644 --- a/src/framework/graphics/texture.h +++ b/src/framework/graphics/texture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/texturemanager.cpp b/src/framework/graphics/texturemanager.cpp index 389c3c36..39200e4a 100644 --- a/src/framework/graphics/texturemanager.cpp +++ b/src/framework/graphics/texturemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/texturemanager.h b/src/framework/graphics/texturemanager.h index 3aa2bbba..19470ba1 100644 --- a/src/framework/graphics/texturemanager.h +++ b/src/framework/graphics/texturemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/vertexarray.h b/src/framework/graphics/vertexarray.h index 6411e6eb..2bab877e 100644 --- a/src/framework/graphics/vertexarray.h +++ b/src/framework/graphics/vertexarray.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/input/mouse.cpp b/src/framework/input/mouse.cpp index e1fd0f86..ed2e384e 100644 --- a/src/framework/input/mouse.cpp +++ b/src/framework/input/mouse.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/input/mouse.h b/src/framework/input/mouse.h index 3af0bd8f..6f73171f 100644 --- a/src/framework/input/mouse.h +++ b/src/framework/input/mouse.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/declarations.h b/src/framework/luaengine/declarations.h index 55ddaee2..8312b5f5 100644 --- a/src/framework/luaengine/declarations.h +++ b/src/framework/luaengine/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/lbitlib.h b/src/framework/luaengine/lbitlib.h index b0c7542c..fc174cf5 100644 --- a/src/framework/luaengine/lbitlib.h +++ b/src/framework/luaengine/lbitlib.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luabinder.h b/src/framework/luaengine/luabinder.h index bb4e5027..04906ca2 100644 --- a/src/framework/luaengine/luabinder.h +++ b/src/framework/luaengine/luabinder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luaexception.cpp b/src/framework/luaengine/luaexception.cpp index 29c7a257..bd4b3b34 100644 --- a/src/framework/luaengine/luaexception.cpp +++ b/src/framework/luaengine/luaexception.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luaexception.h b/src/framework/luaengine/luaexception.h index 1ba2182a..23e2ac60 100644 --- a/src/framework/luaengine/luaexception.h +++ b/src/framework/luaengine/luaexception.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luainterface.cpp b/src/framework/luaengine/luainterface.cpp index f5a89894..7617a5cf 100644 --- a/src/framework/luaengine/luainterface.cpp +++ b/src/framework/luaengine/luainterface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luainterface.h b/src/framework/luaengine/luainterface.h index 4b46788e..259b2802 100644 --- a/src/framework/luaengine/luainterface.h +++ b/src/framework/luaengine/luainterface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luaobject.cpp b/src/framework/luaengine/luaobject.cpp index 26a5f70e..97a0894e 100644 --- a/src/framework/luaengine/luaobject.cpp +++ b/src/framework/luaengine/luaobject.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luaobject.h b/src/framework/luaengine/luaobject.h index f6e588bf..3378e59c 100644 --- a/src/framework/luaengine/luaobject.h +++ b/src/framework/luaengine/luaobject.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luavaluecasts.cpp b/src/framework/luaengine/luavaluecasts.cpp index ca79ce19..28490994 100644 --- a/src/framework/luaengine/luavaluecasts.cpp +++ b/src/framework/luaengine/luavaluecasts.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luavaluecasts.h b/src/framework/luaengine/luavaluecasts.h index 2b0b9b1b..983b5dae 100644 --- a/src/framework/luaengine/luavaluecasts.h +++ b/src/framework/luaengine/luavaluecasts.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luafunctions.cpp b/src/framework/luafunctions.cpp index 08cd53f8..cdb3f2be 100644 --- a/src/framework/luafunctions.cpp +++ b/src/framework/luafunctions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -135,17 +136,12 @@ void Application::registerLuaFunctions() // ConfigManager g_lua.registerSingletonClass("g_configs"); - g_lua.bindSingletonFunction("g_configs", "load", &ConfigManager::load, &g_configs); - g_lua.bindSingletonFunction("g_configs", "save", &ConfigManager::save, &g_configs); - g_lua.bindSingletonFunction("g_configs", "set", &ConfigManager::set, &g_configs); - g_lua.bindSingletonFunction("g_configs", "setList", &ConfigManager::setList, &g_configs); + g_lua.bindSingletonFunction("g_configs", "getSettings", &ConfigManager::getSettings, &g_configs); g_lua.bindSingletonFunction("g_configs", "get", &ConfigManager::get, &g_configs); - g_lua.bindSingletonFunction("g_configs", "getList", &ConfigManager::getList, &g_configs); - g_lua.bindSingletonFunction("g_configs", "exists", &ConfigManager::exists, &g_configs); - g_lua.bindSingletonFunction("g_configs", "remove", &ConfigManager::remove, &g_configs); - g_lua.bindSingletonFunction("g_configs", "setNode", &ConfigManager::setNode, &g_configs); - g_lua.bindSingletonFunction("g_configs", "mergeNode", &ConfigManager::mergeNode, &g_configs); - g_lua.bindSingletonFunction("g_configs", "getNode", &ConfigManager::getNode, &g_configs); + g_lua.bindSingletonFunction("g_configs", "loadSettings", &ConfigManager::loadSettings, &g_configs); + g_lua.bindSingletonFunction("g_configs", "load", &ConfigManager::load, &g_configs); + g_lua.bindSingletonFunction("g_configs", "unload", &ConfigManager::unload, &g_configs); + g_lua.bindSingletonFunction("g_configs", "create", &ConfigManager::create, &g_configs); // Logger g_lua.registerSingletonClass("g_logger"); @@ -187,6 +183,8 @@ void Application::registerLuaFunctions() g_lua.bindSingletonFunction("g_resources", "directoryExists", &ResourceManager::directoryExists, &g_resources); g_lua.bindSingletonFunction("g_resources", "getRealDir", &ResourceManager::getRealDir, &g_resources); g_lua.bindSingletonFunction("g_resources", "getWorkDir", &ResourceManager::getWorkDir, &g_resources); + g_lua.bindSingletonFunction("g_resources", "getUserDir", &ResourceManager::getUserDir, &g_resources); + g_lua.bindSingletonFunction("g_resources", "getWriteDir", &ResourceManager::getWriteDir, &g_resources); g_lua.bindSingletonFunction("g_resources", "getSearchPaths", &ResourceManager::getSearchPaths, &g_resources); g_lua.bindSingletonFunction("g_resources", "listDirectoryFiles", &ResourceManager::listDirectoryFiles, &g_resources); g_lua.bindSingletonFunction("g_resources", "getDirectoryFiles", &ResourceManager::getDirectoryFiles, &g_resources); @@ -194,6 +192,21 @@ void Application::registerLuaFunctions() g_lua.bindSingletonFunction("g_resources", "guessFilePath", &ResourceManager::guessFilePath, &g_resources); g_lua.bindSingletonFunction("g_resources", "isFileType", &ResourceManager::isFileType, &g_resources); g_lua.bindSingletonFunction("g_resources", "getFileTime", &ResourceManager::getFileTime, &g_resources); + g_lua.bindSingletonFunction("g_resources", "makeDir", &ResourceManager::makeDir, &g_resources); + + // Config + g_lua.registerClass(); + g_lua.bindClassMemberFunction("save", &Config::save); + g_lua.bindClassMemberFunction("unload", &Config::unload); + g_lua.bindClassMemberFunction("setValue", &Config::setValue); + g_lua.bindClassMemberFunction("setList", &Config::setList); + g_lua.bindClassMemberFunction("getValue", &Config::getValue); + g_lua.bindClassMemberFunction("getList", &Config::getList); + g_lua.bindClassMemberFunction("exists", &Config::exists); + g_lua.bindClassMemberFunction("remove", &Config::remove); + g_lua.bindClassMemberFunction("setNode", &Config::setNode); + g_lua.bindClassMemberFunction("getNode", &Config::getNode); + g_lua.bindClassMemberFunction("mergeNode", &Config::mergeNode); // Module g_lua.registerClass(); diff --git a/src/framework/net/connection.cpp b/src/framework/net/connection.cpp index 83841e74..6dba9998 100644 --- a/src/framework/net/connection.cpp +++ b/src/framework/net/connection.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/connection.h b/src/framework/net/connection.h index e80e0b1c..ffdead0e 100644 --- a/src/framework/net/connection.h +++ b/src/framework/net/connection.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/declarations.h b/src/framework/net/declarations.h index cd2536d6..cc6a6100 100644 --- a/src/framework/net/declarations.h +++ b/src/framework/net/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/inputmessage.cpp b/src/framework/net/inputmessage.cpp index 656b0360..e0fddc79 100644 --- a/src/framework/net/inputmessage.cpp +++ b/src/framework/net/inputmessage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/inputmessage.h b/src/framework/net/inputmessage.h index cb1b685e..3c681de2 100644 --- a/src/framework/net/inputmessage.h +++ b/src/framework/net/inputmessage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/outputmessage.cpp b/src/framework/net/outputmessage.cpp index 5f2379f7..6c930378 100644 --- a/src/framework/net/outputmessage.cpp +++ b/src/framework/net/outputmessage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/outputmessage.h b/src/framework/net/outputmessage.h index 530224a7..22979b3b 100644 --- a/src/framework/net/outputmessage.h +++ b/src/framework/net/outputmessage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/protocol.cpp b/src/framework/net/protocol.cpp index ae0c1be1..514ccdbe 100644 --- a/src/framework/net/protocol.cpp +++ b/src/framework/net/protocol.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/protocol.h b/src/framework/net/protocol.h index 4070c13c..e770cb70 100644 --- a/src/framework/net/protocol.h +++ b/src/framework/net/protocol.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/protocolhttp.cpp b/src/framework/net/protocolhttp.cpp index f7ec1d14..9677de08 100644 --- a/src/framework/net/protocolhttp.cpp +++ b/src/framework/net/protocolhttp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/protocolhttp.h b/src/framework/net/protocolhttp.h index fc06ebde..7c15ed54 100644 --- a/src/framework/net/protocolhttp.h +++ b/src/framework/net/protocolhttp.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/server.cpp b/src/framework/net/server.cpp index 1d77c089..8e4f2637 100644 --- a/src/framework/net/server.cpp +++ b/src/framework/net/server.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/server.h b/src/framework/net/server.h index e45b5a39..c8fe9d0e 100644 --- a/src/framework/net/server.h +++ b/src/framework/net/server.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/declarations.h b/src/framework/otml/declarations.h index 5f87e32e..79076d7f 100644 --- a/src/framework/otml/declarations.h +++ b/src/framework/otml/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otml.h b/src/framework/otml/otml.h index 91d84e56..5efe59ca 100644 --- a/src/framework/otml/otml.h +++ b/src/framework/otml/otml.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmldocument.cpp b/src/framework/otml/otmldocument.cpp index 14c70345..3e42be08 100644 --- a/src/framework/otml/otmldocument.cpp +++ b/src/framework/otml/otmldocument.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmldocument.h b/src/framework/otml/otmldocument.h index dd26393d..06e32a29 100644 --- a/src/framework/otml/otmldocument.h +++ b/src/framework/otml/otmldocument.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlemitter.cpp b/src/framework/otml/otmlemitter.cpp index 4f08b89c..8c70fa43 100644 --- a/src/framework/otml/otmlemitter.cpp +++ b/src/framework/otml/otmlemitter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlemitter.h b/src/framework/otml/otmlemitter.h index 2ff0dc19..c83cd631 100644 --- a/src/framework/otml/otmlemitter.h +++ b/src/framework/otml/otmlemitter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlexception.cpp b/src/framework/otml/otmlexception.cpp index 7b0b7254..d9caa963 100644 --- a/src/framework/otml/otmlexception.cpp +++ b/src/framework/otml/otmlexception.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlexception.h b/src/framework/otml/otmlexception.h index 652426b7..65f1420b 100644 --- a/src/framework/otml/otmlexception.h +++ b/src/framework/otml/otmlexception.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlnode.cpp b/src/framework/otml/otmlnode.cpp index 8ee6d8ee..5b37eaf9 100644 --- a/src/framework/otml/otmlnode.cpp +++ b/src/framework/otml/otmlnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlnode.h b/src/framework/otml/otmlnode.h index 8223294a..47b8cdf2 100644 --- a/src/framework/otml/otmlnode.h +++ b/src/framework/otml/otmlnode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlparser.cpp b/src/framework/otml/otmlparser.cpp index 4d953d9b..dc502cb9 100644 --- a/src/framework/otml/otmlparser.cpp +++ b/src/framework/otml/otmlparser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlparser.h b/src/framework/otml/otmlparser.h index 9f9246b6..68e73d12 100644 --- a/src/framework/otml/otmlparser.h +++ b/src/framework/otml/otmlparser.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/pch.h b/src/framework/pch.h index c8c28259..088014cf 100644 --- a/src/framework/pch.h +++ b/src/framework/pch.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/crashhandler.h b/src/framework/platform/crashhandler.h index 6a9e4fce..f1f6ef64 100644 --- a/src/framework/platform/crashhandler.h +++ b/src/framework/platform/crashhandler.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/platform.cpp b/src/framework/platform/platform.cpp index 9b7f02b9..c436880e 100644 --- a/src/framework/platform/platform.cpp +++ b/src/framework/platform/platform.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/platform.h b/src/framework/platform/platform.h index 066d4c31..78da83a2 100644 --- a/src/framework/platform/platform.h +++ b/src/framework/platform/platform.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/platformwindow.cpp b/src/framework/platform/platformwindow.cpp index b51eff23..b63e0774 100644 --- a/src/framework/platform/platformwindow.cpp +++ b/src/framework/platform/platformwindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/platformwindow.h b/src/framework/platform/platformwindow.h index 70ce8813..081b1177 100644 --- a/src/framework/platform/platformwindow.h +++ b/src/framework/platform/platformwindow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/unixcrashhandler.cpp b/src/framework/platform/unixcrashhandler.cpp index aeae5f72..baa5031c 100644 --- a/src/framework/platform/unixcrashhandler.cpp +++ b/src/framework/platform/unixcrashhandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/unixplatform.cpp b/src/framework/platform/unixplatform.cpp index d544aaa3..fcb8bd0b 100644 --- a/src/framework/platform/unixplatform.cpp +++ b/src/framework/platform/unixplatform.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/win32crashhandler.cpp b/src/framework/platform/win32crashhandler.cpp index 5c97e425..28a17c73 100644 --- a/src/framework/platform/win32crashhandler.cpp +++ b/src/framework/platform/win32crashhandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/win32platform.cpp b/src/framework/platform/win32platform.cpp index 22e5320c..88ca5a8f 100644 --- a/src/framework/platform/win32platform.cpp +++ b/src/framework/platform/win32platform.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/win32window.cpp b/src/framework/platform/win32window.cpp index cb66d528..5e5deeee 100644 --- a/src/framework/platform/win32window.cpp +++ b/src/framework/platform/win32window.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/win32window.h b/src/framework/platform/win32window.h index f0b81efe..d8cbce62 100644 --- a/src/framework/platform/win32window.h +++ b/src/framework/platform/win32window.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/x11window.cpp b/src/framework/platform/x11window.cpp index 7d32563e..56034142 100644 --- a/src/framework/platform/x11window.cpp +++ b/src/framework/platform/x11window.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/x11window.h b/src/framework/platform/x11window.h index b41cb39f..8b2d2306 100644 --- a/src/framework/platform/x11window.h +++ b/src/framework/platform/x11window.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/combinedsoundsource.cpp b/src/framework/sound/combinedsoundsource.cpp index 281d2d32..5a72cf3a 100644 --- a/src/framework/sound/combinedsoundsource.cpp +++ b/src/framework/sound/combinedsoundsource.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/combinedsoundsource.h b/src/framework/sound/combinedsoundsource.h index 15482dc3..e6ab9fad 100644 --- a/src/framework/sound/combinedsoundsource.h +++ b/src/framework/sound/combinedsoundsource.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/declarations.h b/src/framework/sound/declarations.h index c88e62c1..14919d1a 100644 --- a/src/framework/sound/declarations.h +++ b/src/framework/sound/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/oggsoundfile.cpp b/src/framework/sound/oggsoundfile.cpp index 42e13bcb..3e8c5216 100644 --- a/src/framework/sound/oggsoundfile.cpp +++ b/src/framework/sound/oggsoundfile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/oggsoundfile.h b/src/framework/sound/oggsoundfile.h index 0982bb82..7d76282c 100644 --- a/src/framework/sound/oggsoundfile.h +++ b/src/framework/sound/oggsoundfile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundbuffer.cpp b/src/framework/sound/soundbuffer.cpp index e7848685..203c97ae 100644 --- a/src/framework/sound/soundbuffer.cpp +++ b/src/framework/sound/soundbuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundbuffer.h b/src/framework/sound/soundbuffer.h index 27ed13aa..79c34bae 100644 --- a/src/framework/sound/soundbuffer.h +++ b/src/framework/sound/soundbuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundchannel.cpp b/src/framework/sound/soundchannel.cpp index fdb938fa..d7e07286 100644 --- a/src/framework/sound/soundchannel.cpp +++ b/src/framework/sound/soundchannel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundchannel.h b/src/framework/sound/soundchannel.h index 935ca04a..cdb044c0 100644 --- a/src/framework/sound/soundchannel.h +++ b/src/framework/sound/soundchannel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundfile.cpp b/src/framework/sound/soundfile.cpp index e703ac44..14e3b4dc 100644 --- a/src/framework/sound/soundfile.cpp +++ b/src/framework/sound/soundfile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundfile.h b/src/framework/sound/soundfile.h index afed579d..d1ba9f88 100644 --- a/src/framework/sound/soundfile.h +++ b/src/framework/sound/soundfile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundmanager.cpp b/src/framework/sound/soundmanager.cpp index e4a8bed3..9517ce8e 100644 --- a/src/framework/sound/soundmanager.cpp +++ b/src/framework/sound/soundmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundmanager.h b/src/framework/sound/soundmanager.h index 58376f10..4586e977 100644 --- a/src/framework/sound/soundmanager.h +++ b/src/framework/sound/soundmanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundsource.cpp b/src/framework/sound/soundsource.cpp index f7d7677c..285e208b 100644 --- a/src/framework/sound/soundsource.cpp +++ b/src/framework/sound/soundsource.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundsource.h b/src/framework/sound/soundsource.h index 539bf726..28204e1e 100644 --- a/src/framework/sound/soundsource.h +++ b/src/framework/sound/soundsource.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/streamsoundsource.cpp b/src/framework/sound/streamsoundsource.cpp index 39f84038..39ce74d1 100644 --- a/src/framework/sound/streamsoundsource.cpp +++ b/src/framework/sound/streamsoundsource.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/streamsoundsource.h b/src/framework/sound/streamsoundsource.h index bfbc60e2..1a88bfac 100644 --- a/src/framework/sound/streamsoundsource.h +++ b/src/framework/sound/streamsoundsource.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/any.h b/src/framework/stdext/any.h index 08a14aae..bd118587 100644 --- a/src/framework/stdext/any.h +++ b/src/framework/stdext/any.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/boolean.h b/src/framework/stdext/boolean.h index e0d1b8df..b9181268 100644 --- a/src/framework/stdext/boolean.h +++ b/src/framework/stdext/boolean.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/cast.h b/src/framework/stdext/cast.h index 2a44bf4d..7e8fa133 100644 --- a/src/framework/stdext/cast.h +++ b/src/framework/stdext/cast.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/compiler.h b/src/framework/stdext/compiler.h index bede8fe7..842cb3ac 100644 --- a/src/framework/stdext/compiler.h +++ b/src/framework/stdext/compiler.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/demangle.cpp b/src/framework/stdext/demangle.cpp index eca466eb..dc57eb8e 100644 --- a/src/framework/stdext/demangle.cpp +++ b/src/framework/stdext/demangle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/demangle.h b/src/framework/stdext/demangle.h index bde34287..330c7441 100644 --- a/src/framework/stdext/demangle.h +++ b/src/framework/stdext/demangle.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/dumper.h b/src/framework/stdext/dumper.h index 67733456..ab2ef4db 100644 --- a/src/framework/stdext/dumper.h +++ b/src/framework/stdext/dumper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/dynamic_storage.h b/src/framework/stdext/dynamic_storage.h index 4a27b21c..a0d3529b 100644 --- a/src/framework/stdext/dynamic_storage.h +++ b/src/framework/stdext/dynamic_storage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/exception.h b/src/framework/stdext/exception.h index 8662c6bd..3c65d8a1 100644 --- a/src/framework/stdext/exception.h +++ b/src/framework/stdext/exception.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/format.h b/src/framework/stdext/format.h index 59d96be1..2b06632d 100644 --- a/src/framework/stdext/format.h +++ b/src/framework/stdext/format.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/math.cpp b/src/framework/stdext/math.cpp index a8ec8798..5a875b7b 100644 --- a/src/framework/stdext/math.cpp +++ b/src/framework/stdext/math.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/math.h b/src/framework/stdext/math.h index f7c237d6..a48205d4 100644 --- a/src/framework/stdext/math.h +++ b/src/framework/stdext/math.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/net.cpp b/src/framework/stdext/net.cpp index 6d7ab527..cabb02a5 100644 --- a/src/framework/stdext/net.cpp +++ b/src/framework/stdext/net.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/net.h b/src/framework/stdext/net.h index c4e68610..abdeef7a 100644 --- a/src/framework/stdext/net.h +++ b/src/framework/stdext/net.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/packed_any.h b/src/framework/stdext/packed_any.h index 4b401e64..aca3db11 100644 --- a/src/framework/stdext/packed_any.h +++ b/src/framework/stdext/packed_any.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/packed_storage.h b/src/framework/stdext/packed_storage.h index 3be905db..49366bd8 100644 --- a/src/framework/stdext/packed_storage.h +++ b/src/framework/stdext/packed_storage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/packed_vector.h b/src/framework/stdext/packed_vector.h index e87f5a8e..a7f2b784 100644 --- a/src/framework/stdext/packed_vector.h +++ b/src/framework/stdext/packed_vector.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/shared_object.h b/src/framework/stdext/shared_object.h index d9788f6f..18349f11 100644 --- a/src/framework/stdext/shared_object.h +++ b/src/framework/stdext/shared_object.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/shared_ptr.h b/src/framework/stdext/shared_ptr.h index ddfd1eac..67c8ffba 100644 --- a/src/framework/stdext/shared_ptr.h +++ b/src/framework/stdext/shared_ptr.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/stdext.h b/src/framework/stdext/stdext.h index 3b27a51f..c404bd41 100644 --- a/src/framework/stdext/stdext.h +++ b/src/framework/stdext/stdext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/string.cpp b/src/framework/stdext/string.cpp index 4d2b258c..64afed28 100644 --- a/src/framework/stdext/string.cpp +++ b/src/framework/stdext/string.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/string.h b/src/framework/stdext/string.h index 0ad09a17..fef570be 100644 --- a/src/framework/stdext/string.h +++ b/src/framework/stdext/string.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/time.cpp b/src/framework/stdext/time.cpp index ac7c2ba4..d42f025e 100644 --- a/src/framework/stdext/time.cpp +++ b/src/framework/stdext/time.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/time.h b/src/framework/stdext/time.h index f60b4b36..fd8c73d0 100644 --- a/src/framework/stdext/time.h +++ b/src/framework/stdext/time.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/traits.h b/src/framework/stdext/traits.h index 1acfa0b1..a9cbbb53 100644 --- a/src/framework/stdext/traits.h +++ b/src/framework/stdext/traits.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/types.h b/src/framework/stdext/types.h index 3f8754d6..10504405 100644 --- a/src/framework/stdext/types.h +++ b/src/framework/stdext/types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/declarations.h b/src/framework/ui/declarations.h index 3573acb7..06135630 100644 --- a/src/framework/ui/declarations.h +++ b/src/framework/ui/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/ui.h b/src/framework/ui/ui.h index 3ea43a9f..dd0e4055 100644 --- a/src/framework/ui/ui.h +++ b/src/framework/ui/ui.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uianchorlayout.cpp b/src/framework/ui/uianchorlayout.cpp index a47326a5..54026f96 100644 --- a/src/framework/ui/uianchorlayout.cpp +++ b/src/framework/ui/uianchorlayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uianchorlayout.h b/src/framework/ui/uianchorlayout.h index 5c8010ad..bfe2a336 100644 --- a/src/framework/ui/uianchorlayout.h +++ b/src/framework/ui/uianchorlayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiboxlayout.cpp b/src/framework/ui/uiboxlayout.cpp index 6fe8dc53..500c6290 100644 --- a/src/framework/ui/uiboxlayout.cpp +++ b/src/framework/ui/uiboxlayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiboxlayout.h b/src/framework/ui/uiboxlayout.h index c9ac23a7..5b349b24 100644 --- a/src/framework/ui/uiboxlayout.h +++ b/src/framework/ui/uiboxlayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uigridlayout.cpp b/src/framework/ui/uigridlayout.cpp index 90648e44..1292139a 100644 --- a/src/framework/ui/uigridlayout.cpp +++ b/src/framework/ui/uigridlayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uigridlayout.h b/src/framework/ui/uigridlayout.h index a25d6dbc..f9591991 100644 --- a/src/framework/ui/uigridlayout.h +++ b/src/framework/ui/uigridlayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uihorizontallayout.cpp b/src/framework/ui/uihorizontallayout.cpp index e8596066..8cdf3239 100644 --- a/src/framework/ui/uihorizontallayout.cpp +++ b/src/framework/ui/uihorizontallayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uihorizontallayout.h b/src/framework/ui/uihorizontallayout.h index 074b6848..6f159fe4 100644 --- a/src/framework/ui/uihorizontallayout.h +++ b/src/framework/ui/uihorizontallayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uilayout.cpp b/src/framework/ui/uilayout.cpp index 7ddf935f..4ecd6f4c 100644 --- a/src/framework/ui/uilayout.cpp +++ b/src/framework/ui/uilayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uilayout.h b/src/framework/ui/uilayout.h index 3aa48722..a3762a00 100644 --- a/src/framework/ui/uilayout.h +++ b/src/framework/ui/uilayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uimanager.cpp b/src/framework/ui/uimanager.cpp index 59953f89..6b7761f8 100644 --- a/src/framework/ui/uimanager.cpp +++ b/src/framework/ui/uimanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uimanager.h b/src/framework/ui/uimanager.h index 7cc68ad6..0c55ac33 100644 --- a/src/framework/ui/uimanager.h +++ b/src/framework/ui/uimanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiparticles.cpp b/src/framework/ui/uiparticles.cpp index 9f89d879..6e5261f6 100644 --- a/src/framework/ui/uiparticles.cpp +++ b/src/framework/ui/uiparticles.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiparticles.h b/src/framework/ui/uiparticles.h index a56eda1b..92c18de0 100644 --- a/src/framework/ui/uiparticles.h +++ b/src/framework/ui/uiparticles.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uitextedit.cpp b/src/framework/ui/uitextedit.cpp index 6f14c7fd..1f99b435 100644 --- a/src/framework/ui/uitextedit.cpp +++ b/src/framework/ui/uitextedit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uitextedit.h b/src/framework/ui/uitextedit.h index 7a456bf9..cb7ffef4 100644 --- a/src/framework/ui/uitextedit.h +++ b/src/framework/ui/uitextedit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uitranslator.cpp b/src/framework/ui/uitranslator.cpp index 801f86e4..439acd9a 100644 --- a/src/framework/ui/uitranslator.cpp +++ b/src/framework/ui/uitranslator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uitranslator.h b/src/framework/ui/uitranslator.h index f4fb54d6..cf9b0556 100644 --- a/src/framework/ui/uitranslator.h +++ b/src/framework/ui/uitranslator.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiverticallayout.cpp b/src/framework/ui/uiverticallayout.cpp index 91fd8ef1..18eef4ef 100644 --- a/src/framework/ui/uiverticallayout.cpp +++ b/src/framework/ui/uiverticallayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiverticallayout.h b/src/framework/ui/uiverticallayout.h index 280cdf95..82668db2 100644 --- a/src/framework/ui/uiverticallayout.h +++ b/src/framework/ui/uiverticallayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiwidget.cpp b/src/framework/ui/uiwidget.cpp index 4a6b84b0..a4660f91 100644 --- a/src/framework/ui/uiwidget.cpp +++ b/src/framework/ui/uiwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiwidget.h b/src/framework/ui/uiwidget.h index 259cf68b..c6af53ee 100644 --- a/src/framework/ui/uiwidget.h +++ b/src/framework/ui/uiwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiwidgetbasestyle.cpp b/src/framework/ui/uiwidgetbasestyle.cpp index 0c15286b..d4aed1ed 100644 --- a/src/framework/ui/uiwidgetbasestyle.cpp +++ b/src/framework/ui/uiwidgetbasestyle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiwidgetimage.cpp b/src/framework/ui/uiwidgetimage.cpp index 79d90ec2..a34856e9 100644 --- a/src/framework/ui/uiwidgetimage.cpp +++ b/src/framework/ui/uiwidgetimage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiwidgettext.cpp b/src/framework/ui/uiwidgettext.cpp index 969e3a79..80eee5dc 100644 --- a/src/framework/ui/uiwidgettext.cpp +++ b/src/framework/ui/uiwidgettext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/color.cpp b/src/framework/util/color.cpp index 483291af..ea329d5d 100644 --- a/src/framework/util/color.cpp +++ b/src/framework/util/color.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/color.h b/src/framework/util/color.h index 0b4c3351..3d481602 100644 --- a/src/framework/util/color.h +++ b/src/framework/util/color.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/crypt.cpp b/src/framework/util/crypt.cpp index e359de15..ce3e0a82 100644 --- a/src/framework/util/crypt.cpp +++ b/src/framework/util/crypt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/crypt.h b/src/framework/util/crypt.h index 1288c417..2934ee8c 100644 --- a/src/framework/util/crypt.h +++ b/src/framework/util/crypt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/databuffer.h b/src/framework/util/databuffer.h index c69dcecb..32b1f9d6 100644 --- a/src/framework/util/databuffer.h +++ b/src/framework/util/databuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/matrix.h b/src/framework/util/matrix.h index 3e66e70c..e90b2350 100644 --- a/src/framework/util/matrix.h +++ b/src/framework/util/matrix.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/point.h b/src/framework/util/point.h index 66487c47..ce1edf35 100644 --- a/src/framework/util/point.h +++ b/src/framework/util/point.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/rect.h b/src/framework/util/rect.h index e56e7c40..dfeb4ce8 100644 --- a/src/framework/util/rect.h +++ b/src/framework/util/rect.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/size.h b/src/framework/util/size.h index f2ffb822..d049a6fa 100644 --- a/src/framework/util/size.h +++ b/src/framework/util/size.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main.cpp b/src/main.cpp index 091aa6a7..3108e896 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 OTClient + * Copyright (c) 2010-2014 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal