Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannah von Reth <hannah.vonreth@owncloud.com>2020-05-20 12:05:15 +0300
committerHannah von Reth <vonreth@kde.org>2020-05-20 13:20:54 +0300
commitcb6737c10dd1706578d25f79a32ad072b837332e (patch)
treee7d9ac54a360d80b9044f8e9f5318c7d640c29ce /shell_integration
parentc01bb8ce09ac1f8781352190118ffc08fddf2c90 (diff)
Remove dead code
Diffstat (limited to 'shell_integration')
-rw-r--r--shell_integration/windows/OCOverlays/OCOverlay.cpp1
-rw-r--r--shell_integration/windows/OCUtil/CMakeLists.txt2
-rw-r--r--shell_integration/windows/OCUtil/FileUtil.cpp84
-rw-r--r--shell_integration/windows/OCUtil/FileUtil.h40
-rw-r--r--shell_integration/windows/OCUtil/RegistryUtil.cpp70
-rw-r--r--shell_integration/windows/OCUtil/RegistryUtil.h35
6 files changed, 0 insertions, 232 deletions
diff --git a/shell_integration/windows/OCOverlays/OCOverlay.cpp b/shell_integration/windows/OCOverlays/OCOverlay.cpp
index b5be36838..bd26a50d8 100644
--- a/shell_integration/windows/OCOverlays/OCOverlay.cpp
+++ b/shell_integration/windows/OCOverlays/OCOverlay.cpp
@@ -15,7 +15,6 @@
#include "OCOverlay.h"
#include "OCOverlayFactory.h"
-#include "RegistryUtil.h"
#include "StringUtil.h"
#include "UtilConstants.h"
diff --git a/shell_integration/windows/OCUtil/CMakeLists.txt b/shell_integration/windows/OCUtil/CMakeLists.txt
index cf31dd3da..13a9f6f53 100644
--- a/shell_integration/windows/OCUtil/CMakeLists.txt
+++ b/shell_integration/windows/OCUtil/CMakeLists.txt
@@ -1,7 +1,5 @@
add_library(OCUtil STATIC
CommunicationSocket.cpp
- FileUtil.cpp
- RegistryUtil.cpp
RemotePathChecker.cpp
StringUtil.cpp
OCUtil.rc
diff --git a/shell_integration/windows/OCUtil/FileUtil.cpp b/shell_integration/windows/OCUtil/FileUtil.cpp
deleted file mode 100644
index 971254c35..000000000
--- a/shell_integration/windows/OCUtil/FileUtil.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright (c) 2000-2013 Liferay, Inc. All 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.
- */
-
-#include "FileUtil.h"
-#include "RegistryUtil.h"
-#include "UtilConstants.h"
-
-using namespace std;
-
-bool FileUtil::IsChildFile(const wchar_t* rootFolder, vector<wstring>* files)
-{
- for(vector<wstring>::iterator it = files->begin(); it != files->end(); it++)
- {
- wstring file = *it;
-
- size_t found = file.find(rootFolder);
-
- if(found != string::npos)
- {
- return true;
- }
- }
-
- return false;
-}
-
-bool FileUtil::IsChildFile(const wchar_t* rootFolder, const wchar_t* file)
-{
- wstring* f = new wstring(file);
-
- size_t found = f->find(rootFolder);
-
- if(found != string::npos)
- {
- return true;
- }
-
- return false;
-}
-
-bool FileUtil::IsChildFileOfRoot(std::vector<std::wstring>* files)
-{
- wstring* rootFolder = new wstring();
- bool needed = false;
-
- if(RegistryUtil::ReadRegistry(REGISTRY_ROOT_KEY, REGISTRY_FILTER_FOLDER, rootFolder))
- {
- if(IsChildFile(rootFolder->c_str(), files))
- {
- needed = true;
- }
- }
-
- delete rootFolder;
- return needed;
-}
-
-bool FileUtil::IsChildFileOfRoot(const wchar_t* filePath)
-{
- wstring* rootFolder = new wstring();
- bool needed = false;
-
- if(RegistryUtil::ReadRegistry(REGISTRY_ROOT_KEY, REGISTRY_FILTER_FOLDER, rootFolder))
- {
- if(FileUtil::IsChildFile(rootFolder->c_str(), filePath))
- {
- needed = true;
- }
- }
-
- delete rootFolder;
- return needed;
-}
diff --git a/shell_integration/windows/OCUtil/FileUtil.h b/shell_integration/windows/OCUtil/FileUtil.h
deleted file mode 100644
index 35a5be089..000000000
--- a/shell_integration/windows/OCUtil/FileUtil.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2000-2013 Liferay, Inc. All 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.
- */
-
-#ifndef FILEUTIL_H
-#define FILEUTIL_H
-
-#pragma once
-
-#pragma warning (disable : 4251)
-
-#include <string>
-#include <vector>
-
-class __declspec(dllexport) FileUtil
-{
-public:
- FileUtil();
-
- ~FileUtil();
-
- static bool IsChildFile(const wchar_t*, std::vector<std::wstring>*);
- static bool IsChildFile(const wchar_t*, const wchar_t*);
- static bool IsChildFileOfRoot(std::vector<std::wstring>*);
- static bool IsChildFileOfRoot(const wchar_t*);
-
-private:
-};
-
-#endif \ No newline at end of file
diff --git a/shell_integration/windows/OCUtil/RegistryUtil.cpp b/shell_integration/windows/OCUtil/RegistryUtil.cpp
deleted file mode 100644
index 94ca82558..000000000
--- a/shell_integration/windows/OCUtil/RegistryUtil.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (c) 2000-2013 Liferay, Inc. All 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.
- */
-
-#include "RegistryUtil.h"
-
-#include <windows.h>
-
-using namespace std;
-
-#define SIZE 4096
-
-bool RegistryUtil::ReadRegistry(const wchar_t* key, const wchar_t* name, int* result)
-{
- wstring* strResult = new wstring();
-
- if(!ReadRegistry(key, name, strResult))
- {
- return false;
- }
-
- *result = stoi( strResult->c_str() );
-
- return true;
-}
-
-bool RegistryUtil::ReadRegistry(const wchar_t* key, const wchar_t* name, wstring* result)
-{
- HRESULT hResult;
-
- HKEY rootKey = NULL;
-
- hResult = HRESULT_FROM_WIN32(RegOpenKeyEx(HKEY_CURRENT_USER, (LPCWSTR)key, NULL, KEY_READ, &rootKey));
-
- if(!SUCCEEDED(hResult))
- {
- return false;
- }
-
- wchar_t value[SIZE];
- DWORD value_length = SIZE;
-
- hResult = RegQueryValueEx(rootKey, (LPCWSTR)name, NULL, NULL, (LPBYTE)value, &value_length );
-
- if(!SUCCEEDED(hResult))
- {
- return false;
- }
-
- result->append(value);
-
- HRESULT hResult2 = RegCloseKey(rootKey);
-
- if (!SUCCEEDED(hResult2))
- {
- return false;
- }
-
- return true;
-}
diff --git a/shell_integration/windows/OCUtil/RegistryUtil.h b/shell_integration/windows/OCUtil/RegistryUtil.h
deleted file mode 100644
index 9cc40a957..000000000
--- a/shell_integration/windows/OCUtil/RegistryUtil.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2000-2013 Liferay, Inc. All 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.
- */
-
-#ifndef REGISTRYUTIL_H
-#define REGISTRYUTIL_H
-
-#pragma once
-
-#pragma warning (disable : 4251)
-
-#include <string>
-
-class __declspec(dllexport) RegistryUtil
-{
-public:
- RegistryUtil();
-
- ~RegistryUtil();
-
- static bool ReadRegistry(const wchar_t*, const wchar_t*, int*);
- static bool ReadRegistry(const wchar_t*, const wchar_t*, std::wstring*);
-};
-
-#endif \ No newline at end of file