Mercurial > ldforge / file diff

--- a/src/gui_actions.cpp	Sat Oct 05 12:51:13 2013 +0300
+++ b/src/gui_actions.cpp	Sat Oct 05 15:18:47 2013 +0300
@@ -242,7 +242,6 @@
 // -----------------------------------------------------------------------------
 DEFINE_ACTION (Help, KEY (F1))
 {
-
 }
 
 // =============================================================================
@@ -351,7 +350,7 @@
 // -----------------------------------------------------------------------------
 DEFINE_ACTION (InsertFrom, 0)
 {	str fname = QFileDialog::getOpenFileName();
-	ulong idx = g_win->getInsertionPoint();
+	int idx = g_win->getInsertionPoint();
 
 	if (!fname.length())
 		return;
@@ -408,7 +407,7 @@
 // =============================================================================
 // -----------------------------------------------------------------------------
 DEFINE_ACTION (InsertRaw, 0)
-{	ulong idx = g_win->getInsertionPoint();
+{	int idx = g_win->getInsertionPoint();
 
 	QDialog* const dlg = new QDialog;
 	QVBoxLayout* const layout = new QVBoxLayout;
@@ -445,7 +444,7 @@
 DEFINE_ACTION (Screenshot, 0)
 {	setlocale (LC_ALL, "C");
 
-	ushort w, h;
+	int w, h;
 	uchar* imgdata = g_win->R()->screencap (w, h);
 	QImage img = imageFromScreencap (imgdata, w, h);
 
@@ -553,7 +552,7 @@
 		return;
 	}
 
-	ushort w, h;
+	int w, h;
 
 	GLRenderer* rend = new GLRenderer;
 	rend->resize (64, 64);