merge

chrizel · Dec 16, 2009 · 18ccaa4 · 18ccaa4
2 parents 1c2463f + ff94f70
commit 18ccaa4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/libyzis/keys.h b/libyzis/keys.h
@@ -45,7 +45,7 @@ class YZIS_EXPORT YKey
 
     // dont use operator QChar() here, i want an explicit cast only
     QChar getChar(void) const {  return (mText.size()==1)?mText.at(0):QChar();}
-    void setKey(int key) { mKey = key; mText=QChar(key);}
+    void setKey(Qt::Key key) { mKey = key; mText=QChar(key);}
 #if 1
     // should be removed
     void setKey(QChar ch) { mKey = (Qt::Key) ch.unicode(); mText = ch; mModifiers &= ~Qt::ShiftModifier; }

diff --git a/libyzis/mode_ex.cpp b/libyzis/mode_ex.cpp
@@ -811,7 +811,7 @@ CmdState YModeEx::substitute( const YExCommandArgs& args )
     YCursor start( 0, args.fromLine );
     YSession::self()->search()->forward( args.view->buffer(), search, &found, start );
     if ( found ) {
-        for ( unsigned int i = args.fromLine; i <= args.toLine; i++ ) {
+        for ( uint i = args.fromLine; i <= args.toLine; i++ ) {
             if ( args.view->buffer()->substitute( search, replace, options.contains( "g" ), i ) ) {
                 needsUpdate = true;
                 lastLine = i;

diff --git a/libyzis/portability.h b/libyzis/portability.h
@@ -26,6 +26,9 @@
  * define, whatever..)
  */
 
+#ifdef YZIS_WIN32_GCC
+// ooh, we are on windows with gcc
+
 #ifdef YZIS_WIN32
  // we are on windows with gcc or msvc
 
@@ -40,10 +43,13 @@
 
 #endif /* YZIS_WIN32 */
 
-#if defined (YZIS_UNIX) || defined (YZIS_APPLE)
- // we are on unix (or mac?)
- #include <pwd.h> // still needed for kate/*, which is bad
- #include "translator.h"
+#else
+// ahh, we are on unix
+
+//#include <unistd.h>
+#include <pwd.h> // still needed for kate/*, which is bad
+#include "translator.h"
+//#include <libintl.h>
 
  #define CHECK_GETEUID( v )  (v == geteuid())
 #endif /* YZIS_UNIX || YZIS_APPLE */