From efc4219c5b5127ba4a111ff65cae06443efe1908 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sun, 25 Jan 2015 20:48:23 +0100 Subject: [PATCH] Happy new year 2015 !!! --- README.html | 2 +- include/MUtils/CPUFeatures.h | 2 +- include/MUtils/ErrorHandler.h | 2 +- include/MUtils/Exception.h | 2 +- include/MUtils/GUI.h | 2 +- include/MUtils/Global.h | 2 +- include/MUtils/IPCChannel.h | 2 +- include/MUtils/JobObject.h | 2 +- include/MUtils/KeccakHash.h | 2 +- include/MUtils/OSSupport.h | 2 +- include/MUtils/Sound.h | 2 +- include/MUtils/Startup.h | 2 +- include/MUtils/Taskbar7.h | 2 +- include/MUtils/Terminal.h | 2 +- include/MUtils/Translation.h | 2 +- include/MUtils/UpdateChecker.h | 2 +- include/MUtils/Version.h | 2 +- src/CPUFeatures_Win32.cpp | 2 +- src/Config.h | 2 +- src/CriticalSection_Win32.h | 2 +- src/DLLMain.cpp | 2 +- src/DirLocker.h | 2 +- src/ErrorHandler_Win32.cpp | 2 +- src/GUI.cpp | 2 +- src/GUI_Win32.cpp | 2 +- src/Global.cpp | 31 +++++++++++++++++++------------ src/IPCChannel.cpp | 2 +- src/JobObject_Win32.cpp | 2 +- src/KeccakHash.cpp | 2 +- src/Sound_Win32.cpp | 2 +- src/Taskbar7_Win32.cpp | 2 +- src/Terminal_Win32.cpp | 2 +- src/Translation.cpp | 2 +- src/UpdateChecker.cpp | 2 +- src/Utils_Win32.h | 2 +- src/Version.cpp | 2 +- 36 files changed, 54 insertions(+), 47 deletions(-) diff --git a/README.html b/README.html index e113568..e25c5d2 100644 --- a/README.html +++ b/README.html @@ -24,7 +24,7 @@

License Information

This library is free software. It is released under the terms of the GNU Lesser General Public License (LGPL), Version 2.1.

- 

MUtilities – MuldeR's Utilities for Qt
Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>. Some rights reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library 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
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+ 

MUtilities – MuldeR's Utilities for Qt
Copyright (C) 2004-2015 LoRd_MuldeR <MuldeR2@GMX.de>. Some rights reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library 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
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.

Acknowledgement

The following third-party code is used in the MUtilities library: diff --git a/include/MUtils/CPUFeatures.h b/include/MUtils/CPUFeatures.h index d1b02c4..5c8b147 100644 --- a/include/MUtils/CPUFeatures.h +++ b/include/MUtils/CPUFeatures.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/ErrorHandler.h b/include/MUtils/ErrorHandler.h index dee25de..63419f4 100644 --- a/include/MUtils/ErrorHandler.h +++ b/include/MUtils/ErrorHandler.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/Exception.h b/include/MUtils/Exception.h index 1ece717..3af29c3 100644 --- a/include/MUtils/Exception.h +++ b/include/MUtils/Exception.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/GUI.h b/include/MUtils/GUI.h index 9140e02..66bb0c7 100644 --- a/include/MUtils/GUI.h +++ b/include/MUtils/GUI.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/Global.h b/include/MUtils/Global.h index 8498495..c67e050 100644 --- a/include/MUtils/Global.h +++ b/include/MUtils/Global.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/IPCChannel.h b/include/MUtils/IPCChannel.h index 2c7b8dc..7208829 100644 --- a/include/MUtils/IPCChannel.h +++ b/include/MUtils/IPCChannel.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/JobObject.h b/include/MUtils/JobObject.h index b6b47ad..6216296 100644 --- a/include/MUtils/JobObject.h +++ b/include/MUtils/JobObject.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/KeccakHash.h b/include/MUtils/KeccakHash.h index 42ebd52..6301695 100644 --- a/include/MUtils/KeccakHash.h +++ b/include/MUtils/KeccakHash.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/OSSupport.h b/include/MUtils/OSSupport.h index 59f5cf8..ca1e03f 100644 --- a/include/MUtils/OSSupport.h +++ b/include/MUtils/OSSupport.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/Sound.h b/include/MUtils/Sound.h index 06c8968..74115ec 100644 --- a/include/MUtils/Sound.h +++ b/include/MUtils/Sound.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/Startup.h b/include/MUtils/Startup.h index e420982..2d1c638 100644 --- a/include/MUtils/Startup.h +++ b/include/MUtils/Startup.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/Taskbar7.h b/include/MUtils/Taskbar7.h index bbd35fe..da7580c 100644 --- a/include/MUtils/Taskbar7.h +++ b/include/MUtils/Taskbar7.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/Terminal.h b/include/MUtils/Terminal.h index 014296c..5379f5d 100644 --- a/include/MUtils/Terminal.h +++ b/include/MUtils/Terminal.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/Translation.h b/include/MUtils/Translation.h index 67fe8a5..926aab6 100644 --- a/include/MUtils/Translation.h +++ b/include/MUtils/Translation.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/UpdateChecker.h b/include/MUtils/UpdateChecker.h index 4ad9f00..c9915a6 100644 --- a/include/MUtils/UpdateChecker.h +++ b/include/MUtils/UpdateChecker.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/include/MUtils/Version.h b/include/MUtils/Version.h index 4d7ef16..f273ab7 100644 --- a/include/MUtils/Version.h +++ b/include/MUtils/Version.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/CPUFeatures_Win32.cpp b/src/CPUFeatures_Win32.cpp index 7658eb1..336ef84 100644 --- a/src/CPUFeatures_Win32.cpp +++ b/src/CPUFeatures_Win32.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/Config.h b/src/Config.h index f30581f..9d540be 100644 --- a/src/Config.h +++ b/src/Config.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/CriticalSection_Win32.h b/src/CriticalSection_Win32.h index e55b30e..fbb2358 100644 --- a/src/CriticalSection_Win32.h +++ b/src/CriticalSection_Win32.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/DLLMain.cpp b/src/DLLMain.cpp index 71f9ec2..2bbe4a2 100644 --- a/src/DLLMain.cpp +++ b/src/DLLMain.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/DirLocker.h b/src/DirLocker.h index c1ce608..4865b32 100644 --- a/src/DirLocker.h +++ b/src/DirLocker.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/ErrorHandler_Win32.cpp b/src/ErrorHandler_Win32.cpp index 76208ef..c1f6223 100644 --- a/src/ErrorHandler_Win32.cpp +++ b/src/ErrorHandler_Win32.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/GUI.cpp b/src/GUI.cpp index 39863d4..002ae4f 100644 --- a/src/GUI.cpp +++ b/src/GUI.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/GUI_Win32.cpp b/src/GUI_Win32.cpp index 591a9cd..28957ac 100644 --- a/src/GUI_Win32.cpp +++ b/src/GUI_Win32.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/Global.cpp b/src/Global.cpp index ca1864b..8af6280 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -152,22 +152,26 @@ static MUtils::Internal::DirLock *try_init_temp_folder(const QString &baseDir) return NULL; } -static void temp_folder_cleanup_helper(const QString &tempPath) +static bool temp_folder_cleanup_helper(const QString &tempPath) { - bool okay = false; - for(int i = 0; i < 32; i++) + size_t delay = 1; + static const size_t MAX_DELAY = 8192; + forever { QDir::setCurrent(QDir::rootPath()); if(MUtils::remove_directory(tempPath, true)) { - okay = true; - break; + return true; + } + else + { + if(delay > MAX_DELAY) + { + return false; + } + MUtils::OS::sleep_ms(delay); + delay *= 2; } - MUtils::OS::sleep_ms(125); - } - if(!okay) - { - MUtils::OS::system_message_wrn(L"Temp Cleaner", L"Warning: Not all temporary files could be removed!"); } } @@ -180,7 +184,10 @@ static void temp_folder_cleaup(void) { const QString tempPath = g_temp_folder_file->getPath(); g_temp_folder_file.reset(NULL); - temp_folder_cleanup_helper(tempPath); + if(!temp_folder_cleanup_helper(tempPath)) + { + MUtils::OS::system_message_wrn(L"Temp Cleaner", L"Warning: Not all temporary files could be removed!"); + } } } diff --git a/src/IPCChannel.cpp b/src/IPCChannel.cpp index 25a36af..042d59a 100644 --- a/src/IPCChannel.cpp +++ b/src/IPCChannel.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/JobObject_Win32.cpp b/src/JobObject_Win32.cpp index b39a54a..a5a89af 100644 --- a/src/JobObject_Win32.cpp +++ b/src/JobObject_Win32.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // LameXP - Audio Encoder Front-End -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // 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 diff --git a/src/KeccakHash.cpp b/src/KeccakHash.cpp index ae88817..6962a49 100644 --- a/src/KeccakHash.cpp +++ b/src/KeccakHash.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/Sound_Win32.cpp b/src/Sound_Win32.cpp index 86b16a4..d2e240b 100644 --- a/src/Sound_Win32.cpp +++ b/src/Sound_Win32.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/Taskbar7_Win32.cpp b/src/Taskbar7_Win32.cpp index 9b8501d..205ed55 100644 --- a/src/Taskbar7_Win32.cpp +++ b/src/Taskbar7_Win32.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // LameXP - Audio Encoder Front-End -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // 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 diff --git a/src/Terminal_Win32.cpp b/src/Terminal_Win32.cpp index 0dcc7f2..c72303b 100644 --- a/src/Terminal_Win32.cpp +++ b/src/Terminal_Win32.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // LameXP - Audio Encoder Front-End -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // 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 diff --git a/src/Translation.cpp b/src/Translation.cpp index a1b20ee..5d0f08c 100644 --- a/src/Translation.cpp +++ b/src/Translation.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/UpdateChecker.cpp b/src/UpdateChecker.cpp index 5b30ab1..5e1e0b8 100644 --- a/src/UpdateChecker.cpp +++ b/src/UpdateChecker.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/Utils_Win32.h b/src/Utils_Win32.h index 97e0bbc..bb6512f 100644 --- a/src/Utils_Win32.h +++ b/src/Utils_Win32.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/Version.cpp b/src/Version.cpp index d31a933..2af362e 100644 --- a/src/Version.cpp +++ b/src/Version.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // MuldeR's Utilities for Qt -// Copyright (C) 2004-2014 LoRd_MuldeR +// Copyright (C) 2004-2015 LoRd_MuldeR // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public