[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kate
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2005-03-27 17:55:45
Message-ID: 20050327175545.5BFDA3E9 () office ! kde ! org
[Download RAW message or body]

CVS commit by staniek: 

- fixes for win32 (msvc) compiler (kjs temporary disabled)
- typo found in katedocument.cpp


  M +1 -1      interfaces/document.h   1.84
  M +4 -0      part/katecmds.cpp   1.50
  M +2 -0      part/katecursor.h   1.28
  M +1 -1      part/katedocument.cpp   1.812
  M +8 -0      part/katefactory.cpp   1.76


--- kdelibs/kate/interfaces/document.h  #1.83:1.84
@@ -155,5 +155,5 @@ class CommandExtension
      * @param cmdname The command name associated with this request.
      */
-    virtual KCompletion *completionObject( const QString & cmdname, Kate::View \
*/*view*/ ) { Q_UNUSED(cmdname); return 0L; } +    virtual KCompletion \
*completionObject( const QString & cmdname, Kate::View * /*view*/ ) { \
Q_UNUSED(cmdname); return 0L; }  
     /**

--- kdelibs/kate/part/katecmds.cpp  #1.49:1.50
@@ -109,5 +109,9 @@ bool KateCommands::CoreCommands::exec(Ka
   else if ( cmd == "run-myself" )
   {
+#ifndef Q_WS_WIN //todo
     return KateFactory::self()->jscript()->execute(v, v->doc()->text(), errorMsg);
+#else
+    return 0;
+#endif
   }
   else if ( cmd == "unindent" )

--- kdelibs/kate/part/katecursor.h  #1.27:1.28
@@ -55,4 +55,5 @@ class KateTextCursor
       { return !(c1 > c2); }
       
+#ifndef Q_WS_WIN //not needed
     friend void qSwap(KateTextCursor & c1, KateTextCursor & c2) {
       KateTextCursor tmp = c1;
@@ -60,4 +61,5 @@ class KateTextCursor
       c2 = tmp;
     }
+#endif
 
     inline void pos(int *pline, int *pcol) const {

--- kdelibs/kate/part/katedocument.cpp  #1.811:1.812
@@ -4872,5 +4872,5 @@ void KateDocument::readVariableLine( QSt
           m_config->setConfigFlags( KateDocumentConfig::cfDoxygenAutoTyping, state);
         else if ( var == "mixed-indent" && checkBoolValue( val, &state ) )
-          m_config->setConfigFlags( KateDocumentConfig::cfMixedIndent, &state );
+          m_config->setConfigFlags( KateDocumentConfig::cfMixedIndent, state );
 
         // INTEGER SETTINGS

--- kdelibs/kate/part/katefactory.cpp  #1.75:1.76
@@ -134,7 +134,11 @@ KateFactory::KateFactory ()
   m_vm = new KVMAllocator ();
 
+#ifndef Q_WS_WIN //todo
   // create script man (search scripts) + register commands
   m_jscriptManager = new KateJScriptManager ();
   KateCmd::self()->registerCommand (m_jscriptManager);
+#else
+  m_jscriptManager = 0;
+#endif
 
   //
@@ -241,8 +245,12 @@ void KateFactory::deregisterRenderer ( K
 KateJScript *KateFactory::jscript ()
 {
+#ifndef Q_WS_WIN //todo
   if (m_jscript)
     return m_jscript;
 
   return m_jscript = new KateJScript ();
+#else
+  return 0;
+#endif
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]