Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix build breaks in Xcode 4.

  • Loading branch information...
commit 9d8c680c67e42806cae67a33ba1fb3f301a376da 1 parent dddda16
@jverkoey authored
View
10 qrlib/src/DecoderDelegate.h
@@ -21,14 +21,14 @@
#import <UIKit/UIKit.h>
-@class Decoder;
+@class QRDecoder;
@class TwoDDecoderResult;
@protocol DecoderDelegate
-- (void)decoder:(Decoder *)decoder willDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset;
-- (void)decoder:(Decoder *)decoder decodingImage:(UIImage *)image usingSubset:(UIImage *)subset progress:(NSString *)message;
-- (void)decoder:(Decoder *)decoder didDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset withResult:(TwoDDecoderResult *)result;
-- (void)decoder:(Decoder *)decoder failedToDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset reason:(NSString *)reason;
+- (void)decoder:(QRDecoder *)decoder willDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset;
+- (void)decoder:(QRDecoder *)decoder decodingImage:(UIImage *)image usingSubset:(UIImage *)subset progress:(NSString *)message;
+- (void)decoder:(QRDecoder *)decoder didDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset withResult:(TwoDDecoderResult *)result;
+- (void)decoder:(QRDecoder *)decoder failedToDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset reason:(NSString *)reason;
@end
View
4 qrui/Classes/DecoderController.h
@@ -22,7 +22,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
@class OverlayView;
-@class Decoder;
+@class QRDecoder;
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -36,7 +36,7 @@
OverlayView* _overlayView;
NSTimer* _timer;
- Decoder* _decoder;
+ QRDecoder* _decoder;
}
@end
View
12 qrui/Classes/DecoderController.m → qrui/Classes/DecoderController.mm
@@ -19,7 +19,7 @@
#import "OverlayView.h"
#import "QRImagePickerController.h"
-#import "Decoder.h"
+#import "QRDecoder.h"
#import "TwoDDecoderResult.h"
@@ -158,7 +158,7 @@ - (void) imagePickerController:(UIImagePickerController*)picker
UIImage* scaled = [self scaledImage:image];
if( nil == _decoder ) {
- _decoder = [[Decoder alloc] init];
+ _decoder = [[QRDecoder alloc] init];
_decoder.delegate = self;
}
[_decoder decodeImage:scaled cropRect:_overlayView.cropRect];
@@ -187,17 +187,17 @@ - (void)takePicture:(NSTimer*)theTimer {
////////////////////////////////////////////////////////////////////////////////////////////////////
-- (void)decoder:(Decoder *)decoder willDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset {
+- (void)decoder:(QRDecoder *)decoder willDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset {
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-- (void)decoder:(Decoder *)decoder decodingImage:(UIImage *)image usingSubset:(UIImage *)subset progress:(NSString *)message {
+- (void)decoder:(QRDecoder *)decoder decodingImage:(UIImage *)image usingSubset:(UIImage *)subset progress:(NSString *)message {
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-- (void)decoder:(Decoder *)decoder didDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset withResult:(TwoDDecoderResult *)result {
+- (void)decoder:(QRDecoder *)decoder didDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset withResult:(TwoDDecoderResult *)result {
NSLog(@"didDecodeImage");
NSLog(@"%@", result.text);
NSLog(@"%@", result.points);
@@ -206,7 +206,7 @@ - (void)decoder:(Decoder *)decoder didDecodeImage:(UIImage *)image usingSubset:(
////////////////////////////////////////////////////////////////////////////////////////////////////
-- (void)decoder:(Decoder *)decoder failedToDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset reason:(NSString *)reason {
+- (void)decoder:(QRDecoder *)decoder failedToDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset reason:(NSString *)reason {
}
View
0  qrui/Classes/OverlayView.m → qrui/Classes/OverlayView.mm
File renamed without changes
View
2  qrui/Classes/Decoder.h → qrui/Classes/QRDecoder.h
@@ -23,7 +23,7 @@
#import <UIKit/UIKit.h>
#import "DecoderDelegate.h"
-@interface Decoder : NSObject {
+@interface QRDecoder : NSObject {
UIImage *image;
CGRect cropRect;
UIImage *subsetImage;
View
4 qrui/Classes/Decoder.mm → qrui/Classes/QRDecoder.mm
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-#import "Decoder.h"
+#import "QRDecoder.h"
#import "TwoDDecoderResult.h"
#include "QRCodeReader.h"
@@ -30,7 +30,7 @@
using namespace qrcode;
-@implementation Decoder
+@implementation QRDecoder
@synthesize image;
@synthesize cropRect;
View
0  qrui/Classes/QRImagePickerController.m → qrui/Classes/QRImagePickerController.mm
File renamed without changes
View
0  qrui/Classes/qruiAppDelegate.m → qrui/Classes/qruiAppDelegate.mm
File renamed without changes
View
44 qrui/qrui.xcodeproj/project.pbxproj
@@ -7,17 +7,17 @@
objects = {
/* Begin PBXBuildFile section */
- 1D3623260D0F684500981E51 /* qruiAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* qruiAppDelegate.m */; };
+ 1D3623260D0F684500981E51 /* qruiAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* qruiAppDelegate.mm */; };
1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
6E8D846D10A0EA8D00DB7C32 /* libqrlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E8D846C10A0EA8900DB7C32 /* libqrlib.a */; };
- 6E8D847C10A0EAFB00DB7C32 /* DecoderController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E8D847B10A0EAFB00DB7C32 /* DecoderController.m */; };
- 6E8D856910A0FC4000DB7C32 /* OverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E8D856810A0FC4000DB7C32 /* OverlayView.m */; };
- 6E8D858610A0FDB500DB7C32 /* QRImagePickerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E8D858510A0FDB500DB7C32 /* QRImagePickerController.m */; };
+ 6E8D847C10A0EAFB00DB7C32 /* DecoderController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E8D847B10A0EAFB00DB7C32 /* DecoderController.mm */; };
+ 6E8D856910A0FC4000DB7C32 /* OverlayView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E8D856810A0FC4000DB7C32 /* OverlayView.mm */; };
+ 6E8D858610A0FDB500DB7C32 /* QRImagePickerController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E8D858510A0FDB500DB7C32 /* QRImagePickerController.mm */; };
6E8D877510A108B500DB7C32 /* libiconv.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E8D877410A108B500DB7C32 /* libiconv.2.dylib */; };
- 6E8D895D10A1355000DB7C32 /* Decoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E8D895B10A1355000DB7C32 /* Decoder.mm */; };
+ 6E8D895D10A1355000DB7C32 /* QRDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E8D895B10A1355000DB7C32 /* QRDecoder.mm */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -40,7 +40,7 @@
/* Begin PBXFileReference section */
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D3623240D0F684500981E51 /* qruiAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qruiAppDelegate.h; sourceTree = "<group>"; };
- 1D3623250D0F684500981E51 /* qruiAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = qruiAppDelegate.m; sourceTree = "<group>"; };
+ 1D3623250D0F684500981E51 /* qruiAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = qruiAppDelegate.mm; sourceTree = "<group>"; };
1D6058910D05DD3D006BFB54 /* qrui.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = qrui.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -48,14 +48,14 @@
32CA4F630368D1EE00C91783 /* qrui_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = qrui_Prefix.pch; sourceTree = "<group>"; };
6E8D846710A0EA8900DB7C32 /* qrlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = qrlib.xcodeproj; path = ../qrlib/qrlib.xcodeproj; sourceTree = SOURCE_ROOT; };
6E8D847A10A0EAFB00DB7C32 /* DecoderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DecoderController.h; sourceTree = "<group>"; };
- 6E8D847B10A0EAFB00DB7C32 /* DecoderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DecoderController.m; sourceTree = "<group>"; };
+ 6E8D847B10A0EAFB00DB7C32 /* DecoderController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DecoderController.mm; sourceTree = "<group>"; };
6E8D856710A0FC4000DB7C32 /* OverlayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlayView.h; sourceTree = "<group>"; };
- 6E8D856810A0FC4000DB7C32 /* OverlayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OverlayView.m; sourceTree = "<group>"; };
+ 6E8D856810A0FC4000DB7C32 /* OverlayView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OverlayView.mm; sourceTree = "<group>"; };
6E8D858410A0FDB500DB7C32 /* QRImagePickerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QRImagePickerController.h; sourceTree = "<group>"; };
- 6E8D858510A0FDB500DB7C32 /* QRImagePickerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QRImagePickerController.m; sourceTree = "<group>"; };
+ 6E8D858510A0FDB500DB7C32 /* QRImagePickerController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QRImagePickerController.mm; sourceTree = "<group>"; };
6E8D877410A108B500DB7C32 /* libiconv.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.2.dylib; path = usr/lib/libiconv.2.dylib; sourceTree = SDKROOT; };
- 6E8D895B10A1355000DB7C32 /* Decoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Decoder.mm; sourceTree = "<group>"; };
- 6E8D895C10A1355000DB7C32 /* Decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decoder.h; sourceTree = "<group>"; };
+ 6E8D895B10A1355000DB7C32 /* QRDecoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QRDecoder.mm; sourceTree = "<group>"; };
+ 6E8D895C10A1355000DB7C32 /* QRDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QRDecoder.h; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* qrui-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "qrui-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -81,7 +81,7 @@
6E8D895E10A1355200DB7C32 /* Decoder */,
6E8D847910A0EAD900DB7C32 /* Decoder Controller */,
1D3623240D0F684500981E51 /* qruiAppDelegate.h */,
- 1D3623250D0F684500981E51 /* qruiAppDelegate.m */,
+ 1D3623250D0F684500981E51 /* qruiAppDelegate.mm */,
);
path = Classes;
sourceTree = "<group>";
@@ -149,7 +149,7 @@
6E8D858310A0FD9600DB7C32 /* Image Picker */,
6E8D856610A0FC3200DB7C32 /* Overlay View */,
6E8D847A10A0EAFB00DB7C32 /* DecoderController.h */,
- 6E8D847B10A0EAFB00DB7C32 /* DecoderController.m */,
+ 6E8D847B10A0EAFB00DB7C32 /* DecoderController.mm */,
);
name = "Decoder Controller";
sourceTree = "<group>";
@@ -158,7 +158,7 @@
isa = PBXGroup;
children = (
6E8D856710A0FC4000DB7C32 /* OverlayView.h */,
- 6E8D856810A0FC4000DB7C32 /* OverlayView.m */,
+ 6E8D856810A0FC4000DB7C32 /* OverlayView.mm */,
);
name = "Overlay View";
sourceTree = "<group>";
@@ -167,7 +167,7 @@
isa = PBXGroup;
children = (
6E8D858410A0FDB500DB7C32 /* QRImagePickerController.h */,
- 6E8D858510A0FDB500DB7C32 /* QRImagePickerController.m */,
+ 6E8D858510A0FDB500DB7C32 /* QRImagePickerController.mm */,
);
name = "Image Picker";
sourceTree = "<group>";
@@ -175,8 +175,8 @@
6E8D895E10A1355200DB7C32 /* Decoder */ = {
isa = PBXGroup;
children = (
- 6E8D895C10A1355000DB7C32 /* Decoder.h */,
- 6E8D895B10A1355000DB7C32 /* Decoder.mm */,
+ 6E8D895C10A1355000DB7C32 /* QRDecoder.h */,
+ 6E8D895B10A1355000DB7C32 /* QRDecoder.mm */,
);
name = Decoder;
sourceTree = "<group>";
@@ -255,11 +255,11 @@
buildActionMask = 2147483647;
files = (
1D60589B0D05DD56006BFB54 /* main.m in Sources */,
- 1D3623260D0F684500981E51 /* qruiAppDelegate.m in Sources */,
- 6E8D847C10A0EAFB00DB7C32 /* DecoderController.m in Sources */,
- 6E8D856910A0FC4000DB7C32 /* OverlayView.m in Sources */,
- 6E8D858610A0FDB500DB7C32 /* QRImagePickerController.m in Sources */,
- 6E8D895D10A1355000DB7C32 /* Decoder.mm in Sources */,
+ 1D3623260D0F684500981E51 /* qruiAppDelegate.mm in Sources */,
+ 6E8D847C10A0EAFB00DB7C32 /* DecoderController.mm in Sources */,
+ 6E8D856910A0FC4000DB7C32 /* OverlayView.mm in Sources */,
+ 6E8D858610A0FDB500DB7C32 /* QRImagePickerController.mm in Sources */,
+ 6E8D895D10A1355000DB7C32 /* QRDecoder.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Please sign in to comment.
Something went wrong with that request. Please try again.