Revision: 25408
http://sourceforge.net/p/bibdesk/svn/25408
Author: hofman
Date: 2021-01-16 00:19:48 +0000 (Sat, 16 Jan 2021)
Log Message:
-----------
Remove FVObject class
Modified Paths:
--------------
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVBitmapContext.h
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVCacheFile.mm
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVIcon.h
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVThread.m
trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.xcodeproj/project.pbxproj
trunk/bibdesk_vendorsrc/amaxwell/FileView/_FVMappedDataProvider.m
Removed Paths:
-------------
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVObject.h
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVObject.m
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVBitmapContext.h
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVBitmapContext.h 2021-01-15
23:38:45 UTC (rev 25407)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVBitmapContext.h 2021-01-16
00:19:48 UTC (rev 25408)
@@ -40,7 +40,6 @@
#define _FVBITMAPCONTEXT_H_
#import <Cocoa/Cocoa.h>
-#import <FVObject.h>
__BEGIN_DECLS
@@ -54,7 +53,7 @@
*/
-@interface FVBitmapContext : FVObject
+@interface FVBitmapContext : NSObject
{
@private
CGContextRef _port;
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVCacheFile.mm
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVCacheFile.mm 2021-01-15
23:38:45 UTC (rev 25407)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVCacheFile.mm 2021-01-16
00:19:48 UTC (rev 25408)
@@ -38,7 +38,6 @@
#import "FVCacheFile.h"
#import "FVUtilities.h"
-#import "FVObject.h"
#import "FVAllocator.h"
#import <libkern/OSAtomic.h>
@@ -48,7 +47,7 @@
#import <zlib.h>
#import <sys/mman.h>
-@interface _FVCacheKey : FVObject <NSCopying>
+@interface _FVCacheKey : NSObject <NSCopying>
{
@public;
dev_t _device;
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m 2021-01-15
23:38:45 UTC (rev 25407)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m 2021-01-16
00:19:48 UTC (rev 25408)
@@ -110,7 +110,7 @@
#pragma mark -
-@interface _FVControllerFileKey : FVObject
+@interface _FVControllerFileKey : NSObject
{
@public;
char *_filePath;
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVIcon.h
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVIcon.h 2021-01-15 23:38:45 UTC
(rev 25407)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVIcon.h 2021-01-16 00:19:48 UTC
(rev 25408)
@@ -37,7 +37,6 @@
*/
#import <Cocoa/Cocoa.h>
-#import "FVObject.h"
/** Abstract class used for drawing in FileView
@@ -46,7 +45,7 @@
The iconWithURL: factory method is designed to be cheap, in that it does no
rendering, should will require very little memory or disk access just for
initialization. Only after calling renderForSize: will memory usage increase
substantially, as data is cached and bitmaps created. Icons that won't be
displayed for some time (scrolled out of sight) should be sent a
releaseResources message by the view in order to free up (some) of the cached
data. Subsequent calls to renderForSize: should be substantially less
expensive, since data will be read from the disk cache.
This class is thread safe, but it is not reentrant. You can abuse it to
create deadlocks. Don't do that. */
-@interface FVIcon : FVObject
+@interface FVIcon : NSObject
/** Primitive method.
Deleted: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVObject.h
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVObject.h 2021-01-15
23:38:45 UTC (rev 25407)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVObject.h 2021-01-16
00:19:48 UTC (rev 25408)
@@ -1,42 +0,0 @@
-//
-// FVObject.h
-// FileView
-//
-// Created by Adam Maxwell on 07/21/08.
-/*
- This software is Copyright (c) 2008-2021
- Adam Maxwell. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Adam Maxwell nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-
-@interface FVObject : NSObject
-@end
Deleted: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVObject.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVObject.m 2021-01-15
23:38:45 UTC (rev 25407)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVObject.m 2021-01-16
00:19:48 UTC (rev 25408)
@@ -1,42 +0,0 @@
-//
-// FVObject.m
-// FileView
-//
-// Created by Adam Maxwell on 07/21/08.
-/*
- This software is Copyright (c) 2008-2021
- Adam Maxwell. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Adam Maxwell nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "FVObject.h"
-
-@implementation FVObject
-@end
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVThread.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVThread.m 2021-01-15
23:38:45 UTC (rev 25407)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVThread.m 2021-01-16
00:19:48 UTC (rev 25408)
@@ -37,7 +37,6 @@
*/
#import "FVThread.h"
-#import "FVObject.h"
#import "FVUtilities.h"
#import <libkern/OSAtomic.h>
#import <pthread.h>
@@ -54,7 +53,7 @@
FVThreadDie = 4
};
-@interface _FVThread : FVObject
+@interface _FVThread : NSObject
{
@private
CFAbsoluteTime _lastPerformTime;
Modified:
trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.xcodeproj/project.pbxproj
===================================================================
---
trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.xcodeproj/project.pbxproj
2021-01-15 23:38:45 UTC (rev 25407)
+++
trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView.xcodeproj/project.pbxproj
2021-01-16 00:19:48 UTC (rev 25408)
@@ -70,8 +70,6 @@
CEFC1D0C0F6AB8AD00B2AEE6 /* FVCGImageUtilities.mm in Sources */
= {isa = PBXBuildFile; fileRef = CEFC1D060F6AB8AD00B2AEE6 /*
FVCGImageUtilities.mm */; };
CEFC1D0D0F6AB8AD00B2AEE6 /* FVImageBuffer.h in Headers */ =
{isa = PBXBuildFile; fileRef = CEFC1D070F6AB8AD00B2AEE6 /* FVImageBuffer.h */;
};
CEFC1D0E0F6AB8AD00B2AEE6 /* FVImageBuffer.m in Sources */ =
{isa = PBXBuildFile; fileRef = CEFC1D080F6AB8AD00B2AEE6 /* FVImageBuffer.m */;
};
- CEFC1D170F6AB94F00B2AEE6 /* FVObject.h in Headers */ = {isa =
PBXBuildFile; fileRef = CEFC1D110F6AB94F00B2AEE6 /* FVObject.h */; };
- CEFC1D180F6AB94F00B2AEE6 /* FVObject.m in Sources */ = {isa =
PBXBuildFile; fileRef = CEFC1D120F6AB94F00B2AEE6 /* FVObject.m */; };
CEFC1D190F6AB94F00B2AEE6 /* FVAllocator.h in Headers */ = {isa
= PBXBuildFile; fileRef = CEFC1D130F6AB94F00B2AEE6 /* FVAllocator.h */; };
CEFC1D1A0F6AB94F00B2AEE6 /* FVAllocator.m in Sources */ = {isa
= PBXBuildFile; fileRef = CEFC1D140F6AB94F00B2AEE6 /* FVAllocator.m */; };
CEFC1D1B0F6AB94F00B2AEE6 /* fv_zone.h in Headers */ = {isa =
PBXBuildFile; fileRef = CEFC1D150F6AB94F00B2AEE6 /* fv_zone.h */; };
@@ -224,8 +222,6 @@
CEFC1D060F6AB8AD00B2AEE6 /* FVCGImageUtilities.mm */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp;
path = FVCGImageUtilities.mm; sourceTree = "<group>"; };
CEFC1D070F6AB8AD00B2AEE6 /* FVImageBuffer.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
FVImageBuffer.h; sourceTree = "<group>"; };
CEFC1D080F6AB8AD00B2AEE6 /* FVImageBuffer.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= FVImageBuffer.m; sourceTree = "<group>"; };
- CEFC1D110F6AB94F00B2AEE6 /* FVObject.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
FVObject.h; sourceTree = "<group>"; };
- CEFC1D120F6AB94F00B2AEE6 /* FVObject.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= FVObject.m; sourceTree = "<group>"; };
CEFC1D130F6AB94F00B2AEE6 /* FVAllocator.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
FVAllocator.h; sourceTree = "<group>"; };
CEFC1D140F6AB94F00B2AEE6 /* FVAllocator.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= FVAllocator.m; sourceTree = "<group>"; };
CEFC1D150F6AB94F00B2AEE6 /* fv_zone.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
fv_zone.h; sourceTree = "<group>"; };
@@ -575,8 +571,6 @@
children = (
CE05D3240D7AFC830034C2A8 /* FVUtilities.h */,
CE05D3250D7AFC830034C2A8 /* FVUtilities.m */,
- CEFC1D110F6AB94F00B2AEE6 /* FVObject.h */,
- CEFC1D120F6AB94F00B2AEE6 /* FVObject.m */,
CEFC1D130F6AB94F00B2AEE6 /* FVAllocator.h */,
CEFC1D140F6AB94F00B2AEE6 /* FVAllocator.m */,
CEFC1D150F6AB94F00B2AEE6 /* fv_zone.h */,
@@ -644,7 +638,6 @@
CEC48F2425B090ED00A2B40A /* FVLockBadge.h in
Headers */,
CEFC1D0B0F6AB8AD00B2AEE6 /*
FVCGImageUtilities.h in Headers */,
CEFC1D0D0F6AB8AD00B2AEE6 /* FVImageBuffer.h in
Headers */,
- CEFC1D170F6AB94F00B2AEE6 /* FVObject.h in
Headers */,
CEFC1D190F6AB94F00B2AEE6 /* FVAllocator.h in
Headers */,
CEFC1D1B0F6AB94F00B2AEE6 /* fv_zone.h in
Headers */,
CEFC1D210F6AB99100B2AEE6 /* FVThread.h in
Headers */,
@@ -807,7 +800,6 @@
CEFC1D0A0F6AB8AD00B2AEE6 /* FVBitmapContext.m
in Sources */,
CEFC1D0C0F6AB8AD00B2AEE6 /*
FVCGImageUtilities.mm in Sources */,
CEFC1D0E0F6AB8AD00B2AEE6 /* FVImageBuffer.m in
Sources */,
- CEFC1D180F6AB94F00B2AEE6 /* FVObject.m in
Sources */,
CEFC1D1A0F6AB94F00B2AEE6 /* FVAllocator.m in
Sources */,
CEFC1D1C0F6AB94F00B2AEE6 /* fv_zone.cpp in
Sources */,
CEFC1D220F6AB99100B2AEE6 /* FVThread.m in
Sources */,
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/_FVMappedDataProvider.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/_FVMappedDataProvider.m
2021-01-15 23:38:45 UTC (rev 25407)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/_FVMappedDataProvider.m
2021-01-16 00:19:48 UTC (rev 25408)
@@ -37,7 +37,6 @@
*/
#import "_FVMappedDataProvider.h"
-#import "FVObject.h"
#import "FVUtilities.h"
#import <pthread.h>
#import <sys/mman.h>
@@ -65,7 +64,7 @@
static CFMutableDictionaryRef _dataProviders = NULL;
static pthread_mutex_t _providerLock = PTHREAD_MUTEX_INITIALIZER;
-@interface _FVProviderInfo : FVObject
+@interface _FVProviderInfo : NSObject
{
@public;
CGDataProviderRef _provider;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
