Browse Source

Port to KDE 3.90.1 API:
* preferences.cpp: KConfig: readColorEntry, readFontEntry -> readEntry
* callbacks.cpp: KProgressDialog: setModal instead of modal parameter in constructor, setLabel -> setLabelText
* mainform.cpp, parsing.cpp, projectoptions.cpp, toolprops.cpp: KProcIO -> K3ProcIO, KProcess -> K3Process
* mainform.cpp, srcfilewin.cpp: KWin -> KWindowSystem, KFindDialog: setModal instead of modal parameter in constructor, KFindDialog and KReplaceDialog: no more name parameter in constructor
* preferencesdlg.cpp: KFontDialog::getFont now takes KFontChooser::FixedFontsOnly instead of TRUE as the second parameter, KCursor::waitCursor() -> Qt::WaitCursor


git-svn-id: file:///var/svn/tigccpp/trunk@1089 9552661e-59e3-4036-b4f2-dbe53926924f

kevinkofler 17 years ago
parent
commit
440f2d03d1

+ 3 - 2
ktigcc/callbacks.cpp

@@ -58,7 +58,7 @@ static void callback_ticalcs_pbar(void)
 
 static void callback_ticalcs_label(void)
 {
-  sendingProgress->setLabel(QString("Sending \'%1\'").arg(ticalcsUpdate.text));
+  sendingProgress->setLabelText(QString("Sending \'%1\'").arg(ticalcsUpdate.text));
   callback_ticalcs_refresh();
 }
 
@@ -80,7 +80,8 @@ CalcUpdate ticalcsUpdate=CalcUpdateInitialized();
 void callbacksInit(QWidget *parent)
 {
   sendingProgress=new KProgressDialog(parent,"Sending Variable",
-                                      QString::null,TRUE);
+                                      QString::null);
+  sendingProgress->setModal(true);
   sendingProgress->show();
   callback_ticalcs_refresh();
 }

+ 80 - 79
ktigcc/mainform.cpp

@@ -138,7 +138,7 @@ class DnDListView : public K3ListView {
 #include <kicontheme.h>
 #include <kicon.h>
 #include <kiconloader.h>
-#include <kprocio.h>
+#include <k3procio.h>
 #include <kshell.h>
 #include <ktextbrowser.h>
 #include <krun.h>
@@ -170,8 +170,8 @@ class DnDListView : public K3ListView {
 #include "completion.h"
 
 #if defined(Q_WS_X11)
-#include <kwin.h>
-#define ACTIVATE_WINDOW(winid) KWin::activateWindow(winid)
+#include <kwindowsystem.h>
+#define ACTIVATE_WINDOW(winid) KWindowSystem::activateWindow(winid)
 #elif defined(Q_WS_WIN)
 #include <windows.h>
 #define ACTIVATE_WINDOW(winid) SetForegroundWindow(winid)
@@ -1009,7 +1009,7 @@ void MainForm::init()
   windowIcon.addPixmap(largeIcon);
   setWindowIcon(windowIcon);
 #ifdef Q_WS_X11
-  KWin::setIcons(winId(),largeIcon,smallIcon);
+  KWindowSystem::setIcons(winId(),largeIcon,smallIcon);
 #endif
   ticables_library_init();
   tifiles_library_init();
@@ -2750,7 +2750,8 @@ void MainForm::findFind()
   else {
     // Never set hasSelection because finding in selection doesn't really make
     // sense with my non-modal find dialog setup.
-    kfinddialog=new KFindDialog(false,this,0,KFind::FromCursor,findHistory);
+    kfinddialog=new KFindDialog(this,KFind::FromCursor,findHistory);
+    kfinddialog->setModal(false);
     connect(kfinddialog, SIGNAL(okClicked()), this, SLOT(findFind_next()));
     connect(kfinddialog, SIGNAL(cancelClicked()), this, SLOT(findFind_stop()));
     kfinddialog->show();
@@ -2938,11 +2939,11 @@ void MainForm::findReplace()
       ACTIVATE_WINDOW(replaceNextDialog->winId());
     return;
   }
-  KReplaceDialog kreplacedialog(this,0,((CURRENT_VIEW&&CURRENT_VIEW->selection()
-                                         &&!CURRENT_VIEW->selectionRange().onSingleLine())?
-                                         KFind::SelectedText:0)|KFind::FromCursor,
-                                        findHistory,replacementHistory,
-                                        CURRENT_VIEW&&CURRENT_VIEW->selection());
+  KReplaceDialog kreplacedialog(this,((CURRENT_VIEW&&CURRENT_VIEW->selection()
+                                       &&!CURRENT_VIEW->selectionRange().onSingleLine())?
+                                       KFind::SelectedText:0)|KFind::FromCursor,
+                                      findHistory,replacementHistory,
+                                      CURRENT_VIEW&&CURRENT_VIEW->selection());
   if (kreplacedialog.exec()!=QDialog::Accepted)
     return;
   findHistory=kreplacedialog.findHistory();
@@ -3603,7 +3604,7 @@ static QDateTime newestHeaderTimestamp;
 static QStringList objectFiles;
 static QStringList deletableObjectFiles;
 static QStringList deletableAsmFiles;
-static KProcIO *procio;
+static K3ProcIO *procio;
 
 QString MainForm::writeTempSourceFile(void *srcFile, bool inProject)
 {
@@ -3725,7 +3726,7 @@ void MainForm::startCompiling()
   ti89_targeted=ti92p_targeted=v200_targeted=dataFileGenerated=FALSE;
   compileStats=QString::null;
   projectProgramOutputAction->setEnabled(FALSE);
-  procio=static_cast<KProcIO *>(NULL);
+  procio=static_cast<K3ProcIO *>(NULL);
   // Write all the headers and incbin files to the temporary directory.
   Q3ListViewItemIterator lvit(hFilesListItem);
   Q3ListViewItem *item;
@@ -4133,11 +4134,11 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
       if (!stopCompilingFlag) {
         // The QTextCodec has to be passed explicitly, or it will default to
         // ISO-8859-1 regardless of the locale, which is just broken.
-        procio=new KProcIO(QTextCodec::codecForLocale());
+        procio=new K3ProcIO(QTextCodec::codecForLocale());
         // Use MergedStderr instead of Stderr so the messages get ordered
         // properly.
-        procio->setComm(static_cast<KProcess::Communication>(
-          KProcess::Stdout|KProcess::MergedStderr));
+        procio->setComm(static_cast<K3Process::Communication>(
+          K3Process::Stdout|K3Process::MergedStderr));
         procio->setWorkingDirectory(fileDir);
         *procio<<(QString("%1/bin/a68k").arg(tigcc_base))
                <<fileName<<(QString("-o%1").arg(tempObjectFile))
@@ -4146,8 +4147,8 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
           *procio<<"-a"; // all relocs
         if (settings.optimize_returns||settings.archive)
           *procio<<"-d"; // keep locals
-        connect(procio,SIGNAL(processExited(KProcess*)),this,SLOT(procio_processExited()));
-        connect(procio,SIGNAL(readReady(KProcIO*)),this,SLOT(procio_readReady()));
+        connect(procio,SIGNAL(processExited(K3Process*)),this,SLOT(procio_processExited()));
+        connect(procio,SIGNAL(readReady(K3ProcIO*)),this,SLOT(procio_readReady()));
         procio->start();
         // We need to block here, but events still need to be handled. The most
         // effective way to do this is to enter the event loop recursively,
@@ -4155,7 +4156,7 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
         QCoreApplication::enter_loop();
         // This will be reached only after exitLoop() is called.
         delete procio;
-        procio=static_cast<KProcIO *>(NULL);
+        procio=static_cast<K3ProcIO *>(NULL);
       }
     } else {
       bool deleteTempAsmFile=FALSE;
@@ -4176,11 +4177,11 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
         if (!stopCompilingFlag) {
           // The QTextCodec has to be passed explicitly, or it will default to
           // ISO-8859-1 regardless of the locale, which is just broken.
-          procio=new KProcIO(QTextCodec::codecForLocale());
+          procio=new K3ProcIO(QTextCodec::codecForLocale());
           // Use MergedStderr instead of Stderr so the messages get ordered
           // properly.
-          procio->setComm(static_cast<KProcess::Communication>(
-            KProcess::Stdout|KProcess::MergedStderr));
+          procio->setComm(static_cast<K3Process::Communication>(
+            K3Process::Stdout|K3Process::MergedStderr));
           procio->setWorkingDirectory(fileDir);
           *procio<<(QString("%1/bin/gcc").arg(tigcc_base))
                  <<"-S"<<"-I"<<fileDir
@@ -4204,8 +4205,8 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
             *procio<<process_libopts();
           }
           *procio<<fileName<<"-o"<<tempAsmFile;
-          connect(procio,SIGNAL(processExited(KProcess*)),this,SLOT(procio_processExited()));
-          connect(procio,SIGNAL(readReady(KProcIO*)),this,SLOT(procio_readReady()));
+          connect(procio,SIGNAL(processExited(K3Process*)),this,SLOT(procio_processExited()));
+          connect(procio,SIGNAL(readReady(K3ProcIO*)),this,SLOT(procio_readReady()));
           procio->start();
           // We need to block here, but events still need to be handled. The most
           // effective way to do this is to enter the event loop recursively,
@@ -4213,22 +4214,22 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
           QCoreApplication::enter_loop();
           // This will be reached only after exitLoop() is called.
           delete procio;
-          procio=static_cast<KProcIO *>(NULL);
+          procio=static_cast<K3ProcIO *>(NULL);
         }
         if (!stopCompilingFlag && qdir.exists(tempAsmFile)) {
           // Run patcher.
           // The QTextCodec has to be passed explicitly, or it will default to
           // ISO-8859-1 regardless of the locale, which is just broken.
-          procio=new KProcIO(QTextCodec::codecForLocale());
+          procio=new K3ProcIO(QTextCodec::codecForLocale());
           // Use MergedStderr instead of Stderr so the messages get ordered
           // properly.
-          procio->setComm(static_cast<KProcess::Communication>(
-            KProcess::Stdout|KProcess::MergedStderr));
+          procio->setComm(static_cast<K3Process::Communication>(
+            K3Process::Stdout|K3Process::MergedStderr));
           procio->setWorkingDirectory(fileDir);
           *procio<<(QString("%1/bin/patcher").arg(tigcc_base))
                  <<tempAsmFile<<"-o"<<tempAsmFile;
-          connect(procio,SIGNAL(processExited(KProcess*)),this,SLOT(procio_processExited()));
-          connect(procio,SIGNAL(readReady(KProcIO*)),this,SLOT(procio_readReady()));
+          connect(procio,SIGNAL(processExited(K3Process*)),this,SLOT(procio_processExited()));
+          connect(procio,SIGNAL(readReady(K3ProcIO*)),this,SLOT(procio_readReady()));
           procio->start();
           // We need to block here, but events still need to be handled. The most
           // effective way to do this is to enter the event loop recursively,
@@ -4236,7 +4237,7 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
           QCoreApplication::enter_loop();
           // This will be reached only after exitLoop() is called.
           delete procio;
-          procio=static_cast<KProcIO *>(NULL);
+          procio=static_cast<K3ProcIO *>(NULL);
         }
         if (qdir.exists(tempAsmFile)) {
           if (!stopCompilingFlag) {
@@ -4270,11 +4271,11 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
         if (!stopCompilingFlag) {
           // The QTextCodec has to be passed explicitly, or it will default to
           // ISO-8859-1 regardless of the locale, which is just broken.
-          procio=new KProcIO(QTextCodec::codecForLocale());
+          procio=new K3ProcIO(QTextCodec::codecForLocale());
           // Use MergedStderr instead of Stderr so the messages get ordered
           // properly.
-          procio->setComm(static_cast<KProcess::Communication>(
-            KProcess::Stdout|KProcess::MergedStderr));
+          procio->setComm(static_cast<K3Process::Communication>(
+            K3Process::Stdout|K3Process::MergedStderr));
           procio->setWorkingDirectory(fileDir);
           *procio<<(QString("%1/bin/as").arg(tigcc_base))
                  <<"-I"<<fileDir<<"-mc68000"
@@ -4286,8 +4287,8 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
           if (settings.debug_info)
             *procio<<"--gdwarf2";
           *procio<<fileNameToAssemble<<"-o"<<tempObjectFile;
-          connect(procio,SIGNAL(processExited(KProcess*)),this,SLOT(procio_processExited()));
-          connect(procio,SIGNAL(readReady(KProcIO*)),this,SLOT(procio_readReady()));
+          connect(procio,SIGNAL(processExited(K3Process*)),this,SLOT(procio_processExited()));
+          connect(procio,SIGNAL(readReady(K3ProcIO*)),this,SLOT(procio_readReady()));
           procio->start();
           // We need to block here, but events still need to be handled. The most
           // effective way to do this is to enter the event loop recursively,
@@ -4295,7 +4296,7 @@ void MainForm::compileFile(void *srcFile, bool inProject, bool force)
           QCoreApplication::enter_loop();
           // This will be reached only after exitLoop() is called.
           delete procio;
-          procio=static_cast<KProcIO *>(NULL);
+          procio=static_cast<K3ProcIO *>(NULL);
         }
       }
       if (deleteTempAsmFile) qdir.remove(tempAsmFile);
@@ -4346,16 +4347,16 @@ void MainForm::linkProject()
     // Link static library using ar-tigcc.
     // The QTextCodec has to be passed explicitly, or it will default to
     // ISO-8859-1 regardless of the locale, which is just broken.
-    procio=new KProcIO(QTextCodec::codecForLocale());
+    procio=new K3ProcIO(QTextCodec::codecForLocale());
     // Use MergedStderr instead of Stderr so the messages get ordered
     // properly.
-    procio->setComm(static_cast<KProcess::Communication>(
-      KProcess::Stdout|KProcess::MergedStderr));
+    procio->setComm(static_cast<K3Process::Communication>(
+      K3Process::Stdout|K3Process::MergedStderr));
     procio->setWorkingDirectory(projectDir);
     *procio<<(QString("%1/bin/ar-tigcc").arg(tigcc_base))
            <<"-o"<<(projectBaseName+".a")<<"--no-names"<<objectFiles;
-    connect(procio,SIGNAL(processExited(KProcess*)),this,SLOT(procio_processExited()));
-    connect(procio,SIGNAL(readReady(KProcIO*)),this,SLOT(procio_readReady()));
+    connect(procio,SIGNAL(processExited(K3Process*)),this,SLOT(procio_processExited()));
+    connect(procio,SIGNAL(readReady(K3ProcIO*)),this,SLOT(procio_readReady()));
     procio->start();
     // We need to block here, but events still need to be handled. The most
     // effective way to do this is to enter the event loop recursively,
@@ -4363,7 +4364,7 @@ void MainForm::linkProject()
     QCoreApplication::enter_loop();
     // This will be reached only after exitLoop() is called.
     delete procio;
-    procio=static_cast<KProcIO *>(NULL);
+    procio=static_cast<K3ProcIO *>(NULL);
     if (errorsCompilingFlag || stopCompilingFlag) return;
     QFileInfo fileInfo(projectBaseName+".a");
     if (fileInfo.exists())
@@ -4380,11 +4381,11 @@ void MainForm::linkProject()
                                                packFolder,packName);
     // The QTextCodec has to be passed explicitly, or it will default to
     // ISO-8859-1 regardless of the locale, which is just broken.
-    procio=new KProcIO(QTextCodec::codecForLocale());
+    procio=new K3ProcIO(QTextCodec::codecForLocale());
     // Use MergedStderr instead of Stderr so the messages get ordered
     // properly.
-    procio->setComm(static_cast<KProcess::Communication>(
-      KProcess::Stdout|KProcess::MergedStderr));
+    procio->setComm(static_cast<K3Process::Communication>(
+      K3Process::Stdout|K3Process::MergedStderr));
     procio->setWorkingDirectory(projectDir);
     *procio<<(QString("%1/bin/ld-tigcc").arg(tigcc_base))
            <<"-v"<<"-o"<<linkOutput<<"-n"<<projectName;
@@ -4395,8 +4396,8 @@ void MainForm::linkProject()
                                         :(settings.fargo?"%1/lib/fargo.a"
                                                         :"%1/lib/tigcc.a"))
                .arg(tigcc_base);
-    connect(procio,SIGNAL(processExited(KProcess*)),this,SLOT(procio_processExited()));
-    connect(procio,SIGNAL(readReady(KProcIO*)),this,SLOT(procio_readReady()));
+    connect(procio,SIGNAL(processExited(K3Process*)),this,SLOT(procio_processExited()));
+    connect(procio,SIGNAL(readReady(K3ProcIO*)),this,SLOT(procio_readReady()));
     procio->start();
     // We need to block here, but events still need to be handled. The most
     // effective way to do this is to enter the event loop recursively,
@@ -4404,7 +4405,7 @@ void MainForm::linkProject()
     QCoreApplication::enter_loop();
     // This will be reached only after exitLoop() is called.
     delete procio;
-    procio=static_cast<KProcIO *>(NULL);
+    procio=static_cast<K3ProcIO *>(NULL);
     if (errorsCompilingFlag || stopCompilingFlag) return;
     // Rename the data file so it doesn't conflict with PPGs.
     if (dataFileGenerated)  {
@@ -4456,19 +4457,19 @@ void MainForm::linkProject()
           // Compress binary using ttpack.
           // The QTextCodec has to be passed explicitly, or it will default to
           // ISO-8859-1 regardless of the locale, which is just broken.
-          procio=new KProcIO(QTextCodec::codecForLocale());
+          procio=new K3ProcIO(QTextCodec::codecForLocale());
           // Use MergedStderr instead of Stderr so the messages get ordered
           // properly.
-          procio->setComm(static_cast<KProcess::Communication>(
-            KProcess::Stdout|KProcess::MergedStderr));
+          procio->setComm(static_cast<K3Process::Communication>(
+            K3Process::Stdout|K3Process::MergedStderr));
           procio->setWorkingDirectory(tempdir);
           // It is not possible to pass an absolute POSIX path to ttpack because
           // it mistakes it for a switch.
           *procio<<(QString("%1/bin/ttpack").arg(tigcc_base))
                  <<"-quiet"<<(QString("tempprog")+binexts[target])
                  <<(QString("tempprog")+cbinexts[target]);
-          connect(procio,SIGNAL(processExited(KProcess*)),this,SLOT(procio_processExited()));
-          connect(procio,SIGNAL(readReady(KProcIO*)),this,SLOT(procio_readReady()));
+          connect(procio,SIGNAL(processExited(K3Process*)),this,SLOT(procio_processExited()));
+          connect(procio,SIGNAL(readReady(K3ProcIO*)),this,SLOT(procio_readReady()));
           procio->start();
           // We need to block here, but events still need to be handled. The most
           // effective way to do this is to enter the event loop recursively,
@@ -4476,18 +4477,18 @@ void MainForm::linkProject()
           QCoreApplication::enter_loop();
           // This will be reached only after exitLoop() is called.
           delete procio;
-          procio=static_cast<KProcIO *>(NULL);
+          procio=static_cast<K3ProcIO *>(NULL);
           if (!QFileInfo(linkOutput+cbinexts[target]).exists())
             errorsCompilingFlag=TRUE;
           if (errorsCompilingFlag || stopCompilingFlag) return;
           // Wrap binary using ttbin2oth.
           // The QTextCodec has to be passed explicitly, or it will default to
           // ISO-8859-1 regardless of the locale, which is just broken.
-          procio=new KProcIO(QTextCodec::codecForLocale());
+          procio=new K3ProcIO(QTextCodec::codecForLocale());
           // Use MergedStderr instead of Stderr so the messages get ordered
           // properly.
-          procio->setComm(static_cast<KProcess::Communication>(
-            KProcess::Stdout|KProcess::MergedStderr));
+          procio->setComm(static_cast<K3Process::Communication>(
+            K3Process::Stdout|K3Process::MergedStderr));
           procio->setWorkingDirectory(tempdir);
           // ttbin2oth tries to use the calculator file name as the host file
           // name. This is bad because the calculator charset is not necessarily
@@ -4500,8 +4501,8 @@ void MainForm::linkProject()
                  <<"-quiet"<<ttbin2othflag[target]<<"ppg"
                  <<(QString("tempprog")+cbinexts[target])<<"tempprog";
           if (!packFolder.isNull()) *procio<<packFolder;
-          connect(procio,SIGNAL(processExited(KProcess*)),this,SLOT(procio_processExited()));
-          connect(procio,SIGNAL(readReady(KProcIO*)),this,SLOT(procio_readReady()));
+          connect(procio,SIGNAL(processExited(K3Process*)),this,SLOT(procio_processExited()));
+          connect(procio,SIGNAL(readReady(K3ProcIO*)),this,SLOT(procio_readReady()));
           procio->start();
           // We need to block here, but events still need to be handled. The most
           // effective way to do this is to enter the event loop recursively,
@@ -4509,7 +4510,7 @@ void MainForm::linkProject()
           QCoreApplication::enter_loop();
           // This will be reached only after exitLoop() is called.
           delete procio;
-          procio=static_cast<KProcIO *>(NULL);
+          procio=static_cast<K3ProcIO *>(NULL);
           if (!QFileInfo(linkOutput+ttbin2othexts[target]).exists())
             errorsCompilingFlag=TRUE;
           if (errorsCompilingFlag || stopCompilingFlag) return;
@@ -4536,17 +4537,17 @@ void MainForm::linkProject()
       // Link the pstarter with ld-tigcc.
       // The QTextCodec has to be passed explicitly, or it will default to
       // ISO-8859-1 regardless of the locale, which is just broken.
-      procio=new KProcIO(QTextCodec::codecForLocale());
+      procio=new K3ProcIO(QTextCodec::codecForLocale());
       // Use MergedStderr instead of Stderr so the messages get ordered
       // properly.
-      procio->setComm(static_cast<KProcess::Communication>(
-        KProcess::Stdout|KProcess::MergedStderr));
+      procio->setComm(static_cast<K3Process::Communication>(
+        K3Process::Stdout|K3Process::MergedStderr));
       procio->setWorkingDirectory(projectDir);
       *procio<<(QString("%1/bin/ld-tigcc").arg(tigcc_base))
              <<"-o"<<pstarterBaseName<<"-n"<<projectName
              <<(pstarterBaseName+".o");
-      connect(procio,SIGNAL(processExited(KProcess*)),this,SLOT(procio_processExited()));
-      connect(procio,SIGNAL(readReady(KProcIO*)),this,SLOT(procio_readReady()));
+      connect(procio,SIGNAL(processExited(K3Process*)),this,SLOT(procio_processExited()));
+      connect(procio,SIGNAL(readReady(K3ProcIO*)),this,SLOT(procio_readReady()));
       procio->start();
       // We need to block here, but events still need to be handled. The most
       // effective way to do this is to enter the event loop recursively,
@@ -4554,7 +4555,7 @@ void MainForm::linkProject()
       QCoreApplication::enter_loop();
       // This will be reached only after exitLoop() is called.
       delete procio;
-      procio=static_cast<KProcIO *>(NULL);
+      procio=static_cast<K3ProcIO *>(NULL);
       if (errorsCompilingFlag || stopCompilingFlag) return;
       // Now copy those pstarters actually requested.
       for (int target=0; target<numTargets; target++) {
@@ -4590,27 +4591,27 @@ void MainForm::linkProject()
     postBuild.replace("\"($V200FILE)\"","($V200FILE)",FALSE);
     postBuild.replace("\"($TI92FILE)\"","($TI92FILE)",FALSE);
     postBuild.replace("($TI89FILE)",
-      KProcess::quote(libopts.use_ti89?projectBaseName+(
+      K3Process::quote(libopts.use_ti89?projectBaseName+(
         settings.archive?".a":settings.flash_os?"-89.tib":settings.pack?".89y":
         settings.outputbin?".z89":".89z"
       ):""),FALSE);
     postBuild.replace("($TI89TIFILE)",
-      KProcess::quote(libopts.use_ti89?projectBaseName+(
+      K3Process::quote(libopts.use_ti89?projectBaseName+(
         settings.archive?".a":settings.flash_os?"-89ti.tib":settings.pack?".89y":
         settings.outputbin?".z89":".89z"
       ):""),FALSE);
     postBuild.replace("($TI92PLUSFILE)",
-      KProcess::quote(libopts.use_ti92p?projectBaseName+(
+      K3Process::quote(libopts.use_ti92p?projectBaseName+(
         settings.archive?".a":settings.flash_os?"-9x.tib":settings.pack?".9xy":
         settings.outputbin?".z9x":".9xz"
       ):""),FALSE);
     postBuild.replace("($V200FILE)",
-      KProcess::quote(libopts.use_v200?projectBaseName+(
+      K3Process::quote(libopts.use_v200?projectBaseName+(
         settings.archive?".a":settings.flash_os?"-v2.tib":settings.pack?".v2y":
         settings.outputbin?".zv2":".v2z"
       ):""),FALSE);
     postBuild.replace("($TI92FILE)",
-      KProcess::quote(settings.fargo?projectBaseName+(
+      K3Process::quote(settings.fargo?projectBaseName+(
         settings.outputbin?".p92":".92p"
       ):""),FALSE);
     int err;
@@ -4625,15 +4626,15 @@ void MainForm::linkProject()
     if (errorsCompilingFlag || stopCompilingFlag) return;
     // The QTextCodec has to be passed explicitly, or it will default to
     // ISO-8859-1 regardless of the locale, which is just broken.
-    procio=new KProcIO(QTextCodec::codecForLocale());
+    procio=new K3ProcIO(QTextCodec::codecForLocale());
     // Use MergedStderr instead of Stderr so the messages get ordered
     // properly.
-    procio->setComm(static_cast<KProcess::Communication>(
-      KProcess::Stdout|KProcess::MergedStderr));
+    procio->setComm(static_cast<K3Process::Communication>(
+      K3Process::Stdout|K3Process::MergedStderr));
     procio->setWorkingDirectory(projectDir);
     *procio<<args;
-    connect(procio,SIGNAL(processExited(KProcess*)),this,SLOT(procio_processExited()));
-    connect(procio,SIGNAL(readReady(KProcIO*)),this,SLOT(procio_readReady_recordOnly()));
+    connect(procio,SIGNAL(processExited(K3Process*)),this,SLOT(procio_processExited()));
+    connect(procio,SIGNAL(readReady(K3ProcIO*)),this,SLOT(procio_readReady_recordOnly()));
     procio->start();
     // We need to block here, but events still need to be handled. The most
     // effective way to do this is to enter the event loop recursively,
@@ -4641,7 +4642,7 @@ void MainForm::linkProject()
     QCoreApplication::enter_loop();
     // This will be reached only after exitLoop() is called.
     delete procio;
-    procio=static_cast<KProcIO *>(NULL);
+    procio=static_cast<K3ProcIO *>(NULL);
     if (errorsCompilingFlag || stopCompilingFlag) return;
   }
   // Delete object and/or assembly files.
@@ -5160,7 +5161,7 @@ void MainForm::toolsMenu_activated(int id)
 {
   if (id!=toolsMenu->idAt(0) && id!=toolsMenu->idAt(1)) {
     const Tool &tool=tools[id];
-    KProcess process(this);
+    K3Process process(this);
     int err;
     QStringList args=KShell::splitArgs(tool.commandLine,
                                        KShell::TildeExpand|KShell::AbortOnMeta,
@@ -5197,7 +5198,7 @@ void MainForm::toolsMenu_activated(int id)
       process << args;
     if (!tool.workingDirectory.isEmpty())
       process.setWorkingDirectory(tool.workingDirectory);
-    if (!process.start(KProcess::DontCare))
+    if (!process.start(K3Process::DontCare))
       KMessageBox::error(this,QString("Can't run \'%1\'.").arg(tool.commandLine));
   }
 }

+ 7 - 7
ktigcc/parsing.cpp

@@ -32,7 +32,7 @@
 #include <QEventLoop>
 #include <QDir>
 #include <QLinkedList>
-#include <kprocio.h>
+#include <k3procio.h>
 #include <kmessagebox.h>
 #include <unistd.h>
 
@@ -44,11 +44,11 @@ SourceFileFunctions getCFunctions(const QString &text)
   {
     // The QTextCodec has to be passed explicitly, or it will default to
     // ISO-8859-1 regardless of the locale, which is just broken.
-    KProcIO procio(QTextCodec::codecForLocale());
+    K3ProcIO procio(QTextCodec::codecForLocale());
     // Use MergedStderr instead of Stderr so the messages get ordered
     // properly.
-    procio.setComm(static_cast<KProcess::Communication>(
-      KProcess::Stdout|KProcess::MergedStderr));
+    procio.setComm(static_cast<K3Process::Communication>(
+      K3Process::Stdout|K3Process::MergedStderr));
     procio.setWorkingDirectory(tempdir);
     procio<<"ctags"<<"-f"<<"-"<<"-n"<<"-u"<<"-h"<<".h"<<"--language-force=C"
           <<"--C-kinds=pf"<<"--fields=k"<<"-I"<<"CALLBACK,__ATTR_TIOS__,"
@@ -178,11 +178,11 @@ CompletionInfo parseFileCompletion(const QString &fileText,
   {
     // The QTextCodec has to be passed explicitly, or it will default to
     // ISO-8859-1 regardless of the locale, which is just broken.
-    KProcIO procio(QTextCodec::codecForLocale());
+    K3ProcIO procio(QTextCodec::codecForLocale());
     // Use MergedStderr instead of Stderr so the messages get ordered
     // properly.
-    procio.setComm(static_cast<KProcess::Communication>(
-      KProcess::Stdout|KProcess::MergedStderr));
+    procio.setComm(static_cast<K3Process::Communication>(
+      K3Process::Stdout|K3Process::MergedStderr));
     procio.setWorkingDirectory(tempdir);
     procio<<"ctags"<<"-f"<<"-"<<"-n"<<"-u"<<"-h"<<".h"<<"--language-force=C"
           <<"--C-kinds=defgpstuvx"<<"--fields=kS"<<"-I"<<"CALLBACK,__ATTR_TIOS__,"

+ 22 - 39
ktigcc/preferences.cpp

@@ -475,13 +475,13 @@ static bool loadSyntaxPreference(Syn_SettingsForDoc &synprefs, const QString &gr
 {
   pconfig->setGroup(group+" Syntax Highlighting");
   synprefs.enabled=pconfig->readBoolEntry("Enabled",true);
-  synprefs.numberColor=pconfig->readColorEntry("Number Color");
+  synprefs.numberColor=pconfig->readEntry("Number Color",QColor());
   if (!synprefs.numberColor.isValid()) return FALSE;
-  synprefs.symbolColor=pconfig->readColorEntry("Symbol Color");
+  synprefs.symbolColor=pconfig->readEntry("Symbol Color",QColor());
   if (!synprefs.symbolColor.isValid()) return FALSE;
   unsigned numParenthesisColors=pconfig->readUnsignedNumEntry("Num Parenthesis Colors");
   for (unsigned i=0; i<numParenthesisColors; i++) {
-    QColor parenthesisColor=pconfig->readColorEntry(QString("Parenthesis Color %1").arg(i));
+    QColor parenthesisColor=pconfig->readEntry(QString("Parenthesis Color %1").arg(i),QColor());
     if (!parenthesisColor.isValid()) return FALSE;
     synprefs.parenthesisColors.append(parenthesisColor);
   }
@@ -498,7 +498,7 @@ static bool loadSyntaxPreference(Syn_SettingsForDoc &synprefs, const QString &gr
     customStyle.ignoreEndingAfter=ignoreEndingAfter.isEmpty()?QChar():ignoreEndingAfter[0];
     customStyle.switchable=pconfig->readBoolEntry(QString("Custom Style %1 Switchable").arg(i));
     customStyle.lineStartOnly=pconfig->readBoolEntry(QString("Custom Style %1 Line Start Only").arg(i));
-    customStyle.color=pconfig->readColorEntry(QString("Custom Style %1 Color").arg(i));
+    customStyle.color=pconfig->readEntry(QString("Custom Style %1 Color").arg(i),QColor());
     customStyle.style=pconfig->readUnsignedNumEntry(QString("Custom Style %1 Style").arg(i));
     synprefs.customStyles.append(customStyle);
   }
@@ -507,7 +507,7 @@ static bool loadSyntaxPreference(Syn_SettingsForDoc &synprefs, const QString &gr
     Syn_WordList wordList;
     wordList.name=pconfig->readEntry(QString("Word List %1 Name").arg(i),QString("Word List %1").arg(i));
     wordList.list=pconfig->readListEntry(QString("Word List %1 List").arg(i));
-    wordList.color=pconfig->readColorEntry(QString("Word List %1 Color").arg(i));
+    wordList.color=pconfig->readEntry(QString("Word List %1 Color").arg(i),QColor());
     wordList.style=pconfig->readUnsignedNumEntry(QString("Word List %1 Style").arg(i));
     wordList.caseSensitive=pconfig->readBoolEntry(QString("Word List %1 Case Sensitive").arg(i));
     synprefs.wordLists.append(wordList);
@@ -1633,79 +1633,64 @@ static void updateEditorPreferences(void)
     kateschema.writeEntry("Color Highlighted Line",preferences.bgColor);
   } else {
     kateschema.setGroup("kate - Normal");
-    color=QColor(255,255,255);
-    color=kateschema.readColorEntry("Color Background",&color);
+    color=kateschema.readEntry("Color Background",QColor(255,255,255));
     kateschema.setGroup("ktigcc - Normal");
     kateschema.writeEntry("Color Background",color);
     kateschema.setGroup("kate - Normal");
-    color=QColor(240,240,240);
-    color=kateschema.readColorEntry("Color Highlighted Line",&color);
+    color=kateschema.readEntry("Color Highlighted Line",QColor(240,240,240));
     kateschema.setGroup("ktigcc - Normal");
     kateschema.writeEntry("Color Highlighted Line",color);
   }
   kateschema.setGroup("kate - Normal");
-  color=QColor(255,255,153);
-  color=kateschema.readColorEntry("Color Highlighted Bracket",&color);
+  color=kateschema.readEntry("Color Highlighted Bracket",QColor(255,255,153));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color Highlighted Bracket",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(234,233,232);
-  color=kateschema.readColorEntry("Color Icon Bar",&color);
+  color=kateschema.readEntry("Color Icon Bar",QColor(234,233,232));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color Icon Bar",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(0,0,0);
-  color=kateschema.readColorEntry("Color Line Number",&color);
+  color=kateschema.readEntry("Color Line Number",QColor(0,0,0));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color Line Number",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(0,0,255);
-  color=kateschema.readColorEntry("Color MarkType1",&color);
+  color=kateschema.readEntry("Color MarkType1",QColor(0,0,255));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color MarkType1",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(255,0,0);
-  color=kateschema.readColorEntry("Color MarkType2",&color);
+  color=kateschema.readEntry("Color MarkType2",QColor(255,0,0));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color MarkType2",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(255,255,0);
-  color=kateschema.readColorEntry("Color MarkType3",&color);
+  color=kateschema.readEntry("Color MarkType3",QColor(255,255,0));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color MarkType3",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(255,0,255);
-  color=kateschema.readColorEntry("Color MarkType4",&color);
+  color=kateschema.readEntry("Color MarkType4",QColor(255,0,255));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color MarkType4",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(160,160,164);
-  color=kateschema.readColorEntry("Color MarkType5",&color);
+  color=kateschema.readEntry("Color MarkType5",QColor(160,160,164));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color MarkType5",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(0,255,0);
-  color=kateschema.readColorEntry("Color MarkType6",&color);
+  color=kateschema.readEntry("Color MarkType6",QColor(0,255,0));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color MarkType6",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(255,0,0);
-  color=kateschema.readColorEntry("Color MarkType7",&color);
+  color=kateschema.readEntry("Color MarkType7",QColor(255,0,0));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color MarkType7",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(76,89,166);
-  color=kateschema.readColorEntry("Color Selection",&color);
+  color=kateschema.readEntry("Color Selection",QColor(76,89,166));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color Selection",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(0,0,0);
-  color=kateschema.readColorEntry("Color Tab Marker",&color);
+  color=kateschema.readEntry("Color Tab Marker",QColor(0,0,0));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color Tab Marker",color);
   kateschema.setGroup("kate - Normal");
-  color=QColor(120,120,120);
-  color=kateschema.readColorEntry("Color Word Wrap Marker",&color);
+  color=kateschema.readEntry("Color Word Wrap Marker",QColor(120,120,120));
   kateschema.setGroup("ktigcc - Normal");
   kateschema.writeEntry("Color Word Wrap Marker",color);
   kateschema.writeEntry("Font",preferences.editorFont);
@@ -1753,10 +1738,8 @@ void loadPreferences(void)
   preferences.tabWidthC=pconfig->readUnsignedNumEntry("Tab Width C",2);
   preferences.tabWidthAsm=pconfig->readUnsignedNumEntry("Tab Width Asm",8);
   preferences.useBgColor=pconfig->readBoolEntry("Use Background Color",false);
-  QColor white(255,255,255);
-  preferences.bgColor=pconfig->readColorEntry("Background Color",&white);
-  QFont defaultFont("Monospace",10);
-  preferences.editorFont=pconfig->readFontEntry("Editor Font",&defaultFont);
+  preferences.bgColor=pconfig->readEntry("Background Color",QColor(255,255,255));
+  preferences.editorFont=pconfig->readEntry("Editor Font",QFont("Monospace",10));
   preferences.useCalcCharset=pconfig->readBoolEntry("Use Calc Charset",true);
   preferences.autoBlocks=pconfig->readBoolEntry("Auto Blocks",true);
   preferences.removeTrailingSpaces=pconfig->readBoolEntry("Remove Trailing Spaces",false);

+ 4 - 3
ktigcc/preferencesdlg.cpp

@@ -290,7 +290,8 @@ void Preferences::bgColorChange_clicked()
 void Preferences::editorFontChange_clicked()
 {
   QFont font=editorFont->font();
-  if (KFontDialog::getFont(font,TRUE,this)==KFontDialog::Accepted) {
+  if (KFontDialog::getFont(font,KFontChooser::FixedFontsOnly,this)
+      ==KFontDialog::Accepted) {
     editorFont->setFont(font);
     editorFont->setText(font.family());
   }
@@ -723,7 +724,7 @@ void Preferences::regenCompletionInfoButton_clicked()
     KUrl("kfiledialog:SystemInclude"),this,
     "Pick Help Sources System/Include Folder");
   if (dirName.isEmpty()) return;
-  setCursor(KCursor::waitCursor());
+  setCursor(Qt::WaitCursor);
   if (!parseHelpSources(this,dirName,sysHdrCompletion)) {
     setCursor(QCursor());
     return;
@@ -735,7 +736,7 @@ void Preferences::regenCompletionInfoButton_clicked()
   dirName=KFileDialog::getExistingDirectory(KUrl("kfiledialog:IncludeC"),this,
     "Pick C Header (include/c) Folder");
   if (dirName.isEmpty()) return;
-  setCursor(KCursor::waitCursor());
+  setCursor(Qt::WaitCursor);
   if (!parseSystemHeaders(this,dirName,sysHdrCompletion)) {
     setCursor(QCursor());
     return;

+ 2 - 2
ktigcc/projectoptions.cpp

@@ -27,7 +27,7 @@
 #include <Q3Accel>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
-#include <kprocess.h>
+#include <k3process.h>
 #include <kurl.h>
 #include "ktigcc.h"
 #include "tpr.h"
@@ -256,7 +256,7 @@ void ProjectOptions::browseButton_clicked()
     "application/x-executable application/x-executable-script",this,
     "Choose executable");
   if (!ret.isEmpty())
-    CallAfterBuilding->setText(KProcess::quote(ret)+" \"($TI89File)\" \"($TI92PlusFile)\" \"($V200File)\"");
+    CallAfterBuilding->setText(K3Process::quote(ret)+" \"($TI89File)\" \"($TI92PlusFile)\" \"($V200File)\"");
 }
 
 /*

+ 10 - 9
ktigcc/srcfilewin.cpp

@@ -82,8 +82,8 @@
 #include "completion.h"
 
 #if defined(Q_WS_X11)
-#include <kwin.h>
-#define ACTIVATE_WINDOW(winid) KWin::activateWindow(winid)
+#include <kwindowsystem.h>
+#define ACTIVATE_WINDOW(winid) KWindowSystem::activateWindow(winid)
 #elif defined(Q_WS_WIN)
 #include <windows.h>
 #define ACTIVATE_WINDOW(winid) SetForegroundWindow(winid)
@@ -173,7 +173,7 @@ void SourceFileWindow::initBase()
   windowIcon.addPixmap(largeIcon);
   setWindowIcon(windowIcon);
 #ifdef Q_WS_X11
-  KWin::setIcons(winId(),largeIcon,smallIcon);
+  KWindowSystem::setIcons(winId(),largeIcon,smallIcon);
 #endif
   sourceFiles.append(THIS);
   THIS->dirWatch=new KDirWatch(this);
@@ -706,7 +706,8 @@ void SourceFileWindow::findFind()
   else {
     // Never set hasSelection because finding in selection doesn't really make
     // sense with my non-modal find dialog setup.
-    THIS->kfinddialog=new KFindDialog(false,this,0,KFind::FromCursor,findHistory);
+    THIS->kfinddialog=new KFindDialog(this,KFind::FromCursor,findHistory);
+    THIS->kfinddialog->setModal(false);
     connect(THIS->kfinddialog, SIGNAL(okClicked()), this, SLOT(findFind_next()));
     connect(THIS->kfinddialog, SIGNAL(cancelClicked()), this, SLOT(findFind_stop()));
     THIS->kfinddialog->show();
@@ -804,11 +805,11 @@ void SourceFileWindow::findReplace()
       ACTIVATE_WINDOW(replaceNextDialog->winId());
     return;
   }
-  KReplaceDialog kreplacedialog(this,0,((CURRENT_VIEW&&CURRENT_VIEW->selection()
-                                         &&!CURRENT_VIEW->selectionRange().onSingleLine())?
-                                         KFind::SelectedText:0)|KFind::FromCursor,
-                                        findHistory,replacementHistory,
-                                        CURRENT_VIEW&&CURRENT_VIEW->selection());
+  KReplaceDialog kreplacedialog(this,((CURRENT_VIEW&&CURRENT_VIEW->selection()
+                                       &&!CURRENT_VIEW->selectionRange().onSingleLine())?
+                                       KFind::SelectedText:0)|KFind::FromCursor,
+                                      findHistory,replacementHistory,
+                                      CURRENT_VIEW&&CURRENT_VIEW->selection());
   if (kreplacedialog.exec()!=QDialog::Accepted)
     return;
   findHistory=kreplacedialog.findHistory();

+ 2 - 2
ktigcc/toolprops.cpp

@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <kurlrequester.h>
 #include <kfiledialog.h>
-#include <kprocess.h>
+#include <k3process.h>
 #include "ktigcc.h"
 
 void ToolProperties::init()
@@ -69,7 +69,7 @@ void ToolProperties::browseButton_clicked()
     "application/x-executable application/x-executable-script",this,
     "Choose executable");
   if (!ret.isEmpty())
-    commandLine->setText(KProcess::quote(ret));
+    commandLine->setText(K3Process::quote(ret));
 }
 
 /*