瀏覽代碼

Remove lazy loading hack.

git-svn-id: file:///var/svn/tigccpp/trunk@1019 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 17 年之前
父節點
當前提交
5e7f3ad3ec
共有 4 個文件被更改,包括 21 次插入42 次删除
  1. 1 4
      ktigcc/mainform.cpp
  2. 0 2
      ktigcc/preferences.cpp
  3. 0 2
      ktigcc/preferencesdlg.cpp
  4. 20 34
      ktigcc/preferencesdlg.ui

+ 1 - 4
ktigcc/mainform.cpp

@@ -1732,10 +1732,7 @@ Q3ListViewItem * MainForm::openFile(Q3ListViewItem * category, Q3ListViewItem *
     SYSICON("unknown","filex.png"));
   newFile->fileName=fileName;
   if (IS_EDITABLE_CATEGORY(category)) {
-    if (preferences.lazyLoading)
-      newFile->textBuffer=fileText;
-    else
-      newFile->kateView=reinterpret_cast<KTextEditor::View *>(createView(fileName,fileText,category));
+    newFile->kateView=reinterpret_cast<KTextEditor::View *>(createView(fileName,fileText,category));
     KDirWatch::self()->addFile(fileName);
   }
   fileCount++;

+ 0 - 2
ktigcc/preferences.cpp

@@ -1782,7 +1782,6 @@ void loadPreferences(void)
   QFont defaultFont("Monospace",10);
   preferences.editorFont=pconfig->readFontEntry("Editor Font",&defaultFont);
   preferences.useCalcCharset=pconfig->readBoolEntry("Use Calc Charset",true);
-  preferences.lazyLoading=pconfig->readBoolEntry("Lazy Loading",true);
   preferences.autoBlocks=pconfig->readBoolEntry("Auto Blocks",true);
   preferences.removeTrailingSpaces=pconfig->readBoolEntry("Remove Trailing Spaces",false);
 
@@ -1845,7 +1844,6 @@ void savePreferences(void)
   pconfig->writeEntry("Background Color",preferences.bgColor);
   pconfig->writeEntry("Editor Font",preferences.editorFont);
   pconfig->writeEntry("Use Calc Charset",(bool)preferences.useCalcCharset);
-  pconfig->writeEntry("Lazy Loading",(bool)preferences.lazyLoading);
   pconfig->writeEntry("Auto Blocks",(bool)preferences.autoBlocks);
   pconfig->writeEntry("Remove Trailing Spaces",(bool)preferences.removeTrailingSpaces);
 

+ 0 - 2
ktigcc/preferencesdlg.cpp

@@ -178,7 +178,6 @@ void Preferences::init()
   editorFont->setFont(preferences.editorFont);
   editorFont->setText(preferences.editorFont.family());
   useCalcCharset->setChecked(preferences.useCalcCharset);
-  lazyLoading->setChecked(preferences.lazyLoading);
   autoBlocks->setChecked(preferences.autoBlocks);
   removeTrailingSpaces->setChecked(preferences.removeTrailingSpaces);
 
@@ -252,7 +251,6 @@ void Preferences::destroy()
     preferences.bgColor=bgColor->backgroundColor();
     preferences.editorFont=editorFont->font();
     preferences.useCalcCharset=useCalcCharset->isChecked();
-    preferences.lazyLoading=lazyLoading->isChecked();
     preferences.autoBlocks=autoBlocks->isChecked();
     preferences.removeTrailingSpaces=removeTrailingSpaces->isChecked();
 

+ 20 - 34
ktigcc/preferencesdlg.ui

@@ -24,9 +24,6 @@
    </property>
    <item>
     <widget class="QTabWidget" name="tabWidget" >
-     <property name="currentIndex" >
-      <number>0</number>
-     </property>
      <widget class="QWidget" name="Widget8" >
       <attribute name="title" >
        <string>&amp;General</string>
@@ -696,16 +693,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QCheckBox" name="lazyLoading" >
-         <property name="text" >
-          <string>Load &amp;files lazily (not at project load time)</string>
-         </property>
-         <property name="shortcut" >
-          <string>Alt+F</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QCheckBox" name="autoBlocks" >
          <property name="text" >
@@ -1218,6 +1205,21 @@
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <customwidgets>
+  <customwidget>
+   <class>K3ListView</class>
+   <extends>Q3ListView</extends>
+   <header>k3listview.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KPushButton</class>
+   <extends>QPushButton</extends>
+   <header>kpushbutton.h</header>
+  </customwidget>
+  <customwidget>
+   <class>K3TextEdit</class>
+   <extends>Q3TextEdit</extends>
+   <header>k3textedit.h</header>
+  </customwidget>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
@@ -1229,16 +1231,16 @@
    <header>Qt3Support/Q3ButtonGroup</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>Q3TextEdit</class>
-   <extends>Q3Frame</extends>
-   <header>q3textedit.h</header>
-  </customwidget>
   <customwidget>
    <class>K3ListBox</class>
    <extends>Q3ListBox</extends>
    <header>k3listbox.h</header>
   </customwidget>
+  <customwidget>
+   <class>Q3TextEdit</class>
+   <extends>Q3Frame</extends>
+   <header>q3textedit.h</header>
+  </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
@@ -1260,21 +1262,6 @@
    <extends>Q3Frame</extends>
    <header>q3listbox.h</header>
   </customwidget>
-  <customwidget>
-   <class>K3ListView</class>
-   <extends>Q3ListView</extends>
-   <header>k3listview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
-   <class>K3TextEdit</class>
-   <extends>Q3TextEdit</extends>
-   <header>k3textedit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
@@ -1298,7 +1285,6 @@
   <tabstop>bgColorChange</tabstop>
   <tabstop>editorFontChange</tabstop>
   <tabstop>useCalcCharset</tabstop>
-  <tabstop>lazyLoading</tabstop>
   <tabstop>autoBlocks</tabstop>
   <tabstop>removeTrailingSpaces</tabstop>
   <tabstop>syntaxLanguage</tabstop>