X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fttedit.cpp;h=f023f034e5d5f609e69dff76c6b622a1aff4b51f;hb=HEAD;hp=a657cad17a48bb10d259299b5ad786b1b68aadd3;hpb=38fb522026b16fb83f49e2b2f32884ffaca177dd;p=ttedit

diff --git a/src/ttedit.cpp b/src/ttedit.cpp
old mode 100755
new mode 100644
index a657cad..f023f03
--- a/src/ttedit.cpp
+++ b/src/ttedit.cpp
@@ -6,7 +6,7 @@
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
 // Who  When        What
-// ---  ----------  -------------------------------------------------------------
+// ---  ----------  -----------------------------------------------------------
 // JLH  04/10/2002  Created this file
 // JLH  05/10/2004  Translated file from ASM to CPP
 // JLH  05/14/2004  Added rudimentary editing capability to tool palette tools
@@ -16,37 +16,17 @@
 // JLH  03/05/2009  Initial conversion from wxWidgets to Qt
 //
 
-// FIXED:
-//
-// - Fix problem with tool palette not getting focus 1st time it's called up [DONE]
-// - Split out windows/classes defined here into their own files [DONE]
-//
-// STILL TO BE DONE:
-//
-// - Fix bug in Glyphpoints when dragging on an empty canvas or loading a font
-// - Fix scrolling, zooming, settings (ini)
-// - Finish conversion to wxWidgets for cross-platform portability
-// - Fix problem with owned window causing main window refresh problems
-//   (ironically enough, it doesn't seem to be a problem anymore...)
-//
-
-// Uncomment this for debugging...
-//#define DEBUG
-//#define DEBUGFOO			// Various tool debugging...
-//#define DEBUGTP				// Toolpalette debugging...
-
 #include "ttedit.h"
 #include <QApplication>
-#include "ttemainwindow.h"
-//#include "charwindow.h"
+#include "global.h"
+#include "mainwindow.h"
 
 // Main app constructor--we stick globally accessible stuff here...
 
-TTEdit::TTEdit(int argc, char * argv[]): QApplication(argc, argv), charWnd(NULL)
+TTEdit::TTEdit(int & argc, char * argv[]): QApplication(argc, argv)
 {
-	mainWindow = new TTEMainWindow;
-//printf("mainWindow.show();\n");
-	mainWindow->show();
+	Global::mainWindow = new MainWindow;
+	Global::mainWindow->show();
 }
 
 
@@ -55,12 +35,6 @@ int main(int argc, char * argv[])
 {
 	Q_INIT_RESOURCE(ttedit);	// This must the same name as the exe filename
 
-//	QApplication app(argc, argv);
-//printf("TTEdit app(argc, argv);\n");
 	TTEdit app(argc, argv);
-//printf("TTEMainWindow mainWindow;\n");
-//OK, it gets to here at least...
-//printf("return app.exec();\n");
 	return app.exec();
 }
-