[pkg-kde-commits] rev 2848 - trunk/packages/kdewebdev/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Jan 13 03:51:13 UTC 2006
Author: chrsmrtn
Date: 2006-01-13 03:51:11 +0000 (Fri, 13 Jan 2006)
New Revision: 2848
Added:
trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r497528.diff
Log:
kdewebdev branch update.
Added: trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r497528.diff
===================================================================
--- trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r497528.diff 2006-01-13 02:59:19 UTC (rev 2847)
+++ trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r497528.diff 2006-01-13 03:51:11 UTC (rev 2848)
@@ -0,0 +1,1152 @@
+#DPATCHLEVEL=0
+--- quanta/dialogs/dtepeditdlgs.ui (revision 490330)
++++ quanta/dialogs/dtepeditdlgs.ui (revision 497528)
+@@ -606,7 +606,7 @@
+ <string>Enable the second extra page</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first checkbox</string>
++ <string>See the tooltip and "What's This?" information for the first checkbox</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3">
+@@ -620,7 +620,7 @@
+ <string>Enable the third extra page</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first checkbox</string>
++ <string>See the tooltip and "What's This?" information for the first checkbox</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" row="9" column="0" rowspan="1" colspan="3">
+@@ -634,7 +634,7 @@
+ <string>Enable the fourth extra page</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first checkbox</string>
++ <string>See the tooltip and "What's This?" information for the first checkbox</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" row="12" column="0" rowspan="1" colspan="3">
+@@ -648,7 +648,7 @@
+ <string>Enable the fifth extra page</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first checkbox</string>
++ <string>See the tooltip and "What's This?" information for the first checkbox</string>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="1" column="2">
+@@ -692,7 +692,7 @@
+ <bool>false</bool>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="8" column="0">
+@@ -706,7 +706,7 @@
+ <string>Groups:</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="4" column="2">
+@@ -717,7 +717,7 @@
+ <bool>false</bool>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="10" column="0" rowspan="1" colspan="2">
+@@ -731,7 +731,7 @@
+ <string>Title:</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="4" column="0">
+@@ -745,7 +745,7 @@
+ <string>Title:</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="5" column="0">
+@@ -759,7 +759,7 @@
+ <string>Groups:</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="7" column="0">
+@@ -773,7 +773,7 @@
+ <string>Title:</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="11" column="0" rowspan="1" colspan="2">
+@@ -787,7 +787,7 @@
+ <string>Groups:</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="5" column="2">
+@@ -798,7 +798,7 @@
+ <bool>false</bool>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="13" column="0">
+@@ -812,7 +812,7 @@
+ <string>Title:</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="11" column="2">
+@@ -823,7 +823,7 @@
+ <bool>false</bool>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="14" column="0">
+@@ -837,7 +837,7 @@
+ <string>Groups:</string>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="7" column="1" rowspan="1" colspan="2">
+@@ -848,7 +848,7 @@
+ <bool>false</bool>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="8" column="1" rowspan="1" colspan="2">
+@@ -859,7 +859,7 @@
+ <bool>false</bool>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="14" column="2">
+@@ -870,7 +870,7 @@
+ <bool>false</bool>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ <widget class="KLineEdit" row="13" column="2">
+@@ -881,7 +881,7 @@
+ <bool>false</bool>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See the tooltip and what's this information for the first page fields</string>
++ <string>See the tooltip and "What's This?" information for the first page fields</string>
+ </property>
+ </widget>
+ </grid>
+--- quanta/dialogs/dtepeditdlg.cpp (revision 490330)
++++ quanta/dialogs/dtepeditdlg.cpp (revision 497528)
+@@ -58,11 +58,12 @@
+
+ void DTEPEditDlg::slotFamilyChanged(int family)
+ {
+- m_family = family;
+- if (m_family == 0)
++ if (family == 0 && m_family != 0)
+ tabWidget->insertTab(m_pagesWidget, i18n("&Pages"), 1);
+ else
++ if (family == 1)
+ tabWidget->removePage(m_pagesWidget);
++ m_family = family;
+ }
+
+ void DTEPEditDlg::init()
+--- quanta/dialogs/tagdialogs/tagimgdlg.cpp (revision 490330)
++++ quanta/dialogs/tagdialogs/tagimgdlg.cpp (revision 497528)
+@@ -3,7 +3,7 @@
+ -------------------
+ begin : Sat Nov 27 1999
+ copyright : (C) 1999 by Yacovlev Alexander & Dmitry Poplavsky
+- (C) 2002 Andras Mantia
++ (C) 2002, 2006 Andras Mantia
+ email : pdima at mail.univ.kiev.ua, amantia at kde.org
+ ***************************************************************************/
+
+@@ -22,7 +22,6 @@
+ //kde includes
+ #include <kapplication.h>
+ #include <klocale.h>
+-#include <kiconloader.h>
+ #include <kio/netaccess.h>
+ #include <kfiledialog.h>
+ #include <kurl.h>
+@@ -35,19 +34,16 @@
+ #include "tagimgdlg.h"
+ #include "tagimgdlg.moc"
+
+-static const char *align[] = { "", "left", "right", "top", "bottom", "middle",0};
+
+-TagImgDlg::TagImgDlg(QWidget *parent, const char *name)
++TagImgDlg::TagImgDlg(const DTDStruct *dtd, QWidget *parent, const char *name)
+ : QWidget(parent,name), TagWidget(parent,name)
+ {
++ m_dtd = dtd;
+ img = 0L;
+ isTmpFile = false;
+ setCaption(name);
+ initDialog();
+
+- buttonImgSource->setPixmap( SmallIcon("fileopen") );
+- buttonRecalcImgSize->setPixmap( SmallIcon("reload") );
+- comboAlign ->insertStrList(align);
+
+ connect( buttonImgSource, SIGNAL(clicked()), this, SLOT(slotFileSelect()) );
+ connect( buttonRecalcImgSize, SIGNAL(clicked()), this, SLOT(slotRecalcImgSize()) );
+@@ -82,7 +78,7 @@
+ widgetImg->slotSetImage(imgFileName);
+
+ img = new QImage(imgFileName);
+- if (!img->isNull())
++ if (!img->isNull() && lineWidth && lineHeight)
+ {
+ QString s;
+ s.setNum(img->width());
+@@ -95,7 +91,7 @@
+ /** recalculate image size */
+ void TagImgDlg::slotRecalcImgSize()
+ {
+- if (img) {
++ if (img && lineWidth && lineHeight) {
+ QString s;
+ s.setNum( img->width() );
+ lineWidth->setText( s );
+@@ -130,12 +126,18 @@
+
+ updateDict("src", lineImgSource );
+ updateDict("alt", lineAltText );
+- updateDict("width", lineWidth );
+- updateDict("height",lineHeight );
+- updateDict("hspace",lineHSpace );
+- updateDict("vspace",lineVSpace );
+- updateDict("align", comboAlign );
+- updateDict("border",spinBorder );
++ if (lineWidth)
++ updateDict("width", lineWidth );
++ if (lineHeight)
++ updateDict("height",lineHeight );
++ if (lineHSpace)
++ updateDict("hspace",lineHSpace );
++ if (lineVSpace)
++ updateDict("vspace",lineVSpace );
++ if (comboAlign)
++ updateDict("align", comboAlign );
++ if (spinBorder)
++ updateDict("border",spinBorder );
+ }
+
+ void TagImgDlg::writeAttributes( QDict<QString> *d )
+@@ -151,11 +153,18 @@
+ url = QExtFileInfo::toAbsolute(url, baseURL);
+ slotImageSet( url );
+ }
+- if (( t=d->find("alt") )) setValue(*t, lineAltText);
+- if (( t=d->find("width") )) setValue(*t, lineWidth);
+- if (( t=d->find("height") )) setValue(*t, lineHeight);
+- if (( t=d->find("hspace") )) setValue(*t, lineHSpace);
+- if (( t=d->find("vspace") )) setValue(*t, lineVSpace);
+- if (( t=d->find("align") )) setValue(*t, comboAlign);
+- if (( t=d->find("border") )) setValue(*t, spinBorder);
++ if ( (t=d->find("alt")) )
++ setValue(*t, lineAltText);
++ if ( (t=d->find("width")) && lineWidth )
++ setValue(*t, lineWidth);
++ if ( (t=d->find("height")) && lineHeight )
++ setValue(*t, lineHeight);
++ if ( (t=d->find("hspace")) && lineHSpace)
++ setValue(*t, lineHSpace);
++ if ( (t=d->find("vspace")) && lineVSpace )
++ setValue(*t, lineVSpace);
++ if ( (t=d->find("align")) && comboAlign )
++ setValue(*t, comboAlign);
++ if ( (t=d->find("border")) && spinBorder )
++ setValue(*t, spinBorder);
+ }
+--- quanta/dialogs/tagdialogs/tagimgdlg.h (revision 490330)
++++ quanta/dialogs/tagdialogs/tagimgdlg.h (revision 497528)
+@@ -3,7 +3,7 @@
+ -------------------
+ begin : Sat Nov 27 1999
+ copyright : (C) 1999 by Yacovlev Alexander & Dmitry Poplavsky
+- (C) 2002 Andras Mantia
++ (C) 2002, 2006 Andras Mantia
+ email : pdima at mail.univ.kiev.ua, amantia at kde.org
+ ***************************************************************************/
+
+@@ -28,6 +28,7 @@
+ //Generated area. DO NOT EDIT!!!(end)
+
+ #include "tagwidget.h"
++#include "qtag.h"
+
+ class PictureView;
+ class QSpinBox;
+@@ -40,7 +41,7 @@
+ class TagImgDlg : public QWidget, TagWidget {
+ Q_OBJECT
+ public:
+- TagImgDlg(QWidget *parent=0, const char *name=0);
++ TagImgDlg(const DTDStruct *dtd, QWidget *parent=0, const char *name=0);
+ ~TagImgDlg();
+
+ public:
+@@ -73,6 +74,7 @@
+ QImage *img;
+ QString imgFileName;
+ bool isTmpFile;
++ const DTDStruct *m_dtd;
+
+ public slots: // Public slots
+ /** Choose new image */
+--- quanta/dialogs/tagdialogs/tagimgdlgdata.cpp (revision 490330)
++++ quanta/dialogs/tagdialogs/tagimgdlgdata.cpp (revision 497528)
+@@ -6,10 +6,12 @@
+ DO NOT EDIT!!! This file will be automatically
+ regenerated by KDevelop. All changes will be lost.
+
++ (C) 2006 Andras Mantia
+ **********************************************************************/
+ #include <klocale.h>
+ #include <kurl.h>
+ #include <knumvalidator.h>
++#include <kiconloader.h>
+
+ #include <qlayout.h>
+ #include <qspinbox.h>
+@@ -32,40 +34,61 @@
+ buttonImgSource->setText(i18n("..."));
+ grid->addMultiCellWidget(buttonImgSource, 0, 0, 4, 4);
+
+- QLabel_4= new QLabel(this,"NoName");
+- QLabel_4->setText(i18n("Width:"));
+- grid->addMultiCellWidget(QLabel_4, 1, 1, 0, 0);
++ QTag *imgTag = m_dtd->tagsList->find("img");
+
+- lineWidth= new KLineEdit(this,"NoName");
+- lineWidth->setValidator( new KFloatValidator( lineWidth ) );
+- grid->addMultiCellWidget(lineWidth, 1, 1, 1, 1);
++ if (!imgTag)
++ return;
+
+- QLabel_5= new QLabel(this,"NoName");
+- QLabel_5->setText(i18n("Height:"));
+- grid->addMultiCellWidget(QLabel_5, 1, 1, 2, 2);
++ lineWidth = 0L;
++ if (imgTag->attribute("width"))
++ {
++ QLabel_4= new QLabel(this,"NoName");
++ QLabel_4->setText(i18n("Width:"));
++ grid->addMultiCellWidget(QLabel_4, 1, 1, 0, 0);
++
++ lineWidth= new KLineEdit(this,"NoName");
++ lineWidth->setValidator( new KFloatValidator( lineWidth ) );
++ grid->addMultiCellWidget(lineWidth, 1, 1, 1, 1);
++ }
+
+- lineHeight= new KLineEdit(this,"NoName");
+- lineHeight->setValidator( new KFloatValidator( lineHeight ) );
+- grid->addMultiCellWidget(lineHeight, 1, 1, 3, 3);
++ lineHeight = 0L;
++ if (imgTag->attribute("height"))
++ {
++ QLabel_5= new QLabel(this,"NoName");
++ QLabel_5->setText(i18n("Height:"));
++ grid->addMultiCellWidget(QLabel_5, 1, 1, 2, 2);
++
++ lineHeight= new KLineEdit(this,"NoName");
++ lineHeight->setValidator( new KFloatValidator( lineHeight ) );
++ grid->addMultiCellWidget(lineHeight, 1, 1, 3, 3);
++ }
+
+ buttonRecalcImgSize= new QPushButton(this,"NoName");
+ buttonRecalcImgSize->setText(i18n("..."));
+ grid->addMultiCellWidget(buttonRecalcImgSize, 1, 1, 4, 4);
+
+- QLabel_6= new QLabel(this,"NoName");
+- QLabel_6->setText(i18n("HSpace:"));
+- grid->addMultiCellWidget(QLabel_6, 2, 2, 0, 0);
++ lineHSpace = 0L;
++ if (imgTag->attribute("hspace"))
++ {
++ QLabel_6= new QLabel(this,"NoName");
++ QLabel_6->setText(i18n("HSpace:"));
++ grid->addMultiCellWidget(QLabel_6, 2, 2, 0, 0);
++
++ lineHSpace= new KLineEdit(this,"NoName");
++ grid->addMultiCellWidget(lineHSpace, 2, 2, 1, 1);
++ }
+
+- lineHSpace= new KLineEdit(this,"NoName");
+- grid->addMultiCellWidget(lineHSpace, 2, 2, 1, 1);
++ lineVSpace = 0L;
++ if (imgTag->attribute("vspace"))
++ {
++ QLabel_7= new QLabel(this,"NoName");
++ QLabel_7->setText(i18n("VSpace:"));
++ grid->addMultiCellWidget(QLabel_7, 2, 2, 2, 2);
++
++ lineVSpace= new KLineEdit(this,"NoName");
++ grid->addMultiCellWidget(lineVSpace, 2, 2, 3, 3);
++ }
+
+- QLabel_7= new QLabel(this,"NoName");
+- QLabel_7->setText(i18n("VSpace:"));
+- grid->addMultiCellWidget(QLabel_7, 2, 2, 2, 2);
+-
+- lineVSpace= new KLineEdit(this,"NoName");
+- grid->addMultiCellWidget(lineVSpace, 2, 2, 3, 3);
+-
+ QLabel_8= new QLabel(this,"NoName");
+ QLabel_8->setText(i18n("Alternate text:"));
+ grid->addMultiCellWidget(QLabel_8, 3, 3, 0, 0);
+@@ -73,22 +96,34 @@
+ lineAltText= new KLineEdit(this,"NoName");
+ grid->addMultiCellWidget(lineAltText, 3, 3, 1, 4);
+
+- QLabel_9= new QLabel(this,"NoName");
+- QLabel_9->setText(i18n("Border:"));
+- grid->addMultiCellWidget(QLabel_9, 4, 4, 0, 0);
++ spinBorder = 0L;
++ if (imgTag->attribute("border"))
++ {
++ QLabel_9= new QLabel(this,"NoName");
++ QLabel_9->setText(i18n("Border:"));
++ grid->addMultiCellWidget(QLabel_9, 4, 4, 0, 0);
++
++ spinBorder= new QSpinBox(this,"NoName");
++ spinBorder->setRange(0,20);
++ grid->addMultiCellWidget(spinBorder, 4, 4, 1, 1);
++ }
+
+- spinBorder= new QSpinBox(this,"NoName");
+- spinBorder->setRange(0,20);
+- grid->addMultiCellWidget(spinBorder, 4, 4, 1, 1);
++ comboAlign = 0L;
++ if (imgTag->attribute("align"))
++ {
++ QLabel_10= new QLabel(this,"NoName");
++ QLabel_10->setText(i18n("Align:"));
++ grid->addMultiCellWidget(QLabel_10, 4, 4, 2, 2);
++
++ comboAlign= new QComboBox(this,"NoName");
++ grid->addMultiCellWidget(comboAlign, 4, 4, 3, 4);
++ comboAlign->insertStringList(imgTag->attribute("align")->values);
++ }
+
+- QLabel_10= new QLabel(this,"NoName");
+- QLabel_10->setText(i18n("Align:"));
+- grid->addMultiCellWidget(QLabel_10, 4, 4, 2, 2);
+-
+- comboAlign= new QComboBox(this,"NoName");
+- grid->addMultiCellWidget(comboAlign, 4, 4, 3, 4);
+-
+ widgetImg= new PictureView(this);
+ grid->addMultiCellWidget(widgetImg, 5, 10, 0, 4);
+
++ buttonImgSource->setPixmap( SmallIcon("fileopen") );
++ buttonRecalcImgSize->setPixmap( SmallIcon("reload") );
++
+ }
+--- quanta/dialogs/tagdialogs/tagdialog.cpp (revision 490330)
++++ quanta/dialogs/tagdialogs/tagdialog.cpp (revision 497528)
+@@ -148,7 +148,7 @@
+ QDomDocument doc;
+ if (dtdTag->name().lower() == "img") //NOTE: HTML specific code!
+ {
+- mainDlg = new TagImgDlg( this);
++ mainDlg = new TagImgDlg(dtdTag->parentDTD, this);
+ ((TagImgDlg *)mainDlg)->writeAttributes( dict );
+ }
+ //read the tag file it is available
+--- quanta/components/debugger/gubed/gubedsettingss.ui (revision 490330)
++++ quanta/components/debugger/gubed/gubedsettingss.ui (revision 497528)
+@@ -326,7 +326,7 @@
+ <cstring>lineStartSession</cstring>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See 'Whats this" for available variables</string>
++ <string>See "What's This?" for available variables</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>%afn - Filename of the current script
+--- quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop (revision 490330)
++++ quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop (revision 497528)
+@@ -23,6 +23,7 @@
+ Comment[pt]='Plugin' de depuração DBGp, veja http://xdebug.org
+ Comment[pt_BR]='Plugin' de depuração DBGp, veja http://xdebug.org
+ Comment[ru]=Модуль для отладчика DBGp, http://xdebug.org
++Comment[sl]=Vstavek za razhoroščevanje DBGp, glej http://xdebug.org
+ Comment[sr]=DBGp прикључак, види http://xdebug.org
+ Comment[sr at Latn]=DBGp priključak, vidi http://xdebug.org
+ Comment[sv]=DBGp-insticksprogram för felsökning, se http://xdebug.org
+--- quanta/components/debugger/dbgp/dbgpsettingss.ui (revision 490330)
++++ quanta/components/debugger/dbgp/dbgpsettingss.ui (revision 497528)
+@@ -185,7 +185,7 @@
+ </sizepolicy>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See 'Whats this" for available variables</string>
++ <string>See "What's This?" for available variables</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>%afn - Filename of the current script
+@@ -354,7 +354,7 @@
+ </sizepolicy>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>See 'Whats this" for available variables</string>
++ <string>See "What's This?" for available variables</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string>Path to the profiler output
+--- quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp (revision 490330)
++++ quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp (revision 497528)
+@@ -910,7 +910,7 @@
+ {
+ if(attribute(setnode, "success") == "0")
+ {
+- debuggerInterface()->showStatus(i18n("Unable to set value of variable!"), true);
++ debuggerInterface()->showStatus(i18n("Unable to set value of variable."), true);
+ }
+ }
+
+--- quanta/ChangeLog (revision 490330)
++++ quanta/ChangeLog (revision 497528)
+@@ -1,11 +1,24 @@
+ This files contains the changes since Quanta 2.0 until the current 3.5.x series.
+
+-Version 3.5.1 (Release date: 29-11-2005; Started 04-03-2004):
++Version 3.5.1 (Release date: xx-01-2006; Started 30-29-2005):
+ - bugfixes:
+- - better handling of quotation marks when editing tags inside a script area
++ - better handling of quotation marks when editing tags inside a script area [#118693]
+ - don't show the file changed dialog after using save as and save again
+ - crash fixes in VPL [#118686]
++ - don't loose the comment closing character when formatting the XML code [#118453]
++ - insert valid img tag for XHTML documents [#118805]
++ - don't show the Pages tab in DTEP editing dialog more than once [#118840]
++ - set the DTEP of the document to the one selected in the Quick Start dialog [#118814]
++ - don't have two Close actions [#118448]
++ - don't show CSS pseudo-classes in autocompletion for the class attribute [#119373]
++ - avoid deadlock when loading the DTEPs
+
++ - improvements:
++ - add XHTML 1.1 and XHTML 1.0 Basic to the quickstart dialog [#118813]
++ - new DCOP interfaces/methods:
++ - WindowManagerIf::setDtep
++
++
+ Version 3.5 (Release date: 29-11-2005; Started 04-03-2004):
+ - bugfixes:
+ - don't crash when Smart Tag Insertion is enabled and some tags are inserted to an
+--- quanta/scripts/externalpreview.sh (revision 490330)
++++ quanta/scripts/externalpreview.sh (revision 497528)
+@@ -15,7 +15,7 @@
+ newTab=$3
+ if test $currentURL
+ then
+- if ! $browser -remote "openURL($currentURL, $newTab)"
++ if ! $browser -remote "openURL($currentURL,$newTab)"
+ then
+ $browser $currentURL
+ fi
+--- quanta/scripts/htmlquickstart.kmdr (revision 490330)
++++ quanta/scripts/htmlquickstart.kmdr (revision 497528)
+@@ -9,7 +9,7 @@
+ <x>0</x>
+ <y>0</y>
+ <width>473</width>
+- <height>550</height>
++ <height>577</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+@@ -160,7 +160,20 @@
+ echo '@CBPHPFooter'
+ echo '</body>'
+ echo '</html>'
+-</string>
++
++quanta=`dcop quanta- at parentPid`
++if [ -z "$quanta" ]; then
++ quanta=`dcop quanta`
++ if [ ! -z "$quanta" ]; then
++ quantadcop=quanta
++ fi
++else
++ quantadcop=quanta- at parentPid
++fi
++
++if [ ! -z "$quantadcop" ]; then
++ dcop $quantadcop WindowManagerIf setDtep "@DTEPselect.text" false
++fi</string>
+ </stringlist>
+ </property>
+ <grid>
+@@ -237,7 +250,7 @@
+ <cstring>CBPHPFooter</cstring>
+ </property>
+ <property name="text">
+- <string>PHP footer include:</string>
++ <string>&PHP footer include:</string>
+ </property>
+ <property name="associations" stdset="0">
+ <stringlist>
+@@ -269,7 +282,7 @@
+ <cstring>CBDTD</cstring>
+ </property>
+ <property name="text">
+- <string>Show DTD</string>
++ <string>Show &DTD</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+@@ -314,6 +327,16 @@
+ <string>XHTML 1.0 Frameset</string>
+ </property>
+ </item>
++ <item>
++ <property name="text">
++ <string>XHTML 1.0 Basic</string>
++ </property>
++ </item>
++ <item>
++ <property name="text">
++ <string>XHTML 1.1</string>
++ </property>
++ </item>
+ <property name="name">
+ <cstring>DTEPselect</cstring>
+ </property>
+@@ -340,6 +363,12 @@
+ xhtml1frameset='<?xml version="1.0" encoding="@ComboMetachar"?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">'
+
++xhtml1basic='<?xml version="1.0" encoding="@ComboMetachar"?>
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">'
++
++xhtml11='<?xml version="1.0" encoding="@ComboMetachar"?>
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'
++
+ ################################
+ # Set the DTD based on user selection
+
+@@ -362,6 +391,12 @@
+ "XHTML 1.0 Frameset" )
+ DTD="$xhtml1frameset"
+ ;;
++"XHTML 1.0 Basic" )
++ DTD="$xhtml1basic"
++;;
++"XHTML 1.1" )
++ DTD="$xhtml11"
++;;
+ * )
+ echo "No Match"
+ ;;
+@@ -375,7 +410,7 @@
+ <cstring>CBHead</cstring>
+ </property>
+ <property name="text">
+- <string>Head area</string>
++ <string>Head &area</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+@@ -403,7 +438,7 @@
+ <cstring>CBCVS</cstring>
+ </property>
+ <property name="text">
+- <string>CVS tag in comment</string>
++ <string>CVS tag &in comment</string>
+ </property>
+ <property name="associations" stdset="0">
+ <stringlist>
+@@ -443,7 +478,7 @@
+ <cstring>CBMetaAuthor</cstring>
+ </property>
+ <property name="text">
+- <string>Meta author:</string>
++ <string>&Meta author:</string>
+ </property>
+ <property name="associations" stdset="0">
+ <stringlist>
+@@ -473,7 +508,7 @@
+ <cstring>CBStyleArea</cstring>
+ </property>
+ <property name="text">
+- <string>Style area</string>
++ <string>St&yle area</string>
+ </property>
+ <property name="associations" stdset="0">
+ <stringlist>
+@@ -694,7 +729,7 @@
+ <cstring>CBBasedir</cstring>
+ </property>
+ <property name="text">
+- <string>Base directory:</string>
++ <string>&Base directory:</string>
+ </property>
+ <property name="associations" stdset="0">
+ <stringlist>
+@@ -709,7 +744,7 @@
+ <cstring>CBMetaQuanta</cstring>
+ </property>
+ <property name="text">
+- <string>Meta Quanta</string>
++ <string>Meta &Quanta</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+@@ -727,7 +762,7 @@
+ <cstring>CBMetaKeywords</cstring>
+ </property>
+ <property name="text">
+- <string>Meta keywords:</string>
++ <string>Meta &keywords:</string>
+ </property>
+ <property name="associations" stdset="0">
+ <stringlist>
+@@ -744,7 +779,7 @@
+ <cstring>CBStyle</cstring>
+ </property>
+ <property name="text">
+- <string>Linked style sheet:</string>
++ <string>Li&nked style sheet:</string>
+ </property>
+ <property name="associations" stdset="0">
+ <stringlist>
+@@ -793,7 +828,7 @@
+ <cstring>CBJavascript</cstring>
+ </property>
+ <property name="text">
+- <string>JavaScript area</string>
++ <string>&JavaScript area</string>
+ </property>
+ <property name="associations" stdset="0">
+ <stringlist>
+--- quanta/src/dtds.cpp (revision 490330)
++++ quanta/src/dtds.cpp (revision 497528)
+@@ -253,9 +253,10 @@
+ //quantaApp->slotEnableIdleTimer(idleTimerStatus);
+ emit enableIdleTimer(true);
+ QString tmpStr;
+- for ( KURL::List::Iterator it_f = files.begin(); it_f != files.end(); ++it_f )
++ KURL::List::ConstIterator end_f = files.constEnd();
++ for ( KURL::List::ConstIterator it_f = files.constBegin(); it_f != end_f; ++it_f )
+ {
+- tmpStr = (*it_f).fileName();
++ tmpStr = (*it_f).path(-1);
+ if (!tmpStr.isEmpty())
+ {
+ tmpStr.prepend(dirName);
+--- quanta/src/quanta.h (revision 490330)
++++ quanta/src/quanta.h (revision 497528)
+@@ -151,6 +151,12 @@
+ /** Return the list of opened URLs and their editor interface numbers*/
+ QStringList openedURLs() const;
+ QString saveCurrentFile();
++ /**
++ * Sets the DTEP for the current document.
++ * @param dtepName the name (nickname or full name) of the DTEP
++ * @param convert if true, converts the !DOCTYPE line to the new DTEP
++ */
++ void setDtep(const QString& dtepName, bool convert);
+ QStringList tagAreas(const QString& name, bool includeCoordinates, bool skipFoundContent) const;
+ QString documentFolderForURL(const QString &url);
+ QString urlWithPreviewPrefix(const QString &url);
+@@ -247,7 +253,6 @@
+ void slotFileSaveAll();
+ void slotFileReload(QuantaView *view = 0L);
+ void slotFileReloadAll();
+- void slotFileClose();
+ /** Close the document specified in the parameter if it's opened */
+ void slotFileClose(const KURL &url);
+ void slotFileCloseAll();
+--- quanta/src/dcopquanta.cpp (revision 490330)
++++ quanta/src/dcopquanta.cpp (revision 497528)
+@@ -31,6 +31,7 @@
+
+ QStringList DCOPQuanta::selectors(const QString& tag)
+ {
++ const QRegExp rx("\\.|\\#|\\:");
+ QStringList selectorList;
+ GroupElementMapList::Iterator it;
+ for ( it = globalGroupMap.begin(); it != globalGroupMap.end(); ++it )
+@@ -39,8 +40,11 @@
+ if (key.startsWith("Selectors|"))
+ {
+ QString selectorName = key.mid(10);
++ int index = selectorName.find(':');
++ if (index != -1)
++ selectorName = selectorName.mid(0, index);
+ QString tmpStr;
+- int index = selectorName.find(QRegExp("\\.|\\#|\\:"));
++ index = selectorName.find(rx);
+ if (index != -1)
+ {
+ tmpStr = selectorName.left(index).lower();
+@@ -50,7 +54,9 @@
+ }
+ if (tmpStr.isEmpty() || tag.lower() == tmpStr || tmpStr == "*")
+ {
+- selectorList << selectorName.mid(index + 1).replace('.',' ');
++ tmpStr = selectorName.mid(index + 1).replace('.',' ');
++ if (!tmpStr.isEmpty() && !selectorList.contains(tmpStr))
++ selectorList << tmpStr;
+ }
+ }
+ }
+--- quanta/src/quanta_init.cpp (revision 490330)
++++ quanta/src/quanta_init.cpp (revision 497528)
+@@ -726,7 +726,6 @@
+ //
+ KStdAction::openNew( m_quanta, SLOT( slotFileNew() ), ac);
+ KStdAction::open ( m_quanta, SLOT( slotFileOpen() ), ac, "file_open");
+- KStdAction::close ( m_quanta, SLOT( slotFileClose()), ac);
+ (void) new KAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), SLOT(slotCloseOtherTabs()), ac, "close_other_tabs");
+
+ m_quanta->fileRecent = KStdAction::openRecent(m_quanta, SLOT(slotFileOpenRecent(const KURL&)),
+--- quanta/src/document.cpp (revision 490330)
++++ quanta/src/document.cpp (revision 497528)
+@@ -448,8 +448,20 @@
+ if (s[i] == '"' && (i == 0 || s[i-1] != '\\'))
+ insideQuotes = !insideQuotes;
+ }
+- if (insideQuotes)
++ int eLine, eCol;
++ n->tag->endPos(eLine, eCol);
++ s = this->text(line + 1, col, eLine, eCol);
++ bool closeQuotationFound = false;
++ for (int i = 0 ; i < (int)s.length() - 1; i++)
+ {
++ if (s[i] == '"' && (i == 0 || s[i-1] != '\\'))
++ {
++ closeQuotationFound = true;
++ break;
++ }
++ }
++ if (insideQuotes && closeQuotationFound)
++ {
+ text.replace("\\\"", "\"");
+ text.replace("\"", "\\\"");
+ }
+--- quanta/src/quanta.cpp (revision 490330)
++++ quanta/src/quanta.cpp (revision 497528)
+@@ -638,11 +638,6 @@
+ //TODO: Implement it!
+ }
+
+-void QuantaApp::slotFileClose()
+-{
+- ViewManager::ref()->removeActiveView();
+-}
+-
+ void QuantaApp::slotFileClose(const KURL &url)
+ {
+ QuantaView *view = ViewManager::ref()->isOpened(url);
+@@ -868,9 +863,10 @@
+ imgTag += QuantaCommon::quoteAttributeValue(width);
+ imgTag += QuantaCommon::attrCase(" height=");
+ imgTag += QuantaCommon::quoteAttributeValue(height);
+- imgTag += QuantaCommon::attrCase(" border=");
+- imgTag += QuantaCommon::quoteAttributeValue(QString("%1").arg(0));
+- imgTag += ">";
++ if (w->currentDTD(true)->singleTagStyle == "xml")
++ imgTag += " />";
++ else
++ imgTag += ">";
+ w->insertTag(imgTag);
+ isImage = true;
+ }
+@@ -2998,6 +2994,43 @@
+ dlg.exec();
+ }
+
++void QuantaApp::setDtep(const QString& dtepName, bool convert)
++{
++ Document *w = ViewManager::ref()->activeDocument();
++ if (w)
++ {
++ QString dtep = DTDs::ref()->getDTDNameFromNickName(dtepName);
++ if (!DTDs::ref()->find(dtep))
++ return;
++ w->setDTDIdentifier(dtep);
++ const DTDStruct *dtd = DTDs::ref()->find(w->getDTDIdentifier());
++ if (convert && dtd->family == Xml)
++ {
++ Tag *tag = 0L;
++ w->findDTDName(&tag);
++ if (tag)
++ {
++ int bLine, bCol, eLine, eCol;
++ tag->beginPos(bLine,bCol);
++ tag->endPos(eLine,eCol);
++ w->editIf->removeText(bLine, bCol, eLine, eCol+1);
++ w->viewCursorIf->setCursorPositionReal((uint)bLine, (uint)bCol);
++ w->insertText("<!DOCTYPE" + dtd->doctypeStr +">");
++ delete tag;
++ } else
++ {
++ w->viewCursorIf->setCursorPositionReal(0,0);
++ w->insertText("<!DOCTYPE" + dtd->doctypeStr + ">\n");
++ }
++ }
++ slotLoadToolbarForDTD(w->getDTDIdentifier());
++ QuantaView *view = ViewManager::ref()->activeView();
++ if (view)
++ view->activated();
++ reparse(true);
++ }
++}
++
+ void QuantaApp::slotChangeDTD()
+ {
+ Document *w = ViewManager::ref()->activeDocument();
+@@ -3010,8 +3043,6 @@
+ int pos = -1;
+ int defaultIndex = 0;
+
+- Tag *tag = 0L;
+- w->findDTDName(&tag);
+ QString oldDtdName = w->getDTDIdentifier();
+ QString defaultDocType = Project::ref()->defaultDTD();
+ QStringList lst = DTDs::ref()->nickNameList(true);
+@@ -3036,32 +3067,8 @@
+ dtdWidget->adjustSize();
+ if (dlg.exec())
+ {
+- w->setDTDIdentifier(DTDs::ref()->getDTDNameFromNickName(dtdWidget->dtdCombo->currentText()));
+- const DTDStruct *dtd = DTDs::ref()->find(w->getDTDIdentifier());
+- if (dtdWidget->convertDTD->isChecked() && dtd->family == Xml)
+- {
+- if (tag)
+- {
+- int bLine, bCol, eLine, eCol;
+- tag->beginPos(bLine,bCol);
+- tag->endPos(eLine,eCol);
+- w->editIf->removeText(bLine, bCol, eLine, eCol+1);
+- w->viewCursorIf->setCursorPositionReal((uint)bLine, (uint)bCol);
+- w->insertText("<!DOCTYPE" + dtd->doctypeStr +">");
+- delete tag;
+- } else
+- {
+- w->viewCursorIf->setCursorPositionReal(0,0);
+- w->insertText("<!DOCTYPE" + dtd->doctypeStr + ">\n");
+- }
+- }
++ setDtep(dtdWidget->dtdCombo->currentText(), dtdWidget->convertDTD->isChecked());
+ }
+-
+- slotLoadToolbarForDTD(w->getDTDIdentifier());
+- QuantaView *view = ViewManager::ref()->activeView();
+- if (view)
+- view->activated();
+- reparse(true);
+ }
+ }
+
+--- quanta/src/dcopwindowmanagerif.h (revision 490330)
++++ quanta/src/dcopwindowmanagerif.h (revision 497528)
+@@ -34,6 +34,7 @@
+ virtual void newDebuggerPosition(const QString &file, int lineNumber) = 0;
+ virtual void openFile(const QString &file, int lineNumber, int columnNumber) = 0;
+ virtual QString saveCurrentFile() = 0;
++ virtual void setDtep(const QString& dtepName, bool convert) = 0;
+ virtual QString documentFolderForURL(const QString &url) = 0;
+ virtual QString urlWithPreviewPrefix(const QString &url) = 0;
+ virtual void addFileToProject(const QString &url) = 0;
+--- quanta/parts/kafka/htmldocumentproperties.cpp (revision 490330)
++++ quanta/parts/kafka/htmldocumentproperties.cpp (revision 497528)
+@@ -541,7 +541,7 @@
+ finalURL = url.url();
+ if (url.protocol() == view->document()->url().protocol())
+ finalURL.remove(0, url.protocol().length() + 1);
+- if(linkNode->tag->attributeValue("rel").lower() != "stylesheet");
++ if(linkNode->tag->attributeValue("rel").lower() != "stylesheet")
+ linkNode->tag->editAttribute("rel", "stylesheet");
+ linkNode->tag->editAttribute("href", finalURL);
+ linkNode->tag->setCleanStrBuilt(false);
+--- quanta/parts/kafka/wkafkapart.cpp (revision 490330)
++++ quanta/parts/kafka/wkafkapart.cpp (revision 497528)
+@@ -1081,7 +1081,12 @@
+ text = ">";
+ }
+ else
+- text = "<" + QuantaCommon::tagCase(node->tag->name) + ">";
++ {
++ if (node->tag->tagStr() == "-->")
++ text = "-->";
++ else
++ text = "<" + QuantaCommon::tagCase(node->tag->name) + ">";
++ }
+ bCol += text.length();
+ eCol = bCol - 1;
+ eLine = bLine;
+--- quanta/project/uploadprofiledlgs.ui (revision 490330)
++++ quanta/project/uploadprofiledlgs.ui (revision 497528)
+@@ -235,7 +235,7 @@
+ <bool>false</bool>
+ </property>
+ <property name="toolTip" stdset="0">
+- <string>Keep the password in a file. DANGEROUS! Read the What's This text.</string>
++ <string>Keep the password in a file. DANGEROUS! Read the "What's This?" text.</string>
+ </property>
+ <property name="whatsThis" stdset="0">
+ <string><qt>If you check this box, the password will be saved in the local Quanta configuration file, so every time you start Quanta and load this project, the password will be loaded and you don't have to enter it. Altough the local configuration file is readable only by you and the password
+--- quanta/project/teammembersdlg.cpp (revision 490330)
++++ quanta/project/teammembersdlg.cpp (revision 497528)
+@@ -76,7 +76,7 @@
+ } else
+ if (nickName.isEmpty())
+ {
+- KMessageBox::error(this, i18n("The nickname cannot be empty as it is used as an unique identifier."));
++ KMessageBox::error(this, i18n("The nickname cannot be empty as it is used as a unique identifier."));
+ addDlg.show();
+ } else
+ if (!checkDuplicates(0L, name, nickName, email, role, task, subProject))
+@@ -146,7 +146,7 @@
+ } else
+ if (nickName.isEmpty())
+ {
+- KMessageBox::error(this, i18n("The nickname cannot be empty as it is used as an unique identifier."));
++ KMessageBox::error(this, i18n("The nickname cannot be empty as it is used as a unique identifier."));
+ editDlg.show();
+ } else
+ if (!checkDuplicates(item, name, nickName, email, role, task, subProject))
+--- quanta/data/config/quanta_preview_config.desktop (revision 490330)
++++ quanta/data/config/quanta_preview_config.desktop (revision 497528)
+@@ -8,7 +8,7 @@
+ Name[ca]=Configura la part del fullejador KHTML
+ Name[cs]=Nastavení KHTML Part
+ Name[da]=Indstil KHTML browser-part
+-Name[de]=Einrichten der KHTML-Browserkomponente
++Name[de]=Einrichten der KHTML-Browserkomponente
+ Name[el]=Ρύθμιση του KHTML περιηγητή
+ Name[es]=Configurara la parte del navegador KHTML
+ Name[et]=KHTML brauseri komponendi seadistamine
+--- quanta/data/dtep/xhtml-basic/description.rc (revision 490330)
++++ quanta/data/dtep/xhtml-basic/description.rc (revision 497528)
+@@ -1,6 +1,6 @@
+ [General]
+ Name = -//W3C//DTD XHTML Basic 1.0//EN
+-NickName = XHTML Basic 1.0
++NickName = XHTML 1.0 Basic
+ URL = http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd
+ DoctypeString = html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"
+ DefaultExtension = html
+--- quanta/treeviews/basetreeview.cpp (revision 490330)
++++ quanta/treeviews/basetreeview.cpp (revision 497528)
+@@ -1212,7 +1212,7 @@
+ KTempFile *tempFile = new KTempFile(tmpDir);
+ tempFile->setAutoDelete(true);
+ tempFile->close();
+- if (QuantaNetAccess::copy(KURL::fromPathOrURL(tempFile->name()), url, this));
++ if (QuantaNetAccess::copy(KURL::fromPathOrURL(tempFile->name()), url, this))
+ {
+ emit openFile(url);
+ }
+--- lib/qextfileinfo.h (revision 490330)
++++ lib/qextfileinfo.h (revision 497528)
+@@ -72,6 +72,7 @@
+ bool overwrite, bool resume, QWidget* window);
+ KURL::List allFilesInternal(const KURL& startURL, const QString& mask, QWidget *window);
+ QDict<KFileItem> allFilesDetailedInternal(const KURL& startURL, const QString& mask, QWidget *window);
++ KURL::List allLocalFiles(const QString& startPath, const QString& mask);
+
+ bool bJobOK;
+ static QString lastErrorMsg;
+--- lib/qextfileinfo.cpp (revision 490330)
++++ lib/qextfileinfo.cpp (revision 497528)
+@@ -132,6 +132,7 @@
+ return internalFileInfo.allFilesDetailedInternal(path, mask, window);
+ }
+
++
+ bool QExtFileInfo::createDir(const KURL& path, QWidget *window)
+ {
+ int i = 0;
+@@ -225,6 +226,9 @@
+ /** No descriptions */
+ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const QString& mask, QWidget *window)
+ {
++ if (startURL.isLocalFile())
++ return allLocalFiles(startURL.path(-1), mask);
++
+ dirListItems.clear();
+ if (internalExists(startURL, window))
+ {
+@@ -295,7 +299,27 @@
+ return detailedDirListItems;
+ }
+
++KURL::List QExtFileInfo::allLocalFiles(const QString& startPath, const QString& mask)
++{
++ KURL::List list;
++ QDir d(startPath, mask);
++ QStringList l = d.entryList();
++ QStringList::ConstIterator end = l.constEnd();
++ for (QStringList::ConstIterator it = l.constBegin(); it != end; ++it)
++ {
++ list.append(KURL::fromPathOrURL(startPath + "/" + (*it)));
++ }
++ l = d.entryList("*", QDir::Dirs);
++ end = l.constEnd();
++ for (QStringList::ConstIterator it = l.constBegin(); it != end; ++it)
++ {
++ if ((*it) != "." && (*it) != "..")
++ list += allLocalFiles(startPath + "/" + (*it), mask);
++ }
++ return list;
++}
+
++
+ //Some hackery from KIO::NetAccess as they do not do exactly what we want
+ /* return true if the url exists*/
+ bool QExtFileInfo::internalExists(const KURL& url, QWidget *window)
More information about the pkg-kde-commits
mailing list