From 3923b641d28fd05ea3f129118d7379f15344f481 Mon Sep 17 00:00:00 2001 From: mlaurent Date: Tue, 7 Nov 2006 14:16:22 +0000 Subject: [PATCH] Fix compile with compilator != gcc git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeaccessibility@603003 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kbstateapplet/kbstate.cpp | 2 ++ kmag/kmag.cpp | 6 ++++++ kmag/kmagzoomview.cpp | 2 ++ kmouth/kmouth.cpp | 2 ++ kmouth/phrasebook/phrasebookdialog.cpp | 10 ++++++++++ ksayit/src/ksayit.cpp | 2 ++ 6 files changed, 24 insertions(+) diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 9333f7c7..38d8385b 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -536,7 +536,9 @@ void KbStateApplet::initMasks() { if (mask == 0) if (modifierKeys[i].keysym != 0) mask = XkbKeysymToModifiers (this->x11Display(), modifierKeys[i].keysym); +#ifdef __GNUC__ #warning "kde4: how to port it ?" +#endif #if 0 else if (strcmp(modifierKeys[i].name, "Win") == 0) mask = KKeyNative::modXWin(); diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index 7835b096..72fbde68 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -530,7 +530,9 @@ void KmagApp::saveZoomPixmap() if(!url.isLocalFile()) { // create a temp file.. save image to it.. copy over the n/w and then delete the temp file. KTemporaryFile tempFile; +#ifdef __GNUC__ #warning "kde4: port KImageIO::type \n"; +#endif if(!tempFile.open() || !m_zoomView->getPixmap().save(tempFile.fileName(),"png"/*, KImageIO::type(url.fileName()).latin1()*/)) { KMessageBox::error(0, i18n("Unable to save temporary file (before uploading to the network file you specified)."), i18n("Error Writing File")); @@ -545,7 +547,9 @@ void KmagApp::saveZoomPixmap() } } else { +#ifdef __GNUC__ #warning "kde4 : port KImageIO::type(...) \n"; +#endif if(!m_zoomView->getPixmap().save(url.path(), "png"/*KImageIO::type(url.fileName()).latin1()*/)) { KMessageBox::error(0, i18n("Unable to save file. Please check if you have permission to write to the directory."), i18n("Error Writing File")); @@ -678,7 +682,9 @@ void KmagApp::slotFileQuit() // the window and the application stay open. if(!w->close()) break; +#ifdef __GNUC__ #warning "kde4: now memberList() is constant => we can't remove some element!" +#endif //memberList()->removeRef(w); } } diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index 25e2e000..5912be73 100644 --- a/kmag/kmagzoomview.cpp +++ b/kmag/kmagzoomview.cpp @@ -261,7 +261,9 @@ void KMagZoomView::paintMouseCursor(QPaintDevice *dev, QPoint mousePos) case 1: // 1. Square around the pixel pz.setPen(Qt::white); +#ifdef __GNUC__ #warning "Port Qt4 pz.setRasterOp(Qt::XorROP);"; +#endif //pz.setRasterOp(Qt::XorROP); pz.drawRect(mousePos.x()-1, mousePos.y()-1, (int)m_zoom+2, (int)m_zoom+2); break; diff --git a/kmouth/kmouth.cpp b/kmouth/kmouth.cpp index 0544a257..c8e24f4c 100644 --- a/kmouth/kmouth.cpp +++ b/kmouth/kmouth.cpp @@ -378,7 +378,9 @@ void KMouthApp::slotFileQuit() w = memberList().at(i); if(!w->close()) break; +#ifdef __GNUC__ #warning "kde4: how remove it ?.???" +#endif //memberList()->removeRef(w); } } diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp index 7193d6a7..f9fb47d4 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/kmouth/phrasebook/phrasebookdialog.cpp @@ -479,7 +479,9 @@ void PhraseBookDialog::initStandardPhraseBooks () { parent = stack.pop(); for (; it2 != dirs.end(); ++it2) { stack.push (parent); +#ifdef __GNUC__ #warning "kde4: correct newparent objectname ?" +#endif KActionMenu *newParent = new KActionMenu (*it2,actionCollection(), "tmp_menu"); parent->addAction(newParent); if (parent == fileImportStandardBook) @@ -536,7 +538,9 @@ void PhraseBookDialog::selectionChanged () { buttonBox->lineEdit->setEnabled(true); buttonBox->shortcutLabel->setEnabled(true); QString shortcut = currentItem->text(1); +#ifdef __GNUC__ #warning "kde4 port it" +#endif //buttonBox->keyButton->setShortcut(currentItem->cut(), false); if (shortcut.isEmpty() || shortcut.isNull()) { buttonBox->noKey->setChecked (true); @@ -596,7 +600,9 @@ void PhraseBookDialog::slotNoKey() { PhraseTreeItem *currentItem = selectedItem (treeView); if (currentItem != 0) { currentItem->setCut (KShortcut(QString())); +#ifdef __GNUC__ #warning "kde4: port it" +#endif //buttonBox->keyButton->setShortcut(currentItem->cut(), false); } phrasebookChanged = true; @@ -620,7 +626,9 @@ void PhraseBookDialog::setShortcut( const KShortcut& cut ) { for (int i = 0; i < cut.count(); i++) { const QKeySequence& seq = cut.seq(i); //const KKey& key = seq.key(0); +#ifdef __GNUC__ #warning "kde 4 port it"; +#endif #if 0 if (key.modFlags() == 0 && key.sym() < 0x3000 && QChar(key.sym()).isLetterOrNumber()) @@ -697,7 +705,9 @@ void PhraseBookDialog::slotCut () { void PhraseBookDialog::slotCopy () { PhraseBook book; treeView->fillBook (&book, true); +#ifdef __GNUC__ #warning "kde4: port to QMimeData" +#endif QApplication::clipboard()->setData(new PhraseBookDrag(&book)); } diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp index 0099d97a..fb6f65cb 100644 --- a/ksayit/src/ksayit.cpp +++ b/ksayit/src/ksayit.cpp @@ -156,7 +156,9 @@ void KSayItApp::initActions() preferences = KStdAction::preferences(this, SLOT(slotPreferences()), actionCollection()); KStdAction::keyBindings(this, SLOT(slotEditKeys()), actionCollection()); KStdAction::configureToolbars(this, SLOT(slotConfigureToolbar()), actionCollection()); +#ifdef __GNUC__ #warning "KStdAction::showToolbar was deprecated" +#endif #if 0 KStdAction::showToolbar("mainToolBar", actionCollection()); #endif -- 2.11.4.GIT