mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix build with Xcode 10 

For some reason, Mac client is the only project that references
libtransmission files as if they were a part of its own project, and
inconsistently so. Make the include/import style uniform an in line with
other projects.

Adjust Mac client include directory settings a bit along the way.
This commit is contained in:
Mike Gelfand 2018-09-30 13:37:30 +03:00
parent a53bae2849
commit 8863e88570
46 changed files with 151 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
Transmission.xcodeproj/project.pbxproj
View File

@ -2256,15 +2256,15 @@
files = (
);
inputPaths = (
"$(SRCROOT)/third-party/miniupnpc/VERSION",
"$(SRCROOT)/third-party/miniupnpc/miniupnpcstrings.h.in",
"third-party/miniupnpc/VERSION",
"third-party/miniupnpc/miniupnpcstrings.h.in",
);
outputPaths = (
"$(SRCROOT)/third-party/miniupnpc/miniupnpcstrings.h",
"third-party/miniupnpc/miniupnpcstrings.h",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd third-party/miniupnpc\nsh updateminiupnpcstrings.sh \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_INPUT_FILE_1\" \"$SCRIPT_OUTPUT_FILE_0\"";
shellScript = "cd third-party/miniupnpc\nsh updateminiupnpcstrings.sh \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_INPUT_FILE_1\" \"$SCRIPT_OUTPUT_FILE_0\"\n";
};
BE75C3510C729EE100DBEFE0 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@ -2277,7 +2277,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "if [ ! -e ./third-party/libevent/include/event2/config.h -a ! ./third-party/macosx-libevent-config.h -ef ./third-party/libevent/include/event2/config.h ]; then ln -s ../../../macosx-libevent-config.h ./third-party/libevent/include/event2/config.h; fi\n\nif [ ! -e ./third-party/libevent/include/event2/event-config.h -a ! ./third-party/macosx-libevent-event-config.h -ef ./third-party/libevent/include/event2/event-config.h ]; then ln -s ../../../macosx-libevent-event-config.h ./third-party/libevent/include/event2/event-config.h; fi";
shellScript = "cd third-party/libevent/include/event2\n\nif [ ! -e config.h -a ! ../../../macosx-libevent-config.h -ef config.h ]; then\n ln -s ../../../macosx-libevent-config.h config.h;\nfi\n\nif [ ! -e event-config.h -a ! ../../../macosx-libevent-event-config.h -ef event-config.h ]; then\n ln -s ../../../macosx-libevent-event-config.h event-config.h;\nfi\n";
};
C12F197C1E1AE55A0005E93F /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@ -2287,11 +2287,11 @@
inputPaths = (
);
outputPaths = (
"$(SRCROOT)/third-party/miniupnpc/miniupnp",
"third-party/miniupnpc/miniupnp",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd third-party/miniupnpc && rm -f miniupnp && ln -s . miniupnp";
shellScript = "cd third-party/miniupnpc && rm -f miniupnp && ln -s . miniupnp\n";
};
C12F197D1E1AE6830005E93F /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@ -2301,11 +2301,11 @@
inputPaths = (
);
outputPaths = (
"$(SRCROOT)/third-party/libutp/libutp",
"third-party/libutp/libutp",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd third-party/libutp && rm -f libutp && ln -s . libutp";
shellScript = "cd third-party/libutp && rm -f libutp && ln -s . libutp\n";
};
C12F197E1E1AE6D50005E93F /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@ -2315,11 +2315,11 @@
inputPaths = (
);
outputPaths = (
"$(SRCROOT)/third-party/dht/dht",
"third-party/dht/dht",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd third-party/dht && rm -f dht && ln -s . dht";
shellScript = "cd third-party/dht && rm -f dht && ln -s . dht\n";
};
/* End PBXShellScriptBuildPhase section */
@ -2916,11 +2916,6 @@
"third-party/libutp",
"third-party/miniupnpc",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/build/Development\"",
"\"$(SRCROOT)/build/Debug\"",
);
OTHER_CFLAGS = (
"$(inherited)",
"-DWITH_UTP",
@ -2944,11 +2939,11 @@
CLANG_ENABLE_OBJC_ARC = YES;
FRAMEWORK_SEARCH_PATHS = macosx;
GCC_PREFIX_HEADER = macosx/Transmission_Prefix.pch;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/third-party/curl/lib\"",
.,
);
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
PRODUCT_NAME = Transmission;
WRAPPER_EXTENSION = app;
};
@ -2959,8 +2954,9 @@
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
HEADER_SEARCH_PATHS = (
"third-party/curl/include",
"$(inherited)",
.,
"third-party/libevent/include",
);
PRODUCT_NAME = transmissioncli;
};
@ -2987,11 +2983,6 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
.,
"third-party/libevent/include",
);
PRODUCT_NAME = "transmission-remote";
};
name = Debug;
@ -3039,9 +3030,9 @@
IBC_FLATTEN_NIBS = YES;
IBC_NOTICES = NO;
IBC_WARNINGS = YES;
INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
INFOPLIST_FILE = macosx/Info.plist;
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
INFOPLIST_PREFIX_HEADER = libtransmission/version.h;
INFOPLIST_PREPROCESS = YES;
LIBRARY_SEARCH_PATHS = (
"third-party/curl/lib",
@ -3094,11 +3085,6 @@
"third-party/libutp",
"third-party/miniupnpc",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/build/Development\"",
"\"$(SRCROOT)/build/Debug\"",
);
OTHER_CFLAGS = (
"$(inherited)",
"-DWITH_UTP",
@ -3121,8 +3107,9 @@
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
HEADER_SEARCH_PATHS = (
"third-party/curl/include",
"$(inherited)",
.,
"third-party/libevent/include",
);
PRODUCT_NAME = transmissioncli;
};
@ -3134,11 +3121,11 @@
CLANG_ENABLE_OBJC_ARC = YES;
FRAMEWORK_SEARCH_PATHS = macosx;
GCC_PREFIX_HEADER = macosx/Transmission_Prefix.pch;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/third-party/curl/lib\"",
.,
);
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
PRODUCT_NAME = Transmission;
WRAPPER_EXTENSION = app;
};
@ -3186,9 +3173,9 @@
IBC_FLATTEN_NIBS = YES;
IBC_NOTICES = NO;
IBC_WARNINGS = YES;
INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
INFOPLIST_FILE = macosx/Info.plist;
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
INFOPLIST_PREFIX_HEADER = libtransmission/version.h;
INFOPLIST_PREPROCESS = YES;
LIBRARY_SEARCH_PATHS = (
"third-party/curl/lib",
@ -3267,9 +3254,9 @@
IBC_FLATTEN_NIBS = YES;
IBC_NOTICES = NO;
IBC_WARNINGS = YES;
INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
INFOPLIST_FILE = macosx/Info.plist;
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
INFOPLIST_PREFIX_HEADER = libtransmission/version.h;
INFOPLIST_PREPROCESS = YES;
LIBRARY_SEARCH_PATHS = (
"third-party/curl/lib",
@ -3288,11 +3275,11 @@
CLANG_ENABLE_OBJC_ARC = YES;
FRAMEWORK_SEARCH_PATHS = macosx;
GCC_PREFIX_HEADER = macosx/Transmission_Prefix.pch;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
LIBRARY_SEARCH_PATHS = (
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/third-party/curl/lib\"",
.,
);
LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
PRODUCT_NAME = Transmission;
WRAPPER_EXTENSION = app;
};
@ -3303,8 +3290,9 @@
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
HEADER_SEARCH_PATHS = (
"third-party/curl/include",
"$(inherited)",
.,
"third-party/libevent/include",
);
PRODUCT_NAME = transmissioncli;
};
@ -3323,11 +3311,6 @@
"third-party/libutp",
"third-party/miniupnpc",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/build/Development\"",
"\"$(SRCROOT)/build/Debug\"",
);
OTHER_CFLAGS = (
"$(inherited)",
"-DWITH_UTP",
@ -3366,11 +3349,6 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
.,
"third-party/libevent/include",
);
PRODUCT_NAME = "transmission-remote";
};
name = "Release - Debug";
@ -3419,8 +3397,12 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Prefix.pch";
INFOPLIST_FILE = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
GCC_PREFIX_HEADER = "macosx/QuickLookPlugin/QuickLookPlugin-Prefix.pch";
HEADER_SEARCH_PATHS = (
"$(inherited)",
.,
);
INFOPLIST_FILE = "macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
INSTALL_PATH = /Library/QuickLook;
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
@ -3432,8 +3414,12 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Prefix.pch";
INFOPLIST_FILE = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
GCC_PREFIX_HEADER = "macosx/QuickLookPlugin/QuickLookPlugin-Prefix.pch";
HEADER_SEARCH_PATHS = (
"$(inherited)",
.,
);
INFOPLIST_FILE = "macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
INSTALL_PATH = /Library/QuickLook;
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
@ -3445,8 +3431,12 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Prefix.pch";
INFOPLIST_FILE = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
GCC_PREFIX_HEADER = "macosx/QuickLookPlugin/QuickLookPlugin-Prefix.pch";
HEADER_SEARCH_PATHS = (
"$(inherited)",
.,
);
INFOPLIST_FILE = "macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
INSTALL_PATH = /Library/QuickLook;
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
@ -3509,11 +3499,6 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_ARC = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
.,
"third-party/libevent/include",
);
PRODUCT_NAME = "transmission-remote";
};
name = Release;

4
macosx/AboutWindowController.m
View File

@ -20,9 +20,9 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#import "AboutWindowController.h"
#include <libtransmission/version.h>
#include "version.h"
#import "AboutWindowController.h"
@implementation AboutWindowController

1
macosx/AddMagnetWindowController.h
View File

@ -21,6 +21,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "Torrent.h"
@class Controller;

1
macosx/AddWindowController.h
View File

@ -21,6 +21,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "Torrent.h"
@class Controller;

3
macosx/BadgeView.h
View File

@ -21,7 +21,8 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#include <libtransmission/transmission.h>
@interface BadgeView : NSView
{

3
macosx/Badger.h
View File

@ -21,7 +21,8 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#include <libtransmission/transmission.h>
@class Torrent;

3
macosx/BlocklistDownloaderViewController.h
View File

@ -21,7 +21,8 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#include <libtransmission/transmission.h>
@class PrefsController;

2
macosx/CMakeLists.txt
View File

@ -1,5 +1,7 @@
project(trmac)
include_directories(${CMAKE_SOURCE_DIR})
if(CMAKE_GENERATOR STREQUAL "Xcode")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC ON)
else()

4
macosx/Controller.h
View File

@ -21,8 +21,10 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#import <Quartz/Quartz.h>
#include <libtransmission/transmission.h>
#import "VDKQueue.h"
@class AddMagnetWindowController;

15
macosx/Controller.m
View File

@ -25,6 +25,14 @@
#import <Carbon/Carbon.h>
#import <libkern/OSAtomic.h>
#import <Sparkle/Sparkle.h>
#include <libtransmission/transmission.h>
#include <libtransmission/utils.h>
#include <libtransmission/variant.h>
#import "VDKQueue.h"
#import "Controller.h"
#import "Torrent.h"
#import "TorrentGroup.h"
@ -58,13 +66,6 @@
#import "ExpandedPathToPathTransformer.h"
#import "ExpandedPathToIconTransformer.h"
#import "transmission.h"
#import "utils.h"
#import "variant.h"
#import "VDKQueue.h"
#import <Sparkle/Sparkle.h>
#define TOOLBAR_CREATE @"Toolbar Create"
#define TOOLBAR_OPEN_FILE @"Toolbar Open"
#define TOOLBAR_OPEN_WEB @"Toolbar Open Web"

5
macosx/CreatorWindowController.h
View File

@ -21,8 +21,9 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "transmission.h"
#import "makemeta.h"
#include <libtransmission/transmission.h>
#include <libtransmission/makemeta.h>
@interface CreatorWindowController : NSWindowController
{

6
macosx/CreatorWindowController.m
View File

@ -20,14 +20,14 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#include <libtransmission/utils.h> // tr_urlIsValidTracker()
#import "CreatorWindowController.h"
#import "Controller.h"
#import "NSApplicationAdditions.h"
#import "NSStringAdditions.h"
#import "transmission.h" // required by utils.h
#import "utils.h" // tr_urlIsValidTracker()
#define TRACKER_ADD_TAG 0
#define TRACKER_REMOVE_TAG 1

3
macosx/DragOverlayWindow.h
View File

@ -21,7 +21,8 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#include <libtransmission/transmission.h>
@interface DragOverlayWindow : NSWindow
{

6
macosx/FileNameCell.m
View File

@ -20,15 +20,15 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#include <libtransmission/utils.h>
#import "FileNameCell.h"
#import "FileOutlineView.h"
#import "Torrent.h"
#import "FileListNode.h"
#import "NSStringAdditions.h"
#import "transmission.h" // required by utils.h
#import "utils.h"
#define PADDING_HORIZONAL 2.0
#define IMAGE_FOLDER_SIZE 16.0
#define IMAGE_ICON_SIZE 32.0

3
macosx/FileOutlineController.m
View File

@ -20,6 +20,8 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#import <Quartz/Quartz.h>
#import "FileOutlineController.h"
#import "Torrent.h"
#import "FileListNode.h"
@ -29,7 +31,6 @@
#import "NSApplicationAdditions.h"
#import "NSMutableArrayAdditions.h"
#import "NSStringAdditions.h"
#import <Quartz/Quartz.h>
#define ROW_SMALL_HEIGHT 18.0

1
macosx/FilePriorityCell.h
View File

@ -21,6 +21,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "FileOutlineView.h"
@interface FilePriorityCell : NSSegmentedCell

2
macosx/GlobalOptionsPopoverViewController.h
View File

@ -22,7 +22,7 @@
#import <Cocoa/Cocoa.h>
#import "transmission.h"
#include <libtransmission/transmission.h>
@interface GlobalOptionsPopoverViewController : NSViewController
{

1
macosx/InfoActivityViewController.h
View File

@ -21,6 +21,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "InfoViewController.h"
@class PiecesView;

6
macosx/InfoActivityViewController.m
View File

@ -20,15 +20,15 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#include <libtransmission/utils.h> //tr_getRatio()
#import "InfoActivityViewController.h"
#import "NSApplicationAdditions.h"
#import "NSStringAdditions.h"
#import "PiecesView.h"
#import "Torrent.h"
#include "transmission.h" // required by utils.h
#include "utils.h" //tr_getRatio()
#define PIECES_CONTROL_PROGRESS 0
#define PIECES_CONTROL_AVAILABLE 1

1
macosx/InfoFileViewController.h
View File

@ -22,6 +22,7 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
#import "InfoViewController.h"
@class FileOutlineController;

1
macosx/InfoGeneralViewController.h
View File

@ -21,6 +21,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "InfoViewController.h"
@interface InfoGeneralViewController : NSViewController <InfoViewController>

1
macosx/InfoOptionsViewController.h
View File

@ -21,6 +21,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "InfoViewController.h"
@interface InfoOptionsViewController : NSViewController <InfoViewController>

1
macosx/InfoPeersViewController.h
View File

@ -21,6 +21,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "InfoViewController.h"
@class WebSeedTableView;

6
macosx/InfoPeersViewController.m
View File

@ -20,6 +20,9 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#include <libtransmission/utils.h>
#import "InfoPeersViewController.h"
#import "NSApplicationAdditions.h"
#import "NSStringAdditions.h"
@ -27,9 +30,6 @@
#import "Torrent.h"
#import "WebSeedTableView.h"
#import "transmission.h" // required by utils.h
#import "utils.h"
#define ANIMATION_ID_KEY @"animationId"
#define WEB_SEED_ANIMATION_ID @"webSeed"

1
macosx/InfoTrackersViewController.h
View File

@ -21,6 +21,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "InfoViewController.h"
@class Torrent;

1
macosx/InfoViewController.h
View File

@ -22,7 +22,6 @@
#import <Cocoa/Cocoa.h>
@protocol InfoViewController
- (void) setInfoForTorrents: (NSArray *) torrents;

5
macosx/MessageWindowController.m
View File

@ -20,13 +20,14 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#include <libtransmission/log.h>
#import "MessageWindowController.h"
#import "Controller.h"
#import "NSApplicationAdditions.h"
#import "NSMutableArrayAdditions.h"
#import "NSStringAdditions.h"
#import <log.h>
#import <transmission.h>
#define LEVEL_ERROR 0
#define LEVEL_INFO 1

6
macosx/NSStringAdditions.m
View File

@ -20,12 +20,12 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#include <libtransmission/utils.h>
#import "NSApplicationAdditions.h"
#import "NSStringAdditions.h"
#import "transmission.h"
#import "utils.h"
@interface NSString (Private)
+ (NSString *) stringForFileSizeLion: (uint64_t) size showUnitUnless: (NSString *) notAllowedUnit unitsUsed: (NSString **) unitUsed;

6
macosx/PiecesView.m
View File

@ -20,13 +20,13 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#include <libtransmission/utils.h>
#import "PiecesView.h"
#import "Torrent.h"
#import "InfoWindowController.h"
#import "transmission.h"
#import "utils.h"
#define MAX_ACROSS 18
#define BETWEEN 1.0

3
macosx/PrefsController.h
View File

@ -21,7 +21,8 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#include <libtransmission/transmission.h>
@class PortChecker;

15
macosx/PrefsController.m
View File

@ -20,6 +20,15 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#import <Foundation/Foundation.h>
#import <Sparkle/Sparkle.h>
#include <libtransmission/transmission.h>
#include <libtransmission/utils.h>
#import "VDKQueue.h"
#import "PrefsController.h"
#import "BlocklistDownloaderViewController.h"
#import "BlocklistScheduler.h"
@ -28,12 +37,6 @@
#import "BonjourController.h"
#import "NSApplicationAdditions.h"
#import "NSStringAdditions.h"
#import "VDKQueue.h"
#import "transmission.h"
#import "utils.h"
#import <Sparkle/Sparkle.h>
#define DOWNLOAD_FOLDER 0
#define DOWNLOAD_TORRENT 2

3
macosx/QuickLookPlugin/GeneratePreviewForURL.m
View File

@ -1,6 +1,7 @@
#import <QuickLook/QuickLook.h>
#import "transmission.h"
#include <libtransmission/transmission.h>
#import "NSStringAdditions.h"
OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options);

6
macosx/QuickLookPlugin/GenerateThumbnailForURL.m
View File

@ -1,6 +1,6 @@
#include <CoreFoundation/CoreFoundation.h>
#include <CoreServices/CoreServices.h>
#include <QuickLook/QuickLook.h>
#import <CoreFoundation/CoreFoundation.h>
#import <CoreServices/CoreServices.h>
#import <QuickLook/QuickLook.h>
OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thumbnail, CFURLRef url, CFStringRef contentTypeUTI, CFDictionaryRef options, CGSize maxSize);
void CancelThumbnailGeneration(void *thisInterface, QLThumbnailRequestRef thumbnail);

5
macosx/QuickLookPlugin/main.c
View File

@ -7,11 +7,6 @@
//
//==============================================================================
#include <CoreFoundation/CoreFoundation.h>
#include <CoreFoundation/CFPlugInCOM.h>
#include <CoreServices/CoreServices.h>

3
macosx/StatsWindowController.h
View File

@ -21,7 +21,8 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#include <libtransmission/transmission.h>
@interface StatsWindowController : NSWindowController
{

2
macosx/StatusBarController.h
View File

@ -22,7 +22,7 @@
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#include <libtransmission/transmission.h>
@interface StatusBarController : NSViewController
{

4
macosx/StatusBarController.m
View File

@ -20,11 +20,11 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#import "StatusBarController.h"
#import "NSStringAdditions.h"
#import "transmission.h"
#define STATUS_RATIO_TOTAL @"RatioTotal"
#define STATUS_RATIO_SESSION @"RatioSession"
#define STATUS_TRANSFER_TOTAL @"TransferTotal"

3
macosx/StatusBarView.m
View File

@ -20,9 +20,10 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#import <QuartzCore/QuartzCore.h>
#import "StatusBarView.h"
#import "NSApplicationAdditions.h"
#import <QuartzCore/QuartzCore.h>
@interface StatusBarView (Private)

3
macosx/Torrent.h
View File

@ -21,9 +21,10 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#import <Quartz/Quartz.h>
#include <libtransmission/transmission.h>
@class FileListNode;
typedef enum {

10
macosx/Torrent.m
View File

@ -20,6 +20,11 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#include <libtransmission/error.h>
#include <libtransmission/log.h>
#include <libtransmission/utils.h> // tr_new()
#import "Torrent.h"
#import "GroupsController.h"
#import "FileListNode.h"
@ -27,11 +32,6 @@
#import "NSStringAdditions.h"
#import "TrackerNode.h"
#import "log.h"
#import "transmission.h" // required by utils.h
#import "error.h"
#import "utils.h" // tr_new()
#define ETA_IDLE_DISPLAY_SEC (2*60)
@interface Torrent (Private)

6
macosx/TorrentGroup.m
View File

@ -20,13 +20,13 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#include <libtransmission/utils.h> // tr_getRatio()
#import "TorrentGroup.h"
#import "GroupsController.h"
#import "Torrent.h"
#include "transmission.h" // required by utils.h
#include "utils.h" // tr_getRatio()
@implementation TorrentGroup
- (id) initWithGroup: (NSInteger) group

3
macosx/TorrentTableView.h
View File

@ -21,7 +21,8 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#include <libtransmission/transmission.h>
@class Controller;
@class Torrent;

6
macosx/TrackerCell.m
View File

@ -20,12 +20,12 @@
* DEALINGS IN THE SOFTWARE.
*****************************************************************************/
#include <libtransmission/transmission.h>
#include <libtransmission/utils.h> //tr_addressIsIP()
#import "TrackerCell.h"
#import "TrackerNode.h"
#import "transmission.h" // required by utils.h
#import "utils.h" //tr_addressIsIP()
#define PADDING_HORIZONAL 3.0
#define PADDING_STATUS_HORIZONAL 3.0
#define ICON_SIZE 16.0

3
macosx/TrackerNode.h
View File

@ -21,7 +21,8 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#include <libtransmission/transmission.h>
@class Torrent;

1
macosx/VDKQueue/VDKQueue.h
View File

@ -63,6 +63,7 @@
#import <Foundation/Foundation.h>
#include <sys/types.h>
#include <sys/event.h>

1
macosx/VDKQueue/VDKQueue.m
View File

@ -22,6 +22,7 @@
#import <AppKit/AppKit.h>
#import "VDKQueue.h"
#import <unistd.h>
#import <fcntl.h>
#include <sys/stat.h>