[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdesdk/kbabel/kbabeldict
From: Laurent Montel <montel () kde ! org>
Date: 2006-05-26 8:11:59
Message-ID: 1148631119.291488.5321.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 544823 by mlaurent:
Fix some modules
M +1 -2 dictionarymenu.cpp
M +2 -0 modules/CMakeLists.txt
M +1 -1 modules/poauxiliary/CMakeLists.txt
M +3 -3 modules/poauxiliary/pa_factory.cpp
M +1 -1 modules/poauxiliary/pa_factory.h
M +2 -2 modules/poauxiliary/preferenceswidget.cpp
M +1 -1 modules/pocompendium/CMakeLists.txt
M +4 -4 modules/pocompendium/pc_factory.cpp
M +1 -1 modules/pocompendium/pc_factory.h
M +2 -2 modules/pocompendium/preferenceswidget.cpp
M +1 -1 modules/tmx/CMakeLists.txt
M +3 -3 modules/tmx/pc_factory.cpp
M +1 -1 modules/tmx/pc_factory.h
M +2 -2 modules/tmx/preferenceswidget.cpp
--- trunk/KDE/kdesdk/kbabel/kbabeldict/dictionarymenu.cpp #544822:544823
@@ -35,9 +35,8 @@
#include <kaction.h>
#include <kdebug.h>
#include <kshortcut.h>
-
#include <qsignalmapper.h>
-
+#include <kactioncollection.h>
DictionaryMenu::DictionaryMenu(KMenu *popupMenu, KActionCollection *collection
, QObject *parent)
: QObject(parent, "dictionarymenu")
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/CMakeLists.txt #544822:544823
@@ -1,4 +1,6 @@
+include_directories (${CMAKE_SOURCE_DIR}/kbabel/kbabeldict/)
+
add_subdirectory( pocompendium )
add_subdirectory( poauxiliary )
add_subdirectory( tmx )
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/poauxiliary/CMakeLists.txt #544822:544823
@@ -8,7 +8,7 @@
kde4_automoc(${kbabeldict_poauxiliary_PART_SRCS})
-kde4_add_ui_files(kbabeldict_poauxiliary_PART_SRCS pwidget.ui )
+kde4_add_ui3_files(kbabeldict_poauxiliary_PART_SRCS pwidget.ui )
kde4_add_plugin(kbabeldict_poauxiliary ${kbabeldict_poauxiliary_PART_SRCS})
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp #544822:544823
@@ -75,8 +75,8 @@
}
-QObject *PaFactory::createObject( QObject *parent, const char *name
- , const char *classname, const QStringList &)
+QObject *PaFactory::createObject( QObject *parent
+ ,const char *classname, const QStringList &)
{
if(QByteArray(classname) != "SearchEngine")
{
@@ -84,7 +84,7 @@
return 0;
}
- return new PoAuxiliary(parent,name);
+ return new PoAuxiliary(parent);
}
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h #544822:544823
@@ -46,7 +46,7 @@
PaFactory( QObject *parent=0 );
~PaFactory();
- virtual QObject *createObject( QObject *parent=0, const char *name=0
+ virtual QObject *createObject( QObject *parent=0
, const char *classname="QObject"
, const QStringList &args = QStringList());
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp #544822:544823
@@ -76,13 +76,13 @@
void AuxiliaryPreferencesWidget::standard()
{
- prefWidget->urlInput->setURL("@PACKAGE@.po");
+ prefWidget->urlInput->setUrl(KUrl("@PACKAGE@.po"));
changed=true;
}
void AuxiliaryPreferencesWidget::setURL(const QString url)
{
- prefWidget->urlInput->setURL(url);
+ prefWidget->urlInput->setUrl(url);
changed=false;
}
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/pocompendium/CMakeLists.txt #544822:544823
@@ -12,7 +12,7 @@
kde4_automoc(${kbabeldict_pocompendium_PART_SRCS})
-kde4_add_ui_files(kbabeldict_pocompendium_PART_SRCS pwidget.ui )
+kde4_add_ui3_files(kbabeldict_pocompendium_PART_SRCS pwidget.ui )
kde4_add_plugin(kbabeldict_pocompendium ${kbabeldict_pocompendium_PART_SRCS})
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp #544822:544823
@@ -77,16 +77,16 @@
}
-QObject *PcFactory::createObject( QObject *parent, const char *name
- , const char *classname, const QStringList &)
+QObject *PcFactory::createObject( QObject *parent,
+ const char *classname, const QStringList &)
{
- if(Q3CString(classname) != "SearchEngine")
+ if(QByteArray(classname) != "SearchEngine")
{
kError() << "not a SearchEngine requested" << endl;
return 0;
}
- return new PoCompendium(parent,name);
+ return new PoCompendium(parent);
}
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/pocompendium/pc_factory.h #544822:544823
@@ -46,7 +46,7 @@
PcFactory( QObject *parent=0 );
~PcFactory();
- virtual QObject *createObject( QObject *parent=0, const char *name=0
+ virtual QObject *createObject( QObject *parent=0
, const char *classname="QObject"
, const QStringList &args = QStringList());
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp #544822:544823
@@ -131,7 +131,7 @@
void CompendiumPreferencesWidget::standard()
{
- prefWidget->urlInput->setURL("http://i18n.kde.org/po_overview/@LANG@.messages");
+ prefWidget->urlInput->setUrl(KUrl("http://i18n.kde.org/po_overview/@LANG@.messages"));
prefWidget->caseBtn->setChecked(false);
prefWidget->equalBtn->setChecked(true);
prefWidget->ngramBtn->setChecked(true);
@@ -147,7 +147,7 @@
void CompendiumPreferencesWidget::setURL(const QString url)
{
- prefWidget->urlInput->setURL(url);
+ prefWidget->urlInput->setUrl(url);
changed=false;
}
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/tmx/CMakeLists.txt #544822:544823
@@ -12,7 +12,7 @@
kde4_automoc(${kbabeldict_tmxcompendium_PART_SRCS})
-kde4_add_ui_files(kbabeldict_tmxcompendium_PART_SRCS pwidget.ui )
+kde4_add_ui3_files(kbabeldict_tmxcompendium_PART_SRCS pwidget.ui )
kde4_add_plugin(kbabeldict_tmxcompendium ${kbabeldict_tmxcompendium_PART_SRCS})
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/tmx/pc_factory.cpp #544822:544823
@@ -77,16 +77,16 @@
}
-QObject *PcFactory::createObject( QObject *parent, const char *name
+QObject *PcFactory::createObject( QObject *parent
, const char *classname, const QStringList &)
{
- if(Q3CString(classname) != "SearchEngine")
+ if(QByteArray(classname) != "SearchEngine")
{
kError() << "not a SearchEngine requested" << endl;
return 0;
}
- return new TmxCompendium(parent,name);
+ return new TmxCompendium(parent);
}
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/tmx/pc_factory.h #544822:544823
@@ -48,7 +48,7 @@
PcFactory( QObject *parent=0 );
~PcFactory();
- virtual QObject *createObject( QObject *parent=0, const char *name=0
+ virtual QObject *createObject( QObject *parent=0
, const char *classname="QObject"
, const QStringList &args = QStringList());
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp #544822:544823
@@ -129,7 +129,7 @@
void TmxCompendiumPreferencesWidget::standard()
{
- prefWidget->urlInput->setURL("http://i18n.kde.org/po_overview/@LANG@.messages");
+ prefWidget->urlInput->setUrl(KUrl("http://i18n.kde.org/po_overview/@LANG@.messages"));
prefWidget->caseBtn->setChecked(false);
prefWidget->equalBtn->setChecked(true);
prefWidget->ngramBtn->setChecked(true);
@@ -143,7 +143,7 @@
void TmxCompendiumPreferencesWidget::setURL(const QString url)
{
- prefWidget->urlInput->setURL(url);
+ prefWidget->urlInput->setUrl(url);
changed=false;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic