Przeglądaj źródła

Fix compilation of preferences.cpp.

git-svn-id: file:///var/svn/tigccpp/trunk@949 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 17 lat temu
rodzic
commit
7aa5ef3bcf
2 zmienionych plików z 20 dodań i 10 usunięć
  1. 3 3
      ktigcc/preferences.cpp
  2. 17 7
      ktigcc/preferencesdlg.ui

+ 3 - 3
ktigcc/preferences.cpp

@@ -1,7 +1,7 @@
 /*
    ktigcc - TIGCC IDE for KDE
 
-   Copyright (C) 2004-2006 Kevin Kofler
+   Copyright (C) 2004-2007 Kevin Kofler
    Copyright (C) 2006 Joey Adams
 
    This program is free software; you can redistribute it and/or modify
@@ -258,7 +258,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
     ADD_ATTR(customStyleContext,"attribute",customStyle.name);
     ADD_ATTR(customStyleContext,"lineEndContext",(endsWithNewline||
       (endsWithSpace&&noIgnoreEndingAfter))?"#pop":"#stay");
-    if (endsWithNewline && customStyle.ignoreEndingAfter=="\\") {
+    if (endsWithNewline && customStyle.ignoreEndingAfter=='\\') {
       CHILD_NODE(lineContinue,customStyleContext,"LineContinue");
       ADD_ATTR(lineContinue,"attribute",customStyle.name);
       ADD_ATTR(lineContinue,"context","#stay");
@@ -426,7 +426,7 @@ static void writeSyntaxXML(const Syn_SettingsForDoc &synprefs,
       fclose(f);
       return;
     }
-    (void) fputs(doc.toCString(2),f);
+    (void) fputs(doc.toByteArray(2),f);
     fclose(f);
   }
 }

+ 17 - 7
ktigcc/preferencesdlg.ui

@@ -429,10 +429,10 @@
                       <property name="value" >
                         <number>2</number>
                       </property>
-                      <property name="minValue" >
+                      <property name="minimum" >
                         <number>1</number>
                       </property>
-                      <property name="maxValue" >
+                      <property name="maximum" >
                         <number>80</number>
                       </property>
                     </widget>
@@ -471,10 +471,10 @@
                       <property name="value" >
                         <number>8</number>
                       </property>
-                      <property name="minValue" >
+                      <property name="minimum" >
                         <number>1</number>
                       </property>
-                      <property name="maxValue" >
+                      <property name="maximum" >
                         <number>80</number>
                       </property>
                     </widget>
@@ -979,7 +979,7 @@
                           <number>0</number>
                         </property>
                         <item row="1" column="1" >
-                          <widget class="KTextEdit" name="templateCode" >
+                          <widget class="K3TextEdit" name="templateCode" >
                             <property name="sizePolicy" >
                               <sizepolicy>
                                 <hsizetype>7</hsizetype>
@@ -998,7 +998,7 @@
                               <enum>NoWrap</enum>
                             </property>
                             <property name="autoFormatting" >
-                              <set>AutoNone</set>
+                              <set>K3TextEdit::AutoNone</set>
                             </property>
                           </widget>
                         </item>
@@ -1186,6 +1186,16 @@
       <extends>QComboBox</extends>
       <header>kcombobox.h</header>
     </customwidget>
+    <customwidget>
+      <class>KIntNumInput</class>
+      <extends>QWidget</extends>
+      <header>knuminput.h</header>
+    </customwidget>
+    <customwidget>
+      <class>K3TextEdit</class>
+      <extends>Q3TextEdit</extends>
+      <header>k3textedit.h</header>
+    </customwidget>
   </customwidgets>
   <tabstops>
     <tabstop>tabWidget</tabstop>
@@ -1254,7 +1264,7 @@
     <include location="local" >kpushbutton.h</include>
     <include location="local" >kpushbutton.h</include>
     <include location="local" >k3listbox.h</include>
-    <include location="local" >ktextedit.h</include>
+    <include location="local" >k3textedit.h</include>
     <include location="local" >klineedit.h</include>
     <include location="local" >kpushbutton.h</include>
     <include location="local" >kpushbutton.h</include>