| Index: Source/WebCore/platform/FileSystem.h
|
| diff --git a/Source/WebCore/platform/FileSystem.h b/Source/WebCore/platform/FileSystem.h
|
| index f9345e8b2e07d13796462a380a03c999b57a96db..78d4697244fead632dda46e497a8503c96b05142 100644
|
| --- a/Source/WebCore/platform/FileSystem.h
|
| +++ b/Source/WebCore/platform/FileSystem.h
|
| @@ -40,15 +40,7 @@
|
| #include <wtf/RetainPtr.h>
|
| #endif
|
|
|
| -#if PLATFORM(QT)
|
| -#include <QFile>
|
| -#include <QLibrary>
|
| -#if defined(Q_OS_WIN32)
|
| -#include <windows.h>
|
| -#endif
|
| -#endif
|
| -
|
| -#if USE(CF) || (PLATFORM(QT) && defined(Q_WS_MAC))
|
| +#if USE(CF)
|
| typedef struct __CFBundle* CFBundleRef;
|
| typedef const struct __CFData* CFDataRef;
|
| #endif
|
| @@ -61,26 +53,12 @@ typedef struct HINSTANCE__* HINSTANCE;
|
| typedef HINSTANCE HMODULE;
|
| #endif
|
|
|
| -#if PLATFORM(GTK)
|
| -typedef struct _GFileIOStream GFileIOStream;
|
| -typedef struct _GModule GModule;
|
| -#endif
|
|
|
| namespace WebCore {
|
|
|
| // PlatformModule
|
| #if OS(WINDOWS)
|
| typedef HMODULE PlatformModule;
|
| -#elif PLATFORM(GTK)
|
| -typedef GModule* PlatformModule;
|
| -#elif PLATFORM(QT)
|
| -#if defined(Q_WS_MAC)
|
| -typedef CFBundleRef PlatformModule;
|
| -#elif !defined(QT_NO_LIBRARY)
|
| -typedef QLibrary* PlatformModule;
|
| -#else
|
| -typedef void* PlatformModule;
|
| -#endif
|
| #elif USE(CF)
|
| typedef CFBundleRef PlatformModule;
|
| #else
|
| @@ -111,13 +89,7 @@ typedef unsigned PlatformModuleVersion;
|
| #endif
|
|
|
| // PlatformFileHandle
|
| -#if PLATFORM(QT)
|
| -typedef QFile* PlatformFileHandle;
|
| -const PlatformFileHandle invalidPlatformFileHandle = 0;
|
| -#elif PLATFORM(GTK)
|
| -typedef GFileIOStream* PlatformFileHandle;
|
| -const PlatformFileHandle invalidPlatformFileHandle = 0;
|
| -#elif OS(WINDOWS)
|
| +#if OS(WINDOWS)
|
| typedef HANDLE PlatformFileHandle;
|
| // FIXME: -1 is INVALID_HANDLE_VALUE, defined in <winbase.h>. Chromium tries to
|
| // avoid using Windows headers in headers. We'd rather move this into the .cpp.
|
| @@ -201,30 +173,10 @@ String encodeForFileName(const String&);
|
| #if USE(CF)
|
| RetainPtr<CFURLRef> pathAsURL(const String&);
|
| #endif
|
| -
|
| -#if PLATFORM(MAC)
|
| -void setMetadataURL(String& URLString, const String& referrer, const String& path);
|
| -#endif
|
| -
|
| -#if PLATFORM(GTK)
|
| -String filenameToString(const char*);
|
| -String filenameForDisplay(const String&);
|
| -CString applicationDirectoryPath();
|
| -CString sharedResourcesPath();
|
| -#endif
|
| -#if USE(SOUP) || PLATFORM(QT)
|
| +#if USE(SOUP)
|
| uint64_t getVolumeFreeSizeForPath(const char*);
|
| #endif
|
|
|
| -#if PLATFORM(WIN) && !OS(WINCE)
|
| -String localUserSpecificStorageDirectory();
|
| -String roamingUserSpecificStorageDirectory();
|
| -#endif
|
| -
|
| -#if PLATFORM(WIN) && USE(CF)
|
| -bool safeCreateFile(const String&, CFDataRef);
|
| -#endif
|
| -
|
| } // namespace WebCore
|
|
|
| #endif // FileSystem_h
|
|
|