Explorar o código

First round of compile fixes.

git-svn-id: file:///var/svn/tigccpp/trunk@945 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler %!s(int64=17) %!d(string=hai) anos
pai
achega
2d84276378
Modificáronse 4 ficheiros con 15 adicións e 13 borrados
  1. 8 6
      ktigcc/ktigcc.cpp
  2. 1 1
      ktigcc/ktigcc.h
  3. 1 1
      ktigcc/mainform.ui
  4. 5 5
      ktigcc/mainform.ui.h

+ 8 - 6
ktigcc/ktigcc.cpp

@@ -52,7 +52,7 @@ char tempdir[]="/tmp/ktigccXXXXXX";
 char *quill_drv;
 bool have_fargo;
 bool have_flashos;
-KConfig *pconfig;
+KSharedConfigPtr pconfig;
 KAboutData *pabout;
 const char *parg;
 
@@ -90,14 +90,10 @@ int main(int argc, char *argv[])
   KCmdLineArgs::addCmdLineOptions(options);
   KCmdLineArgs::addStdCmdLineOptions();
   KApplication app;
-  // Set the preferred large icon size so system toolbar icons don't get
-  // annoying padding.
-  int toolbarIconSize=KIconLoader().currentSize(K3Icon::MainToolbar);
-  QIcon::setIconSize(QIcon::Large,QSize(toolbarIconSize,toolbarIconSize));
   // Readd the images KDE kindly removes...
   qCleanupImages_ktigcc();
   qInitImages_ktigcc();
-  about.setProgramLogo(QImage::fromMimeSource("icon.png"));
+  about.setProgramLogo(qPixmapFromMimeSource("icon.png"));
   pconfig=KGlobal::config();
   
   if ((tigcc_base = getenv("TIGCC")) == NULL) {
@@ -160,6 +156,12 @@ int main(int argc, char *argv[])
                     log_eater,NULL);
 
   MainForm mainForm;
+  // Set the preferred icon size so system toolbar icons don't get annoying
+  // padding. FIXME: Needed? Correct?
+#if 0 // Needs port from Q3MainWindow to QMainWindow or KMainWindow.
+  int toolbarIconSize=KIconLoader().currentSize(K3Icon::MainToolbar);
+  mainForm.setIconSize(QSize(toolbarIconSize,toolbarIconSize));
+#endif
   app.setMainWidget( &mainForm );
   mainForm.show();
   

+ 1 - 1
ktigcc/ktigcc.h

@@ -42,7 +42,7 @@ void delete_temp_file(const char *filename);
 void clear_temp_dir(void);
 void force_qt_assistant_page(int n);
 const char *lookup_doc_keyword(const char *keyword);
-extern KConfig *pconfig;
+extern KSharedConfigPtr pconfig;
 extern KAboutData *pabout;
 extern const char *parg;
 extern AssistantClient *assistant;

+ 1 - 1
ktigcc/mainform.ui

@@ -1725,7 +1725,7 @@
     <function access="private" specifier="non virtual">linkProject()</function>
     <function access="private" specifier="non virtual">showStats()</function>
     <function>compileSourceFile( void * srcFile )</function>
-    <function access="private" specifier="non virtual" returnType="bool">tiemuInstance( QCString &amp; instanceName )</function>
+    <function access="private" specifier="non virtual" returnType="bool">tiemuInstance( void * instanceName )</function>
     <function specifier="static" returnType="QString">tilibsErrorMessage( int err )</function>
     <function access="private" specifier="non virtual">updateToolsMenu()</function>
     <function access="private" specifier="non virtual">updateSizes()</function>

+ 5 - 5
ktigcc/mainform.ui.h

@@ -4758,9 +4758,9 @@ void MainForm::projectOptions()
   debugPauseAction->setVisible(runnable);
 }
 
-bool MainForm::tiemuInstance(Q3CString &instanceName)
+bool MainForm::tiemuInstance(void * instanceName)
 {
-  instanceName=Q3CString();
+  *(Q3CString*)instanceName=Q3CString();
   DCOPClient *dcopClient=kapp->dcopClient();
   if (!dcopClient->isAttached() && !dcopClient->attach()) {
     KMessageBox::error(this,"Can\'t attach to DCOP.");
@@ -4771,7 +4771,7 @@ bool MainForm::tiemuInstance(Q3CString &instanceName)
   QCStringList::iterator it;
   for (it = applist.begin(); it != applist.end(); ++it) {
     if ((*it).contains(QRegExp("^tiemu-"))) {
-      instanceName = (*it);
+      *(Q3CString*)instanceName = (*it);
       break;
     }
   }
@@ -4837,7 +4837,7 @@ void MainForm::debugRun()
       case LT_TIEMU:
         {
           // Fire up TiEmu if it isn't running yet.
-          if (!tiemuInstance(instanceName)) return;
+          if (!tiemuInstance(&instanceName)) return;
           if (instanceName.isNull()) {
             if (!KRun::runCommand("tiemu")) {
               KMessageBox::error(this,"Can't run TiEmu.");
@@ -4846,7 +4846,7 @@ void MainForm::debugRun()
             do {
               usleep(100000);
               QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput,100);
-              if (!tiemuInstance(instanceName)) return;
+              if (!tiemuInstance(&instanceName)) return;
             } while (instanceName.isNull());
           }
           tiemuDCOP=new TiEmuDCOP_stub(instanceName,"TiEmuDCOP");