diff --git a/CMakeLists.txt b/CMakeLists.txt index c2cc7c9d..0d937222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ SET(SOURCES src/teststate.cpp # game net - src/protocollogin.cpp + #src/protocollogin.cpp # framework core src/framework/core/dispatcher.cpp @@ -94,22 +94,19 @@ SET(SOURCES src/framework/ui/uicontainer.cpp src/framework/ui/uiskins.cpp src/framework/ui/uiloader.cpp - src/framework/ui/uipanel.cpp src/framework/ui/uibutton.cpp src/framework/ui/uilabel.cpp src/framework/ui/uiwindow.cpp src/framework/ui/uiwindowskin.cpp src/framework/ui/uitextedit.cpp src/framework/ui/uitexteditskin.cpp - src/framework/ui/uilinedecorationskin.cpp src/framework/ui/uicheckboxskin.cpp - src/framework/ui/uilinedecoration.cpp src/framework/ui/uicheckbox.cpp # framework net - src/framework/net/connection.cpp - src/framework/net/protocol.cpp - src/framework/net/networkmessage.cpp + #src/framework/net/connection.cpp + #src/framework/net/protocol.cpp + #src/framework/net/networkmessage.cpp ) IF(WIN32) diff --git a/src/framework/ui/uilinedecoration.cpp b/src/framework/ui/uilinedecoration.cpp deleted file mode 100644 index cdb2a112..00000000 --- a/src/framework/ui/uilinedecoration.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* The MIT License - * - * Copyright (c) 2010 OTClient, https://github.com/edubart/otclient - * - * 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 "uilinedecoration.h" - diff --git a/src/framework/ui/uilinedecoration.h b/src/framework/ui/uilinedecoration.h deleted file mode 100644 index 389ff181..00000000 --- a/src/framework/ui/uilinedecoration.h +++ /dev/null @@ -1,40 +0,0 @@ -/* The MIT License - * - * Copyright (c) 2010 OTClient, https://github.com/edubart/otclient - * - * 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 UILINEDECORATION_H -#define UILINEDECORATION_H - -#include "prerequisites.h" -#include "uielement.h" - -class UILineDecoration : public UIElement -{ -public: - UILineDecoration() : - UIElement(UI::LineDecoration) { } -}; - -typedef boost::shared_ptr UILineDecorationPtr; - -#endif // UILINEDECORATION_H diff --git a/src/framework/ui/uilinedecorationskin.cpp b/src/framework/ui/uilinedecorationskin.cpp deleted file mode 100644 index ee7ab729..00000000 --- a/src/framework/ui/uilinedecorationskin.cpp +++ /dev/null @@ -1,30 +0,0 @@ -/* The MIT License - * - * Copyright (c) 2010 OTClient, https://github.com/edubart/otclient - * - * 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 "uilinedecorationskin.h" - -void UILineDecorationSkin::draw(UIElement* element) -{ - UIElementSkin::draw(element); -} diff --git a/src/framework/ui/uilinedecorationskin.h b/src/framework/ui/uilinedecorationskin.h deleted file mode 100644 index fa009160..00000000 --- a/src/framework/ui/uilinedecorationskin.h +++ /dev/null @@ -1,40 +0,0 @@ -/* The MIT License - * - * Copyright (c) 2010 OTClient, https://github.com/edubart/otclient - * - * 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 UILINEDECORATIONSKIN_H -#define UILINEDECORATIONSKIN_H - -#include "prerequisites.h" -#include "uielementskin.h" - -class UILineDecorationSkin : public UIElementSkin -{ -public: - UILineDecorationSkin(const std::string& name) : - UIElementSkin(name, UI::LineDecoration) { } - - void draw(UIElement *element); -}; - -#endif // UILINEDECORATIONSKIN_H diff --git a/src/framework/ui/uipanel.cpp b/src/framework/ui/uipanel.cpp deleted file mode 100644 index 7aa465de..00000000 --- a/src/framework/ui/uipanel.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/* The MIT License - * - * Copyright (c) 2010 OTClient, https://github.com/edubart/otclient - * - * 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 "uipanel.h" diff --git a/src/framework/ui/uipanel.h b/src/framework/ui/uipanel.h deleted file mode 100644 index d69a20fb..00000000 --- a/src/framework/ui/uipanel.h +++ /dev/null @@ -1,40 +0,0 @@ -/* The MIT License - * - * Copyright (c) 2010 OTClient, https://github.com/edubart/otclient - * - * 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 UIPANEL_H -#define UIPANEL_H - -#include "prerequisites.h" -#include "uicontainer.h" -#include "graphics/borderedimage.h" - -class UIPanel : public UIContainer -{ -public: - UIPanel() : UIContainer(UI::Panel) { } -}; - -typedef boost::shared_ptr UIPanelPtr; - -#endif // UIPANEL_H