From 435791f28c0d08fa144881f773e7a46a303fc9b3 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Tue, 4 Jun 2013 01:02:10 -0700
Subject: [PATCH] CR feedback

---
 interface/src/Application.cpp | 14 +++++++-------
 interface/src/Application.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 05bd0f3d5a..d8eed95ea7 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1293,15 +1293,15 @@ void Application::chooseVoxelPaintColor() {
 }
 
 const int MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE = 1500;
-struct SendVoxelsOperataionArgs {
+struct SendVoxelsOperationArgs {
     unsigned char* newBaseOctCode;
     unsigned char messageBuffer[MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE];
     int bufferInUse;
 
 };
 
-bool Application::sendVoxelsOperataion(VoxelNode* node, void* extraData) {
-    SendVoxelsOperataionArgs* args = (SendVoxelsOperataionArgs*)extraData;
+bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) {
+    SendVoxelsOperationArgs* args = (SendVoxelsOperationArgs*)extraData;
     if (node->isColored()) {
         unsigned char* nodeOctalCode = node->getOctalCode();
         
@@ -1372,7 +1372,7 @@ void Application::importVoxels() {
     // Recurse the Import Voxels tree, where everything is root relative, and send all the colored voxels to 
     // the server as an set voxel message, this will also rebase the voxels to the new location
     unsigned char* calculatedOctCode = NULL;
-    SendVoxelsOperataionArgs args;
+    SendVoxelsOperationArgs args;
     args.messageBuffer[0] = PACKET_HEADER_SET_VOXEL_DESTRUCTIVE;
     unsigned short int* sequenceAt = (unsigned short int*)&args.messageBuffer[sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE)];
     *sequenceAt = 0;
@@ -1386,7 +1386,7 @@ void Application::importVoxels() {
         args.newBaseOctCode = calculatedOctCode = pointToVoxel(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
     }
 
-    importVoxels.recurseTreeWithOperation(sendVoxelsOperataion, &args);
+    importVoxels.recurseTreeWithOperation(sendVoxelsOperation, &args);
 
     // If we have voxels left in the packet, then send the packet
     if (args.bufferInUse > (sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) {
@@ -1418,7 +1418,7 @@ void Application::pasteVoxels() {
 
     // Recurse the clipboard tree, where everything is root relative, and send all the colored voxels to 
     // the server as an set voxel message, this will also rebase the voxels to the new location
-    SendVoxelsOperataionArgs args;
+    SendVoxelsOperationArgs args;
     args.messageBuffer[0] = PACKET_HEADER_SET_VOXEL_DESTRUCTIVE;
     unsigned short int* sequenceAt = (unsigned short int*)&args.messageBuffer[sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE)];
     *sequenceAt = 0;
@@ -1433,7 +1433,7 @@ void Application::pasteVoxels() {
         args.newBaseOctCode = calculatedOctCode = pointToVoxel(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
     }
 
-    _clipboardTree.recurseTreeWithOperation(sendVoxelsOperataion, &args);
+    _clipboardTree.recurseTreeWithOperation(sendVoxelsOperation, &args);
     
     // If we have voxels left in the packet, then send the packet
     if (args.bufferInUse > (sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ee48307910..edcc1d6b82 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -161,7 +161,7 @@ private slots:
    
 private:
 
-    static bool sendVoxelsOperataion(VoxelNode* node, void* extraData);
+    static bool sendVoxelsOperation(VoxelNode* node, void* extraData);
     
     void initMenu();
     void updateFrustumRenderModeAction();