objc cleanup

- regularize the naming/inclusion of C++ vs ObjC
- correct the way ZXCapture is stubbed out in the simulator to avoid a leak

git-svn-id: https://zxing.googlecode.com/svn/trunk@1826 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2011-06-19 03:52:26 +00:00
parent 1d80e8abf5
commit 0297363cfc
13 changed files with 16 additions and 13 deletions

View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
#import <zxing/Binarizer.h>
#include <zxing/Binarizer.h>
#import <ZXing/ZXLuminanceSource.h>
@interface ZXBinarizer : NSObject {

View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
#import <zxing/BinaryBitmap.h>
#include <zxing/BinaryBitmap.h>
@class ZXBinarizer;

View file

@ -15,8 +15,8 @@
* limitations under the License.
*/
#import <ZXing/ZXLuminanceSource.h>
#import <CoreVideo/CoreVideo.h>
#import <ZXing/ZXLuminanceSource.h>
namespace zxing {

View file

@ -16,7 +16,7 @@
* limitations under the License.
*/
#import <zxing/ZXCaptureDelegate.h>
#import <ZXing/ZXCaptureDelegate.h>
#if !TARGET_IPHONE_SIMULATOR
#if TARGET_OS_EMBEDDED

View file

@ -562,6 +562,9 @@ ZXAV(didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer)
@synthesize captureToFilename;
- (id)init {
if ((self = [super init])) {
[self release];
}
return 0;
}

View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
#import <zxing/DecodeHints.h>
#include <zxing/DecodeHints.h>
@interface ZXDecodeHints : NSObject {
zxing::DecodeHints* native;

View file

@ -15,8 +15,8 @@
* limitations under the License.
*/
#include <zxing/common/HybridBinarizer.h>
#import <ZXing/ZXBinarizer.h>
#import <zxing/common/HybridBinarizer.h>
@interface ZXHybridBinarizer : ZXBinarizer {
}

View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
#import <zxing/LuminanceSource.h>
#include <zxing/LuminanceSource.h>
@interface ZXLuminanceSource : NSObject {
zxing::Ref<zxing::LuminanceSource> native;

View file

@ -15,8 +15,8 @@
* limitations under the License.
*/
#import <zxing/MultiFormatReader.h>
#import <ZXing/ZXMultiFormatReader.h>
#include <zxing/MultiFormatReader.h>
@implementation ZXMultiFormatReader

View file

@ -15,8 +15,8 @@
* limitations under the License.
*/
#import <zxing/qrcode/QRCodeReader.h>
#import <ZXing/ZXQRCodeReader.h>
#include <zxing/qrcode/QRCodeReader.h>
@implementation ZXQRCodeReader

View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
#import <zxing/Reader.h>
#include <zxing/Reader.h>
@class ZXBinaryBitmap;
@class ZXDecodeHints;

View file

@ -16,12 +16,12 @@
*/
#import <ZXing/ZXReader.h>
#include <zxing/common/IllegalArgumentException.h>
#include <zxing/ReaderException.h>
#import <ZXing/ZXResult.h>
#import <ZXing/ZXBinaryBitmap.h>
#import <ZXing/ZXDecodeHints.h>
#import <zxing/ReaderException.h>
#import <ZXing/ZXReaderException.h>
#import <zxing/common/IllegalArgumentException.h>
#import <ZXing/ZXIllegalArgumentException.h>
@implementation ZXReader

View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
#import <zxing/Result.h>
#include <zxing/Result.h>
@interface ZXResult : NSObject {
zxing::Ref<zxing::Result> native;