# HG changeset patch # User Santeri Piippo # Date 1401703258 -10800 # Node ID 2a8e4bbb5a947618cea5f37c925a20604759d724 # Parent f82ab4d3c7b4d77dcc3d8ff6a1cfbede3b193612 - removed code rendered unnecessary diff -r f82ab4d3c7b4 -r 2a8e4bbb5a94 CMakeLists.txt --- a/CMakeLists.txt Mon Jun 02 12:50:40 2014 +0300 +++ b/CMakeLists.txt Mon Jun 02 13:00:58 2014 +0300 @@ -51,8 +51,6 @@ src/macros.h src/crashCatcher.h src/colors.h - src/misc/documentPointer.h - src/misc/invokeLater.h src/misc/ringFinder.h src/ldDocument.h src/addObjectDialog.h diff -r f82ab4d3c7b4 -r 2a8e4bbb5a94 src/ldDocument.cc --- a/src/ldDocument.cc Mon Jun 02 12:50:40 2014 +0300 +++ b/src/ldDocument.cc Mon Jun 02 13:00:58 2014 +0300 @@ -30,7 +30,6 @@ #include "editHistory.h" #include "dialogs.h" #include "glRenderer.h" -#include "misc/invokeLater.h" #include "glCompiler.h" CFGENTRY (String, ldrawPath, "") diff -r f82ab4d3c7b4 -r 2a8e4bbb5a94 src/ldObject.h --- a/src/ldObject.h Mon Jun 02 12:50:40 2014 +0300 +++ b/src/ldObject.h Mon Jun 02 13:00:58 2014 +0300 @@ -20,7 +20,6 @@ #include #include "main.h" #include "basics.h" -#include "misc/documentPointer.h" #include "glShared.h" #define LDOBJ(T) \ diff -r f82ab4d3c7b4 -r 2a8e4bbb5a94 src/misc/documentPointer.h diff -r f82ab4d3c7b4 -r 2a8e4bbb5a94 src/misc/invokeLater.cc --- a/src/misc/invokeLater.cc Mon Jun 02 12:50:40 2014 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* - * LDForge: LDraw parts authoring CAD - * Copyright (C) 2013, 2014 Santeri Piippo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "invokeLater.h" -#include "../miscallenous.h" - -static InvokationDeferer* g_invokationDeferer = new InvokationDeferer(); - -// ============================================================================= -// -InvokationDeferer::InvokationDeferer (QObject* parent) : QObject (parent) -{ - connect (this, SIGNAL (functionAdded()), this, SLOT (invokeFunctions()), - Qt::QueuedConnection); -} - -// ============================================================================= -// -void InvokationDeferer::addFunctionCall (InvokationDeferer::FunctionType func) -{ - m_funcs << func; - removeDuplicates (m_funcs); - emit functionAdded(); -} - -// ============================================================================= -// -void InvokationDeferer::invokeFunctions() -{ - for (FunctionType func : m_funcs) - (*func)(); - - m_funcs.clear(); -} - -// ============================================================================= -// -void invokeLater (InvokationDeferer::FunctionType func) -{ - g_invokationDeferer->addFunctionCall (func); -} \ No newline at end of file diff -r f82ab4d3c7b4 -r 2a8e4bbb5a94 src/misc/invokeLater.h --- a/src/misc/invokeLater.h Mon Jun 02 12:50:40 2014 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -/* - * LDForge: LDraw parts authoring CAD - * Copyright (C) 2013, 2014 Santeri Piippo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once -#include - -class InvokationDeferer : public QObject -{ - Q_OBJECT - - public: - using FunctionType = void(*)(); - - explicit InvokationDeferer (QObject* parent = 0); - void addFunctionCall (FunctionType func); - - signals: - void functionAdded(); - - private: - QList m_funcs; - - private slots: - void invokeFunctions(); -}; - -void invokeLater (InvokationDeferer::FunctionType func); diff -r f82ab4d3c7b4 -r 2a8e4bbb5a94 src/miscallenous.cc --- a/src/miscallenous.cc Mon Jun 02 12:50:40 2014 +0300 +++ b/src/miscallenous.cc Mon Jun 02 13:00:58 2014 +0300 @@ -26,7 +26,6 @@ #include "ldDocument.h" #include "ui_rotpoint.h" #include "misc/ringFinder.cc" -#include "misc/invokeLater.cc" // Prime number table. const int g_primes[NUM_PRIMES] =