Hello community, here is the log from the commit of package kdewebdev4 checked in at Fri Nov 2 01:30:15 CET 2007. -------- --- KDE/kdewebdev4/kdewebdev4.changes 2007-10-02 16:06:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdewebdev4/kdewebdev4.changes 2007-11-01 13:06:19.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 1 13:06:19 CET 2007 - dmueller@suse.de + +- update to 3.95.0.svn731649 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdewebdev4.spec ++++++ --- /var/tmp/diff_new_pack.Rok477/_old 2007-11-02 01:29:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Rok477/_new 2007-11-02 01:29:53.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdewebdev4 (Version 3.94.0.svn725623) +# spec file for package kdewebdev4 (Version 3.95.0.svn731649) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,7 +19,7 @@ Group: System/GUI/KDE Summary: kdewebdev base package Url: http://quanta.sf.net -Version: 3.94.0.svn725623 +Version: 3.95.0.svn731649 Release: 1 Source0: kdewebdev.tar.bz2 Source1: _upstream @@ -316,6 +316,8 @@ %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README %changelog +* Thu Nov 01 2007 - dmueller@suse.de +- update to 3.95.0.svn731649 * Tue Oct 02 2007 - stbinner@suse.de - update to 3.93.0.svn720129 * Wed Sep 26 2007 - stbinner@suse.de ++++++ kdewebdev.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/cmake/modules/FindLibTidy.cmake new/kdewebdev/cmake/modules/FindLibTidy.cmake --- old/kdewebdev/cmake/modules/FindLibTidy.cmake 2007-08-07 22:28:57.000000000 +0200 +++ new/kdewebdev/cmake/modules/FindLibTidy.cmake 2007-10-31 18:45:58.000000000 +0100 @@ -55,6 +55,8 @@ else (LIBTIDY_FOUND) if (LibTidy_FIND_REQUIRED) message(FATAL_ERROR "Could NOT find LIBTIDY") + else (LibTidy_FIND_REQUIRED) + message(STATUS "Could NOT find LIBTIDY") endif (LibTidy_FIND_REQUIRED) endif (LIBTIDY_FOUND) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/CMakeLists.txt new/kdewebdev/CMakeLists.txt --- old/kdewebdev/CMakeLists.txt 2007-06-07 15:16:57.000000000 +0200 +++ new/kdewebdev/CMakeLists.txt 2007-10-31 18:47:58.000000000 +0100 @@ -6,12 +6,14 @@ include (KDE4Defaults) include (MacroLibrary) include (MacroOptionalAddSubdirectory) -include (FindKDevPlatform) +include (FindKDevPlatform OPTIONAL) include (ConfigureChecks.cmake) find_package(LibXml2 REQUIRED) find_package(LibXslt REQUIRED) + macro_optional_find_package(LibTidy) +macro_bool_to_01(LIBTIDY_FOUND HAVE_LIBTIDY) add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) add_definitions( ${QT_QTDBUS_DEFINITIONS} ${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) @@ -21,10 +23,7 @@ include_directories( ${KDEWIN32_INCLUDES} ) endif(WIN32) -if(LIBTIDY_FOUND) - macro_optional_add_subdirectory(klinkstatus) -endif(LIBTIDY_FOUND) - +macro_optional_add_subdirectory(klinkstatus) macro_optional_add_subdirectory(kfilereplace) macro_optional_add_subdirectory(kxsldbg) macro_optional_add_subdirectory(kimagemapeditor) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kfilereplace/kfilereplacepart.cpp new/kdewebdev/kfilereplace/kfilereplacepart.cpp --- old/kdewebdev/kfilereplace/kfilereplacepart.cpp 2007-10-05 11:14:03.000000000 +0200 +++ new/kdewebdev/kfilereplace/kfilereplacepart.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -831,7 +831,7 @@ { KConfigGroup cg( m_config,"Directories"); #if KDE_IS_VERSION(3,1,3) - QString locationsEntryList = cg.readPathEntry(rcDirectoriesList); + QString locationsEntryList = cg.readPathEntry(rcDirectoriesList, QString()); #else QString locationsEntryList = cg.readEntry(rcDirectoriesList); #endif @@ -846,7 +846,7 @@ { KConfigGroup cg( m_config,"Filters"); #if KDE_IS_VERSION(3,1,3) - QString filtersEntryList = cg.readPathEntry(rcFiltersList); + QString filtersEntryList = cg.readPathEntry(rcFiltersList, QString()); #else QString filtersEntryList = cg.readEntry(rcFiltersList); #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kfilereplace/kfilereplacepart.desktop new/kdewebdev/kfilereplace/kfilereplacepart.desktop --- old/kdewebdev/kfilereplace/kfilereplacepart.desktop 2007-09-27 11:36:06.000000000 +0200 +++ new/kdewebdev/kfilereplace/kfilereplacepart.desktop 2007-10-20 08:46:52.000000000 +0200 @@ -69,7 +69,7 @@ GenericName[is]=Texta útskiptingarsýn GenericName[it]=Vista di sostituzione file GenericName[ja]=ファイル置換ビュー -GenericName[lt]=Keitimų bylose vaizdas +GenericName[lt]=Keitimų failuose vaizdas GenericName[ms]=Paparan Ganti Fail GenericName[nds]=Datei-Utwesselansicht GenericName[ne]=फाइल बदल्ने दृश्य diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kfilereplace/koptionsdlg.cpp new/kdewebdev/kfilereplace/koptionsdlg.cpp --- old/kdewebdev/kfilereplace/koptionsdlg.cpp 2007-10-06 06:35:35.000000000 +0200 +++ new/kdewebdev/kfilereplace/koptionsdlg.cpp 2007-10-24 14:42:24.000000000 +0200 @@ -105,19 +105,17 @@ void KOptionsDlg::slotChbConfirmStrings(bool b) { - KConfigGroup grp(m_config, m_config->group()); + KConfigGroup grp(m_config, "Notification Messages"); if(b) { m_chbShowConfirmDialog->setEnabled(true); m_chbShowConfirmDialog->setChecked(true); - m_config->setGroup("Notification Messages"); grp.writeEntry(rcDontAskAgain,"no"); } else { m_chbShowConfirmDialog->setEnabled(false); m_chbShowConfirmDialog->setChecked(false); - m_config->setGroup("Notification Messages"); grp.writeEntry(rcDontAskAgain,"yes"); } } @@ -125,7 +123,6 @@ void KOptionsDlg::slotChbShowConfirmDialog(bool b) { KConfigGroup grp(m_config, "Notification Messages"); - m_config->setGroup("Notification Messages"); if(b) { grp.writeEntry(rcDontAskAgain,"no"); @@ -141,7 +138,6 @@ { m_config->sync(); KConfigGroup grp(m_config, "Notification Messages"); - m_config->setGroup("Notification Messages"); m_option->m_notifyOnErrors = grp.readEntry(rcNotifyOnErrors, true); QString dontAskAgain = grp.readEntry(rcDontAskAgain, QString("no")); @@ -216,7 +212,6 @@ m_option->m_notifyOnErrors = m_chbNotifyOnErrors->isChecked(); KConfigGroup grp(m_config, "Notification Messages"); - m_config->setGroup("Notification Messages"); grp.writeEntry(rcNotifyOnErrors, m_option->m_notifyOnErrors); m_config->sync(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/CMakeLists.txt new/kdewebdev/kimagemapeditor/CMakeLists.txt --- old/kdewebdev/kimagemapeditor/CMakeLists.txt 2007-07-29 14:46:59.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/CMakeLists.txt 2007-10-24 10:00:41.000000000 +0200 @@ -25,7 +25,7 @@ set_target_properties(kimagemapeditor_bin PROPERTIES OUTPUT_NAME kimagemapeditor) -target_link_libraries(kimagemapeditor_bin ${KDE4_KHTML_LIBS} ) +target_link_libraries(kimagemapeditor_bin ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ) install(TARGETS kimagemapeditor_bin DESTINATION ${BIN_INSTALL_DIR} ) @@ -39,7 +39,7 @@ -target_link_libraries(kimagemapeditor ${KDE4_KHTML_LIBS} ) +target_link_libraries(kimagemapeditor ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ) install(TARGETS kimagemapeditor DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kimagemapeditor/kimagemapeditor.cpp new/kdewebdev/kimagemapeditor/kimagemapeditor.cpp --- old/kdewebdev/kimagemapeditor/kimagemapeditor.cpp 2007-10-05 11:14:03.000000000 +0200 +++ new/kdewebdev/kimagemapeditor/kimagemapeditor.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -401,9 +401,9 @@ } void KImageMapEditor::openLastURL(const KConfigGroup & config) { - KUrl lastURL ( config.readPathEntry("lastopenurl") ); + KUrl lastURL ( config.readPathEntry("lastopenurl", QString()) ); QString lastMap = config.readEntry("lastactivemap"); - QString lastImage = config.readPathEntry("lastactiveimage"); + QString lastImage = config.readPathEntry("lastactiveimage", QString()); // kDebug() << "loading from group : " << config.group(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/actionmanager.cpp new/kdewebdev/klinkstatus/src/actionmanager.cpp --- old/kdewebdev/klinkstatus/src/actionmanager.cpp 2007-10-10 15:45:27.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/actionmanager.cpp 2007-11-01 02:52:15.000000000 +0100 @@ -107,7 +107,7 @@ action = d->actionCollection->addAction( "close_tab" ); action->setText(i18n("Close Session")); - action->setIcon(KIcon("tab-remove") ); + action->setIcon(KIcon("tab-close") ); action->setShortcuts(KStandardShortcut::shortcut(KStandardShortcut::Close)); connect(action, SIGNAL(triggered(bool) ), d->part, SLOT(slotClose())); action->setEnabled(false); @@ -155,13 +155,13 @@ // *************** View menu ********************* // this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget - KToggleAction *toggle_action = new KToggleAction(KIcon("goto-page"), i18n("&Follow last Link checked"), this); + KToggleAction *toggle_action = new KToggleAction(KIcon("go-jump"), i18n("&Follow last Link checked"), this); toggle_action->setToolTip("Follow last Link checked (slower)"); actionCollection()->addAction("follow_last_link_checked", toggle_action ); connect(toggle_action, SIGNAL(triggered(bool)), d->tabWidgetSession, SLOT(slotFollowLastLinkChecked())); toggle_action->setShortcut(KShortcut("Ctrl+f")); toggle_action->setChecked(KLSConfig::followLastLinkChecked()); - KGuiItem item(i18n("&Do not follow last Link checked"), "goto-page", "Do not follow last Link checked (faster)"); + KGuiItem item(i18n("&Do not follow last Link checked"), "go-jump", "Do not follow last Link checked (faster)"); toggle_action->setCheckedState(item); // this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget @@ -272,7 +272,7 @@ // *************** Toolbar ********************* - d->gotoViewAction = new KToolBarPopupAction(KIcon("file-import"), "", this); + d->gotoViewAction = new KToolBarPopupAction(KIcon("view-choose"), "", this); actionCollection()->addAction("next_view_list", d->gotoViewAction); // action->setShortcuts(KStandardShortcut::shortcut(KStandardShortcut::Back)); d->gotoViewAction->setToolTip("Change View"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/CMakeLists.txt new/kdewebdev/klinkstatus/src/CMakeLists.txt --- old/kdewebdev/klinkstatus/src/CMakeLists.txt 2007-09-03 18:23:16.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/CMakeLists.txt 2007-11-01 00:43:21.000000000 +0100 @@ -22,10 +22,6 @@ ${CMAKE_SOURCE_DIR}/klinkstatus/src/engine/interfaces/isearchmanager.cpp ) -set(libtidy_SRCS - ${CMAKE_SOURCE_DIR}/klinkstatus/src/tidy/markupvalidator.cpp -) - set(libui_SRCS ${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/documentrootdialog.cpp ${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/klshistorycombo.cpp @@ -49,12 +45,14 @@ ${CMAKE_BINARY_DIR}/klinkstatus/src ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} - ${LIBTIDY_INCLUDE_DIR} ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/threadweaver ${QT_INCLUDES} ) +if(LIBTIDY_FOUND) + include_directories(${LIBTIDY_INCLUDE_DIR}) +endif(LIBTIDY_FOUND) ########### next target ############### @@ -62,7 +60,6 @@ ${libutils_SRCS} ${libparser_SRCS} ${libengine_SRCS} - ${libtidy_SRCS} ${libuisettings_SRCS} ${libui_SRCS} global.cpp @@ -71,6 +68,11 @@ klsfactory.cpp ) +if(LIBTIDY_FOUND) + set(libtidy_SRCS ${CMAKE_SOURCE_DIR}/klinkstatus/src/tidy/markupvalidator.cpp) + set(klinkstatuspart_PART_SRCS ${klinkstatuspart_PART_SRCS} ${libtidy_SRCS}) +endif(LIBTIDY_FOUND) + kde4_add_ui_files(klinkstatuspart_PART_SRCS ${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/sessionwidgetbase.ui ${CMAKE_SOURCE_DIR}/klinkstatus/src/ui/unreferreddocumentswidget.ui @@ -92,7 +94,6 @@ target_link_libraries(klinkstatuspart ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} - ${LIBTIDY_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KIO_LIBS} @@ -100,6 +101,11 @@ ${KDE4_THREADWEAVER_LIBRARY} ) +if(LIBTIDY_FOUND) + target_link_libraries(klinkstatuspart ${LIBTIDY_LIBRARIES}) +endif(LIBTIDY_FOUND) + + install(TARGETS klinkstatuspart DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES engine/interfaces/org.kdewebdev.klinkstatus.ISearchManager.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/engine/interfaces/isearchmanager.cpp new/kdewebdev/klinkstatus/src/engine/interfaces/isearchmanager.cpp --- old/kdewebdev/klinkstatus/src/engine/interfaces/isearchmanager.cpp 2007-05-11 12:08:18.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/engine/interfaces/isearchmanager.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -58,7 +58,7 @@ void ISearchManager::initSearchManager(SearchManager* searchManager, QString const& optionsFilePath) { - KConfig config(optionsFilePath, KConfig::OnlyLocal); + KConfig config(optionsFilePath, KConfig::SimpleConfig); KConfigGroup group = config.group(QString()); KUrl url(group.readEntry("URL")); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/engine/linkstatus.h new/kdewebdev/klinkstatus/src/engine/linkstatus.h --- old/kdewebdev/klinkstatus/src/engine/linkstatus.h 2007-10-10 14:08:22.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/engine/linkstatus.h 2007-10-31 18:44:33.000000000 +0100 @@ -30,7 +30,9 @@ class QDomElement; #include "parser/http.h" +#ifdef HAVE_LIBTIDY #include "tidy/markupvalidator.h" +#endif class Node; class TreeView; class TreeViewItem; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/engine/linkstatushelper.cpp new/kdewebdev/klinkstatus/src/engine/linkstatushelper.cpp --- old/kdewebdev/klinkstatus/src/engine/linkstatushelper.cpp 2007-04-26 18:38:56.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/engine/linkstatushelper.cpp 2007-11-01 02:52:15.000000000 +0100 @@ -22,7 +22,7 @@ #include <kcharsets.h> -#include <qdom.h> +#include <QDomElement> #include <QSet> @@ -203,10 +203,12 @@ void LinkStatusHelper::validateMarkup(LinkStatus* linkstatus) { +#ifdef HAVE_LIBTIDY Tidy::MarkupValidator markup_validator(linkstatus->absoluteUrl(), linkstatus->docHtml()); markup_validator.validate(); (linkstatus->tidy_info_).has_errors = markup_validator.hasErrors(); (linkstatus->tidy_info_).has_warnings = markup_validator.hasWarnings(); // tidy_messages_ = markup_validator.messages(); +#endif } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/global.cpp new/kdewebdev/klinkstatus/src/global.cpp --- old/kdewebdev/klinkstatus/src/global.cpp 2007-08-27 20:29:15.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/global.cpp 2007-10-31 16:32:57.000000000 +0100 @@ -26,7 +26,6 @@ #include <kdebug.h> #include <kapplication.h> -#include <k3staticdeleter.h> #include <kurl.h> #include <KStatusBar> #include <kparts/statusbarextension.h> @@ -35,42 +34,49 @@ #include <sys/types.h> #include <unistd.h> +class GlobalPrivate : public QObject +{ + Q_OBJECT +public: + GlobalPrivate(); + + void setKLinkStatusPart(ReadOnlyPart* part); + KStatusBar* statusBar() const; +// static ReadOnlyPart* getKLinkStatusPart(); + +// static StatusBarExtension* getStatusBarExtension(); -Global* Global::m_self_ = 0; -ReadOnlyPart* Global::m_klinkStatusPart = 0; -StatusBarExtension* Global::m_statusBarExtension = 0; + void setStatusBarText(QString const& text, bool permanent = false); + void addStatusBarPermanentItem(QWidget* widget); -static K3StaticDeleter<Global> staticDeleter; +private slots: + void slotRemoveStatusBarLabel(); + void slotStatusBarTimeout(); + +private: + static ReadOnlyPart* m_klinkStatusPart; + static StatusBarExtension* m_statusBarExtension; + QLabel* m_statusBarLabel; + // This timer is a workaround for cleaning the temporary messages of tree items (statusTip) + // which sometimes don't get hidden + QTimer m_statusBarTimer; +}; +ReadOnlyPart* GlobalPrivate::m_klinkStatusPart = 0; +StatusBarExtension* GlobalPrivate::m_statusBarExtension = 0; -Global* Global::self() -{ - if (!m_self_) - { - staticDeleter.setObject(m_self_, new Global()); - } +K_GLOBAL_STATIC(GlobalPrivate, global_instance) - return m_self_; -} - -Global::Global(QObject *parent) - : QObject(parent), m_statusBarLabel(0) +GlobalPrivate::GlobalPrivate() + : QObject(0), m_statusBarLabel(0) { - m_self_ = this; - connect(&m_statusBarTimer, SIGNAL(timeout()), this, SLOT(slotStatusBarTimeout())); m_statusBarTimer.start(1500); } -Global::~Global() -{ - if(m_self_ == this) - staticDeleter.setObject(m_self_, 0, false); -} - -void Global::setKLinkStatusPart(ReadOnlyPart* part) +void GlobalPrivate::setKLinkStatusPart(ReadOnlyPart* part) { m_klinkStatusPart = part; @@ -80,7 +86,13 @@ m_statusBarLabel = new QLabel(statusBar()); } -KStatusBar* Global::statusBar() const + +void Global::setKLinkStatusPart(ReadOnlyPart* part) +{ + global_instance->setKLinkStatusPart(part); +} + +KStatusBar* GlobalPrivate::statusBar() const { if(!m_statusBarExtension) return 0; @@ -88,7 +100,13 @@ return m_statusBarExtension->statusBar(); } -void Global::setStatusBarText(QString const& text, bool permanent) + +KStatusBar* Global::statusBar() +{ + return global_instance->statusBar(); +} + +void GlobalPrivate::setStatusBarText(QString const& text, bool permanent) { if(!m_statusBarExtension) return; @@ -102,7 +120,13 @@ QTimer::singleShot(1000 * 3, this, SLOT(slotRemoveStatusBarLabel())); } -void Global::addStatusBarPermanentItem(QWidget* widget) + +void Global::setStatusBarText(QString const& text, bool permanent) +{ + global_instance->setStatusBarText(text, permanent); +} + +void GlobalPrivate::addStatusBarPermanentItem(QWidget* widget) { if(!m_statusBarExtension) return; @@ -110,12 +134,19 @@ m_statusBarExtension->addStatusBarItem(widget, 0, true); } -void Global::slotRemoveStatusBarLabel() + +void Global::addStatusBarPermanentItem(QWidget* widget) +{ + global_instance->addStatusBarPermanentItem(widget); +} + +void GlobalPrivate::slotRemoveStatusBarLabel() { m_statusBarExtension->removeStatusBarItem(m_statusBarLabel); } -void Global::slotStatusBarTimeout() + +void GlobalPrivate::slotStatusBarTimeout() { m_statusBarExtension->statusBar()->clearMessage(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/global.h new/kdewebdev/klinkstatus/src/global.h --- old/kdewebdev/klinkstatus/src/global.h 2007-03-31 15:27:39.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/global.h 2007-10-31 16:32:57.000000000 +0100 @@ -36,37 +36,14 @@ /** @author Paulo Moura Guedes */ -class Global : public QObject +class Global { - Q_OBJECT public: - static Global* self(); - ~Global(); - - void setKLinkStatusPart(ReadOnlyPart* part); - KStatusBar* statusBar() const; -// static ReadOnlyPart* getKLinkStatusPart(); - -// static StatusBarExtension* getStatusBarExtension(); + static void setKLinkStatusPart(ReadOnlyPart* part); + static KStatusBar* statusBar(); - void setStatusBarText(QString const& text, bool permanent = false); - void addStatusBarPermanentItem(QWidget* widget); - -private slots: - void slotRemoveStatusBarLabel(); - void slotStatusBarTimeout(); - -private: - Global(QObject *parent = 0); - -private: - static Global* m_self_; - static ReadOnlyPart* m_klinkStatusPart; - static StatusBarExtension* m_statusBarExtension; - QLabel* m_statusBarLabel; - // This timer is a workaround for cleaning the temporary messages of tree items (statusTip) - // which sometimes don't get hidden - QTimer m_statusBarTimer; + static void setStatusBarText(QString const& text, bool permanent = false); + static void addStatusBarPermanentItem(QWidget* widget); }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/klinkstatus_part.cpp new/kdewebdev/klinkstatus/src/klinkstatus_part.cpp --- old/kdewebdev/klinkstatus/src/klinkstatus_part.cpp 2007-09-24 16:45:05.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/klinkstatus_part.cpp 2007-10-31 16:32:57.000000000 +0100 @@ -73,7 +73,7 @@ openURL(KUrl("")); - Global::self()->setKLinkStatusPart(this); + Global::setKLinkStatusPart(this); } KLinkStatusPart::~KLinkStatusPart() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/ui/resultssearchbar.cpp new/kdewebdev/klinkstatus/src/ui/resultssearchbar.cpp --- old/kdewebdev/klinkstatus/src/ui/resultssearchbar.cpp 2007-10-01 17:12:50.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/ui/resultssearchbar.cpp 2007-10-20 01:11:41.000000000 +0200 @@ -67,7 +67,7 @@ QToolButton* clearButton = new QToolButton(this); clearButton->setIcon(KIcon(QApplication::layoutDirection() == Qt::RightToLeft ? - "locationbar-erase" : "locationbar-erase")); + "edit-clear-locationbar-rtl" : "edit-clear-locationbar")); clearButton->setAutoRaise(true); d->layout->addWidget(clearButton); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/ui/sessionwidget.cpp new/kdewebdev/klinkstatus/src/ui/sessionwidget.cpp --- old/kdewebdev/klinkstatus/src/ui/sessionwidget.cpp 2007-10-10 14:08:22.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/ui/sessionwidget.cpp 2007-10-31 16:32:57.000000000 +0100 @@ -460,7 +460,7 @@ resetPendingActions(); emit signalUpdateActions(); - Global::self()->setStatusBarText(i18n("Finished checking") + ' ' + Global::setStatusBarText(i18n("Finished checking") + ' ' + combobox_url->currentText(), false); emit signalSearchFinnished(); @@ -498,7 +498,7 @@ resetPendingActions(); emit signalUpdateActions(); - Global::self()->setStatusBarText(i18n("Paused"), false); + Global::setStatusBarText(i18n("Paused"), false); emit signalSearchPaused(); } @@ -688,7 +688,7 @@ resetPendingActions(); - Global::self()->setStatusBarText(i18n("Resuming"), false); + Global::setStatusBarText(i18n("Resuming"), false); } } @@ -778,7 +778,7 @@ textlabel_elapsed_time_value->setText(QTime(0, 0).toString("hh:mm:ss")); elapsed_time_timer_.start(); - Global::self()->setStatusBarText(i18n("Checking") + ' ' + combobox_url->currentText(), false); + Global::setStatusBarText(i18n("Checking") + ' ' + combobox_url->currentText(), false); } void SessionWidget::slotLinkRecheck(LinkStatus* ls) @@ -806,7 +806,7 @@ kError(23100) << "Is redirection: " << ls->isRedirection() << endl; } if(!in_progress_) - Global::self()->setStatusBarText(i18n("Done rechecking ") + ls->absoluteUrl().prettyUrl()); + Global::setStatusBarText(i18n("Done rechecking ") + ls->absoluteUrl().prettyUrl()); } KUrl const& SessionWidget::urlToCheck() const diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/ui/tabwidgetsession.cpp new/kdewebdev/klinkstatus/src/ui/tabwidgetsession.cpp --- old/kdewebdev/klinkstatus/src/ui/tabwidgetsession.cpp 2007-10-10 14:08:22.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/ui/tabwidgetsession.cpp 2007-10-22 02:11:17.000000000 +0200 @@ -63,7 +63,7 @@ tabs_close_ = new QToolButton(this); tabs_close_->setShortcut(QKeySequence("Ctrl+W")); connect(tabs_close_, SIGNAL(clicked()), this, SLOT(closeSession())); - tabs_close_->setIcon(KIcon("tab-remove")); + tabs_close_->setIcon(KIcon("tab-close")); tabs_close_->adjustSize(); tabs_close_->setToolTip(i18n("Close the current tab")); setCornerWidget(tabs_close_, Qt::TopRightCorner); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/klinkstatus/src/ui/treeview.cpp new/kdewebdev/klinkstatus/src/ui/treeview.cpp --- old/kdewebdev/klinkstatus/src/ui/treeview.cpp 2007-10-12 16:08:35.000000000 +0200 +++ new/kdewebdev/klinkstatus/src/ui/treeview.cpp 2007-10-31 18:44:33.000000000 +0100 @@ -38,7 +38,9 @@ #include "engine/linkstatus.h" #include "engine/linkfilter.h" +#ifdef HAVE_LIBTIDY #include "tidy/markupvalidator.h" +#endif #include "global.h" #include "klsconfig.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/editor/functionsimpl.cpp new/kdewebdev/kommander/editor/functionsimpl.cpp --- old/kdewebdev/kommander/editor/functionsimpl.cpp 2007-07-18 16:28:25.000000000 +0200 +++ new/kdewebdev/kommander/editor/functionsimpl.cpp 2007-10-20 01:11:41.000000000 +0200 @@ -38,7 +38,7 @@ bool a_modal) : FunctionsDialogBase(a_parent, a_name, a_modal), m_widgetList(a_widgetList) { - clearButton->setPixmap(KIconLoader::global()->loadIcon("locationbar-erase", KIcon::Toolbar)); + clearButton->setPixmap(KIconLoader::global()->loadIcon("edit-clear-locationbar", KIcon::Toolbar)); copyButton->setPixmap(KIconLoader::global()->loadIcon("arrow-down", KIcon::Toolbar)); groupComboBox->insertStringList(SpecialInformation::groups()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kommander/x-kommander.desktop new/kdewebdev/kommander/x-kommander.desktop --- old/kdewebdev/kommander/x-kommander.desktop 2007-09-21 08:29:13.000000000 +0200 +++ new/kdewebdev/kommander/x-kommander.desktop 2007-10-20 08:46:52.000000000 +0200 @@ -19,7 +19,7 @@ Comment[is]=Kommander skrá Comment[it]=File di Kommander Comment[ja]=Kommander ファイル -Comment[lt]=Kommander byla +Comment[lt]=Kommander failas Comment[ms]=Fail Kommander Comment[nds]=Kommander-Datei Comment[ne]=कमाण्डर फाइल diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kxsldbg/CMakeLists.txt new/kdewebdev/kxsldbg/CMakeLists.txt --- old/kdewebdev/kxsldbg/CMakeLists.txt 2007-07-23 09:16:40.000000000 +0200 +++ new/kdewebdev/kxsldbg/CMakeLists.txt 2007-10-25 09:57:29.000000000 +0200 @@ -103,7 +103,7 @@ kde4_add_executable(kxsldbg ${kxsldbg_SRCS}) -target_link_libraries(kxsldbg ktexteditor exslt ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY}) +target_link_libraries(kxsldbg ${KDE4_KTEXTEDITOR_LIBS} exslt ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY}) install(TARGETS kxsldbg DESTINATION ${BIN_INSTALL_DIR} ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kxsldbg/kxsldbgpart/CMakeLists.txt new/kdewebdev/kxsldbg/kxsldbgpart/CMakeLists.txt --- old/kdewebdev/kxsldbg/kxsldbgpart/CMakeLists.txt 2007-07-10 18:12:24.000000000 +0200 +++ new/kdewebdev/kxsldbg/kxsldbgpart/CMakeLists.txt 2007-10-25 09:57:29.000000000 +0200 @@ -21,7 +21,7 @@ -target_link_libraries(kxsldbgpart ktexteditor exslt ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY}) +target_link_libraries(kxsldbgpart ${KDE4_KTEXTEDITOR_LIBS} exslt ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY}) install(TARGETS kxsldbgpart DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/kxsldbg/kxsldbgpart/kxsldbg_part.cpp new/kdewebdev/kxsldbg/kxsldbgpart/kxsldbg_part.cpp --- old/kdewebdev/kxsldbg/kxsldbgpart/kxsldbg_part.cpp 2007-08-19 16:06:51.000000000 +0200 +++ new/kdewebdev/kxsldbg/kxsldbgpart/kxsldbg_part.cpp 2007-10-21 23:40:12.000000000 +0200 @@ -142,7 +142,7 @@ connect(action, SIGNAL(triggered(bool)), SLOT(stepCmd_activated())); action->setShortcut(QKeySequence(Qt::Key_F8)); - action = new KAction(KIcon("find-next"), i18n("Next"), this); + action = new KAction(KIcon("edit-find-next"), i18n("Next"), this); actionCollection()->addAction("nextCmd", action ); connect(action, SIGNAL(triggered(bool)), SLOT(nextCmd_activated())); action->setShortcut(QKeySequence(Qt::Key_F10)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/data/config/quanta_preview_config.desktop new/kdewebdev/quanta/data/config/quanta_preview_config.desktop --- old/kdewebdev/quanta/data/config/quanta_preview_config.desktop 2007-10-09 07:47:33.000000000 +0200 +++ new/kdewebdev/quanta/data/config/quanta_preview_config.desktop 2007-10-16 00:24:08.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Service -Exec=kcmshell --caption %c %i khtml_behavior khtml_java_js khtml_fonts cookies cache proxy kcmcss crypto useragent khtml_plugins +Exec=kcmshell4 --caption %c %i khtml_behavior khtml_java_js khtml_fonts cookies cache proxy kcmcss crypto useragent khtml_plugins Icon=konqueror DocPath=konqueror/index.html Name=Configure KHTML Browser Part diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/lib/basetreeview.cpp new/kdewebdev/quanta/lib/basetreeview.cpp --- old/kdewebdev/quanta/lib/basetreeview.cpp 2007-10-01 12:29:42.000000000 +0200 +++ new/kdewebdev/quanta/lib/basetreeview.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -959,7 +959,7 @@ int maxBranch = configGroup.readEntry("NumOpenFolderList", 0); for (int i = 1; i <= maxBranch; ++i) { - QStringList folderList = configGroup.readPathListEntry("OpenFolderList" + QString::number(i)); + QStringList folderList = configGroup.readPathEntry("OpenFolderList" + QString::number(i), QStringList()); if (folderList.count() > 1) { KUrl rootURL = folderList.takeFirst(); // remove the root URL KFileTreeBranchIterator it( branches() ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/lib/CMakeLists.txt new/kdewebdev/quanta/lib/CMakeLists.txt --- old/kdewebdev/quanta/lib/CMakeLists.txt 2007-07-23 09:16:40.000000000 +0200 +++ new/kdewebdev/quanta/lib/CMakeLists.txt 2007-10-25 09:55:58.000000000 +0200 @@ -40,7 +40,7 @@ kde4_add_library(kdevquanta SHARED ${kdevquanta_LIB_SRCS}) -target_link_libraries(kdevquanta kdevplatforminterfaces kdevplatformshell kdevplatformeditor ktexteditor ${KDE4_KFILE_LIBS}) +target_link_libraries(kdevquanta kdevplatforminterfaces kdevplatformshell kdevplatformeditor ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KFILE_LIBS}) set_target_properties(kdevquanta PROPERTIES VERSION 1.0.0 SOVERSION 1 ) install(TARGETS kdevquanta DESTINATION ${LIB_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/filestree/CMakeLists.txt new/kdewebdev/quanta/plugins/filestree/CMakeLists.txt --- old/kdewebdev/quanta/plugins/filestree/CMakeLists.txt 2007-07-10 18:12:24.000000000 +0200 +++ new/kdewebdev/quanta/plugins/filestree/CMakeLists.txt 2007-10-25 09:55:58.000000000 +0200 @@ -25,7 +25,7 @@ -target_link_libraries(kdevquantafilestree kdevquanta kdevplatforminterfaces kde3support ${KDE4_KDECORE_LIBS} ) +target_link_libraries(kdevquantafilestree kdevquanta kdevplatforminterfaces ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ) install(TARGETS kdevquantafilestree DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/filestree/filestreeview.cpp new/kdewebdev/quanta/plugins/filestree/filestreeview.cpp --- old/kdewebdev/quanta/plugins/filestree/filestreeview.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/plugins/filestree/filestreeview.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -64,7 +64,6 @@ FilesTreeView::~FilesTreeView() { - m_config->setGroup(metaObject()->className()); KConfigGroup configGroup(m_config, metaObject()->className()); configGroup.writePathEntry("Top folders", topURLAliases.keys()); configGroup.writePathEntry("Top folder aliases", topURLAliases.values()); @@ -299,10 +298,9 @@ void FilesTreeView::restoreBranches() { - m_config->setGroup(metaObject()->className()); KConfigGroup configGroup(m_config, metaObject()->className()); - QStringList topStrList = configGroup.readPathListEntry("Top folders"); - QStringList topStrAliasList = configGroup.readPathListEntry("Top folder aliases"); + QStringList topStrList = configGroup.readPathEntry("Top folders", QStringList()); + QStringList topStrAliasList = configGroup.readPathEntry("Top folder aliases", QStringList()); for (int i = 0; i < topStrList.count(); i++) { if (i < topStrAliasList.count()) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/preview/CMakeLists.txt new/kdewebdev/quanta/plugins/preview/CMakeLists.txt --- old/kdewebdev/quanta/plugins/preview/CMakeLists.txt 2007-07-10 18:12:24.000000000 +0200 +++ new/kdewebdev/quanta/plugins/preview/CMakeLists.txt 2007-10-25 09:55:58.000000000 +0200 @@ -24,7 +24,7 @@ -target_link_libraries(kdevhtmlpreview kdevplatforminterfaces kdevplatformshell ktexteditor ${KDE4_KHTML_LIBS} ) +target_link_libraries(kdevhtmlpreview kdevplatforminterfaces kdevplatformshell ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KHTML_LIBS} ) install(TARGETS kdevhtmlpreview DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/structuretree/CMakeLists.txt new/kdewebdev/quanta/plugins/structuretree/CMakeLists.txt --- old/kdewebdev/quanta/plugins/structuretree/CMakeLists.txt 2007-07-10 18:12:24.000000000 +0200 +++ new/kdewebdev/quanta/plugins/structuretree/CMakeLists.txt 2007-10-25 09:55:58.000000000 +0200 @@ -28,7 +28,7 @@ -target_link_libraries(kdevstructuretree kdevquanta kdevplatforminterfaces kde3support ${KDE4_KDECORE_LIBS} ) +target_link_libraries(kdevstructuretree kdevquanta kdevplatforminterfaces ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ) install(TARGETS kdevstructuretree DESTINATION ${PLUGIN_INSTALL_DIR}) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/tagdialogs/tagdialog.cpp new/kdewebdev/quanta/plugins/tagdialogs/tagdialog.cpp --- old/kdewebdev/quanta/plugins/tagdialogs/tagdialog.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/plugins/tagdialogs/tagdialog.cpp 2007-10-24 14:42:24.000000000 +0200 @@ -199,15 +199,14 @@ addTab( mainDlg, i18n("Main") ); } - KConfig *dtdConfig = new KConfig(dtdTag->parentDTD->fileName); - KConfigGroup grp(dtdConfig, "General"); - dtdConfig->setGroup("General"); + KConfig dtdConfig(dtdTag->parentDTD->fileName); + KConfigGroup grp(&dtdConfig, "General"); int numOfPages = grp.readEntry("NumOfPages", 0); extraPageList = new QList<Tagxml*>; for (int i = 1; i <= numOfPages; i++) { Tagxml *extraPage = 0L; - dtdConfig->setGroup(QString("Page%1").arg(i)); + grp.changeGroup(QString("Page%1").arg(i)); QString title = grp.readEntry("Title"); QStringList groupList = grp.readEntry("Groups", QStringList()); QDomDocument extraDoc; //build an internal tag XML for the groups diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/templatestree/templatestreeview.cpp new/kdewebdev/quanta/plugins/templatestree/templatestreeview.cpp --- old/kdewebdev/quanta/plugins/templatestree/templatestreeview.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/plugins/templatestree/templatestreeview.cpp 2007-10-24 14:42:24.000000000 +0200 @@ -131,11 +131,10 @@ } if (dotFileInfo.exists()) { - KConfig *config = new KConfig(dotFileInfo.filePath()); - KConfigGroup grp(config, config->group()); + KConfig config(dotFileInfo.filePath()); + KConfigGroup grp(&config, QString()); QString s = grp.readEntry("Type"); tvi->setText(1, typeToi18n[s]); - delete config; } } @@ -532,14 +531,13 @@ QFileInfo dotFileInfo(QFileInfo(startDir).path() + "/.dirinfo"); - KConfig *config = new KConfig(dotFileInfo.filePath()); - KConfigGroup grp(config, config->group()); + KConfig config(dotFileInfo.filePath()); + KConfigGroup grp(&config, QString()); dirInfo.mimeType = grp.readEntry("Type"); dirInfo.preText = grp.readEntry("PreText"); dirInfo.postText = grp.readEntry("PostText"); dirInfo.usePrePostText = grp.readEntry("UsePrePostText", false); - delete config; return dirInfo; } @@ -565,15 +563,14 @@ QFileInfo dotFileInfo(QFileInfo(startDir).path()+"/.dirinfo"); bool success = false; - KConfig *config = new KConfig(dotFileInfo.filePath()); - KConfigGroup grp(config, config->group()); + KConfig config(dotFileInfo.filePath()); + KConfigGroup grp(&config, QString()); grp.writeEntry("Type", m_dirInfo.mimeType); grp.writeEntry("PreText", m_dirInfo.preText); grp.writeEntry("PostText", m_dirInfo.postText); grp.writeEntry("UsePrePostText", m_dirInfo.usePrePostText); - config->sync(); + config.sync(); success = true; - delete config; return success; } @@ -662,7 +659,6 @@ QString name = url.path() + TMPL; KConfig config(name); KConfigGroup grp(&config, "Filtering"); - config.setGroup("Filtering"); name = grp.readEntry("Action", NONE); if ( name == NONE ) name = i18n(NONE); @@ -870,7 +866,6 @@ QString fileName = currentUrl().path() + TMPL; KConfig config(fileName); KConfigGroup grp(&config, "Filtering"); - config.setGroup("Filtering"); if ( m_quantaProperties->actionCombo->currentText() == i18n(NONE) ) grp.writeEntry("Action", NONE); else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.cpp new/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.cpp --- old/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.cpp 2007-08-05 14:00:06.000000000 +0200 +++ new/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.cpp 2007-10-29 13:03:06.000000000 +0100 @@ -29,7 +29,7 @@ // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) static void silenceQToolBar(QtMsgType, const char *){} -QWidget *ToolbarGUIBuilder::createContainer(QWidget *parent, int index, const QDomElement &element, int &id) +QWidget *ToolbarGUIBuilder::createContainer(QWidget *parent, int index, const QDomElement &element, QAction* &action) { // kDebug(24000) << "createContainer: this=" << this << " parent=" << parent; QWidget *container = 0L; @@ -74,7 +74,7 @@ if (m_separateToolbars) { - container = KXMLGUIBuilder::createContainer(parent, index, element, id); + container = KXMLGUIBuilder::createContainer(parent, index, element, action); static_cast<KToolBar*>(container)->setWindowTitle(i18n(tabname.toUtf8())); toolbarTab->parentWidget()->parentWidget()->hide(); } else @@ -83,7 +83,7 @@ } } else { - container = KXMLGUIBuilder::createContainer(parent, index, element, id); + container = KXMLGUIBuilder::createContainer(parent, index, element, action); } // kDebug(24000) << "container " << element.attribute("name") << " created: " << container; @@ -98,7 +98,7 @@ return container; } -void ToolbarGUIBuilder::removeContainer(QWidget *container, QWidget *parent, QDomElement &element, int id) +void ToolbarGUIBuilder::removeContainer(QWidget *container, QWidget *parent, QDomElement &element, QAction* action) { QString s; QTextStream str(&s, IO_ReadWrite); @@ -120,7 +120,7 @@ if (tb) { if (tb->separate()) - KXMLGUIBuilder::removeContainer(container, parent, element, id); + KXMLGUIBuilder::removeContainer(container, parent, element, action); toolbarTab->removePage(tb); if (toolbarTab->count() == 0 && toolbarTab->parentWidget()->parentWidget()) toolbarTab->parentWidget()->parentWidget()->hide(); @@ -128,6 +128,6 @@ } } - KXMLGUIBuilder::removeContainer(container, parent, element, id); + KXMLGUIBuilder::removeContainer(container, parent, element, action); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.h new/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.h --- old/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.h 2005-11-13 21:24:52.000000000 +0100 +++ new/kdewebdev/quanta/plugins/usertoolbars/toolbarguibuilder.h 2007-10-29 13:03:06.000000000 +0100 @@ -17,17 +17,17 @@ /** Builder for the toolbar XML gui client objects. It handles putting and removing the toolbar - on a tabwidget inside a toolbar. + on a tabwidget inside a toolbar. @author Andras Mantia <amantia@kde.org> */ -class ToolbarGUIBuilder:public KXMLGUIBuilder +class ToolbarGUIBuilder:public KXMLGUIBuilder { public: /** * The builder is a singleton. You can access it via this method. - * @param widget the argument passes to the KXMLGUIBuilder constructor + * @param widget the argument passes to the KXMLGUIBuilder constructor * @return a pointer to the KXMLGUIBuilder object */ static ToolbarGUIBuilder* const ref(QWidget *widget = 0L) @@ -36,18 +36,18 @@ if (!m_ref) m_ref = new ToolbarGUIBuilder(widget); return m_ref; } - + /** - * Called when a new XML gui client is added to the gui factory. - * Reimplemented from KXMLGUIBuilder in order to create the toolbar inside + * Called when a new XML gui client is added to the gui factory. + * Reimplemented from KXMLGUIBuilder in order to create the toolbar inside * a tabwidget, not as a standalone toolbar. */ - virtual QWidget *createContainer(QWidget *parent, int index, const QDomElement &element, int &id); + virtual QWidget *createContainer(QWidget *parent, int index, const QDomElement &element, QAction*& action); /** - * Called when a XML gui client is removed the gui factory. + * Called when a XML gui client is removed the gui factory. * Reimplemented from KXMLGUIBuilder in order to remove out customly built toolbar. */ - virtual void removeContainer(QWidget *container, QWidget *parent, QDomElement &element, int id); + virtual void removeContainer(QWidget *container, QWidget *parent, QDomElement &element, QAction* action); /** * Sets the toolbar mode. @@ -58,9 +58,9 @@ private: /** - * The private constructor. + * The private constructor. * @param widget passed to the KXMLGUIBuilder constructor - * @return + * @return */ ToolbarGUIBuilder(QWidget *widget):KXMLGUIBuilder(widget){ m_separateToolbars = false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.cpp new/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.cpp --- old/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -87,7 +87,6 @@ void DTEPEditDlg::readGeneral() { KConfigGroup grp(m_config, "General"); - m_config->setGroup("General"); nameEdit->setText(grp.readEntry("Name")); nickNameEdit->setText(grp.readEntry("NickName")); m_family = grp.readEntry("Family", 1) - 1; @@ -110,8 +109,8 @@ doctypeEdit->setText(grp.readEntry("DoctypeString")); topLevel->setChecked(grp.readEntry("TopLevel", false)); - m_config->setGroup("Toolbars"); - toolbarFolderEdit->setText(grp.readPathEntry("Location")); + grp.changeGroup("Toolbars"); + toolbarFolderEdit->setText(grp.readPathEntry("Location", QString())); toolbarsEdit->setText(grp.readEntry("Names")); } @@ -122,7 +121,6 @@ while (m_config->hasGroup(QString("Page%1").arg(i)) && i < 6) { KConfigGroup grp(m_config, QString("Page%1").arg(i)); - m_config->setGroup(QString("Page%1").arg(i)); QString title = grp.readEntry("Title"); QString groups = grp.readEntry("Groups"); if (i == 1) @@ -162,7 +160,6 @@ void DTEPEditDlg::readParserRules() { KConfigGroup grp(m_config, "Extra rules"); - m_config->setGroup("Extra rules"); enableMinusInWords->setChecked(grp.readEntry("MinusAllowedInWord", false)); attributeSeparatorEdit->setText(grp.readEntry("AttributeSeparator")); tagSeparatorEdit->setText(grp.readEntry("TagSeparator")); @@ -180,7 +177,7 @@ membersAfterEdit->setText(grp.readEntry("MemberAutoCompleteAfter")); } - m_config->setGroup("Parsing rules"); + grp.changeGroup("Parsing rules"); commentsEdit->setText(grp.readEntry("Comments")); mayContainEdit->setText(grp.readEntry("MayContain")); @@ -237,7 +234,6 @@ void DTEPEditDlg::writeGeneral(KConfig *config) { KConfigGroup grp(config, "General"); - config->setGroup("General"); grp.writeEntry("Name", nameEdit->text()); grp.writeEntry("NickName", nickNameEdit->text()); grp.writeEntry("Family", typeCombo->currentIndex() + 1); @@ -250,7 +246,7 @@ if (m_family == 1) grp.writeEntry("TopLevel", topLevel->isChecked()); - config->setGroup("Toolbars"); + grp.changeGroup("Toolbars"); grp.writeEntry("Location", toolbarFolderEdit->text()); grp.writeEntry("Names", toolbarsEdit->text()); } @@ -265,39 +261,39 @@ if (enablePage1->isChecked()) { num++; - config->setGroup(QString("Page%1").arg(num)); + grp.changeGroup(QString("Page%1").arg(num)); grp.writeEntry("Title", pageTitleEdit1->text()); grp.writeEntry("Groups", groupsEdit1->text()); } if (enablePage2->isChecked()) { num++; - config->setGroup(QString("Page%1").arg(num)); + grp.changeGroup(QString("Page%1").arg(num)); grp.writeEntry("Title", pageTitleEdit2->text()); grp.writeEntry("Groups", groupsEdit2->text()); } if (enablePage3->isChecked()) { num++; - config->setGroup(QString("Page%1").arg(num)); + grp.changeGroup(QString("Page%1").arg(num)); grp.writeEntry("Title", pageTitleEdit3->text()); grp.writeEntry("Groups", groupsEdit3->text()); } if (enablePage4->isChecked()) { num++; - config->setGroup(QString("Page%1").arg(num)); + grp.changeGroup(QString("Page%1").arg(num)); grp.writeEntry("Title", pageTitleEdit4->text()); grp.writeEntry("Groups", groupsEdit4->text()); } if (enablePage5->isChecked()) { num++; - config->setGroup(QString("Page%1").arg(num)); + grp.changeGroup(QString("Page%1").arg(num)); grp.writeEntry("Title", pageTitleEdit5->text()); grp.writeEntry("Groups", groupsEdit5->text()); } - config->setGroup("General"); + grp.changeGroup("General"); grp.writeEntry("NumOfPages", num); } } @@ -305,7 +301,6 @@ void DTEPEditDlg::writeParserRules(KConfig *config) { KConfigGroup grp(config, "Extra rules"); - config->setGroup("Extra rules"); grp.writeEntry("MinusAllowedInWord", enableMinusInWords->isChecked()); grp.writeEntry("AttributeSeparator", attributeSeparatorEdit->text()); grp.writeEntry("TagSeparator", tagSeparatorEdit->text()); @@ -323,7 +318,7 @@ grp.writeEntry("MemberAutoCompleteAfter", membersAfterEdit->text()); } - config->setGroup("Parsing rules"); + grp.changeGroup("Parsing rules"); grp.writeEntry("Comments", commentsEdit->text()); grp.writeEntry("MayContain", mayContainEdit->text()); @@ -348,7 +343,6 @@ void DTEPEditDlg::readStructures() { KConfigGroup grp(m_config, "Extra rules"); - m_config->setGroup("Extra rules"); int variableGroupId = grp.readEntry("VariableGroupIndex", -1); int functionGroupId = grp.readEntry("FunctionGroupIndex", -1); int classGroupId = grp.readEntry("ClassGroupIndex", -1); @@ -358,7 +352,7 @@ while (m_config->hasGroup(QString("StructGroup_%1").arg(i))) { StructGroup group; - m_config->setGroup(QString("StructGroup_%1").arg(i)); + grp.changeGroup(QString("StructGroup_%1").arg(i)); group.name = grp.readEntry("Name"); group.noName = grp.readEntry("No_Name"); group.icon = grp.readEntry("Icon"); @@ -393,14 +387,13 @@ void DTEPEditDlg::writeStructures(KConfig *config) { KConfigGroup grp(config, "Extra rules"); - config->setGroup("Extra rules"); grp.writeEntry("StructGroupsCount", m_structGroups.count()); int i = 1; for (QList<StructGroup>::ConstIterator it = m_structGroups.constBegin(); it != m_structGroups.constEnd(); ++it) { StructGroup group = *it; - config->setGroup(QString("StructGroup_%1").arg(i)); + grp.changeGroup(QString("StructGroup_%1").arg(i)); grp.writeEntry("Name", group.name); grp.writeEntry("No_Name", group.noName); grp.writeEntry("Icon", group.icon); @@ -421,22 +414,22 @@ grp.writeEntry("RemoveFromAutoCompleteWord", group.removeRx); if (group.variableGroup) { - config->setGroup("Extra rules"); + grp.changeGroup("Extra rules"); grp.writeEntry("VariableGroupIndex", i); } else if (group.functionGroup) { - config->setGroup("Extra rules"); + grp.changeGroup("Extra rules"); grp.writeEntry("FunctionGroupIndex", i); } else if (group.classGroup) { - config->setGroup("Extra rules"); + grp.changeGroup("Extra rules"); grp.writeEntry("ClassGroupIndex", i); } else if (group.objectGroup) { - config->setGroup("Extra rules"); + grp.changeGroup("Extra rules"); grp.writeEntry("ObjectGroupIndex", i); } } @@ -563,14 +556,4 @@ } } -void DTEPEditDlg::writeEntry(KConfig *config, const QString &key, const QString &value) -{ - KConfigGroup grp(config, config->group()); - if (value.isEmpty()) - grp.deleteEntry(key); - else - grp.writeEntry(key, value); -} - - #include "dtepeditdlg.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.h new/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.h --- old/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.h 2006-08-31 14:09:39.000000000 +0200 +++ new/kdewebdev/quanta/quantacore/dialogs/dtepeditdlg.h 2007-10-24 14:42:24.000000000 +0200 @@ -77,7 +77,6 @@ void writePages(KConfig *config); void writeParserRules(KConfig *config); void writeStructures(KConfig *config); - void writeEntry(KConfig *config, const QString &key, const QString &value); QString m_descriptionFile; KConfig *m_config; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/quantacore/dtds.cpp new/kdewebdev/quanta/quantacore/dtds.cpp --- old/kdewebdev/quanta/quantacore/dtds.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/quantacore/dtds.cpp 2007-10-24 15:08:37.000000000 +0200 @@ -147,13 +147,11 @@ QString tmpStr = dirName + m_rcFilename; if (!QFile::exists(tmpStr)) return false; - KConfig *dtdConfig = new KConfig(tmpStr); - KConfigGroup grp(dtdConfig, "General"); - dtdConfig->setGroup("General"); + KConfig dtdConfig(tmpStr); + KConfigGroup grp(&dtdConfig, "General"); QString dtdName = grp.readEntry("Name", "Unknown"); if (m_dict->contains(dtdName.toLower())) { - delete dtdConfig; kDebug(24000) << "dtds::readTagDir from " << dirName << " canceled, DTD " << dtdName << " found in memory" << endl; return false; @@ -175,7 +173,7 @@ dtd->commonAttrs = 0L; //Read the areas that define the areas - dtdConfig->setGroup("Parsing rules"); + grp.changeGroup("Parsing rules"); QStringList definitionAreaBorders = grp.readEntry("AreaBorders", QStringList()); for (int i = 0; i < definitionAreaBorders.count(); i++) { @@ -194,7 +192,6 @@ kDebug(24000) << "DTD loaded: " << dtdName << " pointer " << dtd; m_dict->insert(dtdName.toLower(), dtd); //insert the structure into the dictionary - delete dtdConfig; if (!loadAll) { @@ -218,10 +215,9 @@ kapp->setOverrideCursor( QCursor(Qt::WaitCursor) ); - KConfig *dtdConfig = new KConfig(dtd->fileName); - KConfigGroup grp(dtdConfig, "General"); + KConfig dtdConfig(dtd->fileName); + KConfigGroup grp(&dtdConfig, "General"); //read the general DTD info - dtdConfig->setGroup("General"); dtd->commonAttrs = new AttributeListDict(); bool caseSensitive = grp.readEntry("CaseSensitive", false); @@ -265,8 +261,8 @@ } //read the toolbars - dtdConfig->setGroup("Toolbars"); - tmpStr = grp.readPathEntry("Location"); //holds the location of the toolbars + grp.changeGroup("Toolbars"); + tmpStr = grp.readPathEntry("Location", QString()); //holds the location of the toolbars if (!tmpStr.endsWith('/') && !tmpStr.isEmpty()) { tmpStr.append('/'); @@ -278,7 +274,7 @@ } //read the extra tags and their attributes - dtdConfig->setGroup("Extra tags"); + grp.changeGroup("Extra tags"); dtd->defaultAttrType = grp.readEntry("DefaultAttrType","input"); QStringList extraTagsList = grp.readEntry("List", QStringList()); QString option; @@ -344,7 +340,7 @@ /**** Code for the new parser *****/ - dtdConfig->setGroup("Parsing rules"); + grp.changeGroup("Parsing rules"); //Which DTD can be present in this one? dtd->insideDTDs = grp.readEntry("MayContain", QStringList()); for (int i = 0; i < dtd->insideDTDs.count(); i++) @@ -418,7 +414,7 @@ /**** End of code for the new parser *****/ //read the definition of a structure, and the structure keywords - QStringList structKeywords = grp.readEntry("StructKeywords", QStringList(), ','); + QStringList structKeywords = grp.readEntry("StructKeywords", QStringList()); if (structKeywords.count() !=0 ) { tmpStr = "\b("; @@ -434,7 +430,7 @@ } dtd->structKeywordsRx.setPattern(tmpStr); - structKeywords = grp.readEntry("LocalScopeKeywords", QStringList(),','); + structKeywords = grp.readEntry("LocalScopeKeywords", QStringList()); if (structKeywords.count() !=0 ) { tmpStr = "\b("; @@ -455,7 +451,7 @@ dtd->structEndStr = grp.readEntry("StructEndStr","}").trimmed(); - dtdConfig->setGroup("Extra rules"); + grp.changeGroup("Extra rules"); dtd->minusAllowedInWord = grp.readEntry("MinusAllowedInWord", false); tmpStr = grp.readEntry("TagAutoCompleteAfter", "<").trimmed(); if (tmpStr.toUpper() == "NONE") @@ -507,7 +503,7 @@ QString tagStr; for (uint index = 1; index <= structGroupsCount; index++) { - dtdConfig->setGroup(QString("StructGroup_%1").arg(index)); + grp.changeGroup(QString("StructGroup_%1").arg(index)); //new code group.name = grp.readEntry("Name").trimmed(); group.noName = grp.readEntry("No_Name").trimmed(); @@ -557,7 +553,7 @@ QString tagName; for (uint index = 1; index <= structGroupsCount; index++) { - dtdConfig->setGroup(QString("StructGroup_%1").arg(index)); + grp.changeGroup(QString("StructGroup_%1").arg(index)); group.name = grp.readEntry("Name").trimmed(); group.noName = grp.readEntry("No_Name").trimmed(); group.icon = grp.readEntry("Icon").trimmed(); @@ -581,7 +577,6 @@ } } - delete dtdConfig; dtd->loaded = true; resolveInherited(dtd); kapp->restoreOverrideCursor(); @@ -881,7 +876,6 @@ QString dirName = dtdParser.dirName(); KConfig dtdcfg(dirName + m_rcFilename); KConfigGroup grp(&dtdcfg, "General"); - dtdcfg.setGroup("General"); QString dtdName = grp.readEntry("Name"); QString nickName = grp.readEntry("NickName", dtdName); DTDStruct * dtd = m_dict->value(dtdName) ; @@ -914,7 +908,6 @@ dirName += '/'; KConfig dtdcfg(dirName + m_rcFilename); KConfigGroup grp(&dtdcfg, "General"); - dtdcfg.setGroup("General"); QString dtdName = grp.readEntry("Name"); QString nickName = grp.readEntry("NickName", dtdName); DTDStruct * dtd = m_dict->value(dtdName) ; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdewebdev/quanta/quantacore/parsers/dtd/dtdparser.cpp new/kdewebdev/quanta/quantacore/parsers/dtd/dtdparser.cpp --- old/kdewebdev/quanta/quantacore/parsers/dtd/dtdparser.cpp 2007-10-06 13:31:41.000000000 +0200 +++ new/kdewebdev/quanta/quantacore/parsers/dtd/dtdparser.cpp 2007-10-24 14:42:24.000000000 +0200 @@ -185,7 +185,6 @@ { KConfig config(DTD::dirName + "description.rc"); KConfigGroup grp(&config, "General"); - config.setGroup("General"); grp.writeEntry("Name", m_name); grp.writeEntry("NickName", m_nickName); grp.writeEntry("DoctypeString", m_doctype); @@ -193,7 +192,7 @@ grp.writeEntry("DefaultExtension", m_defaultExtension); grp.writeEntry("Family", "1"); grp.writeEntry("CaseSensitive", m_caseSensitive); - config.setGroup("Parsing rules"); + grp.changeGroup("Parsing rules"); grp.writeEntry("SpecialAreas","<!-- -->,<?xml ?>,<!DOCTYPE >"); grp.writeEntry("SpecialAreaNames","comment,XML PI,DTD"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org