[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/libkleo/ui
From: Marc Mutz <mutz () kde ! org>
Date: 2008-04-23 7:33:54
Message-ID: 1208936034.409804.27281.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 800055 by mutz:
Qt4-ify
M +29 -32 cryptoconfigmodule.cpp
M +28 -30 cryptoconfigmodule_p.h
--- trunk/KDE/kdepim/libkleo/ui/cryptoconfigmodule.cpp #800054:800055
@@ -113,7 +113,8 @@
scrollArea->setWidgetResizable( true );
CryptoConfigComponentGUI* compGUI =
- new CryptoConfigComponentGUI( this, comp, scrollArea, (*it).toLocal8Bit() );
+ new CryptoConfigComponentGUI( this, comp, scrollArea );
+ compGUI->setObjectName( *it );
scrollArea->setWidget( compGUI );
// KJanusWidget doesn't seem to have iterators, so we store a copy...
mComponentGUIs.append( compGUI );
@@ -171,11 +172,10 @@
Kleo::CryptoConfigComponentGUI::CryptoConfigComponentGUI(
CryptoConfigModule* module, Kleo::CryptoConfigComponent* component,
- QWidget* parent, const char* name )
+ QWidget* parent )
: QWidget( parent ),
mComponent( component )
{
- setObjectName( name );
QGridLayout * glay = new QGridLayout( this );
glay->setSpacing( KDialog::spacingHint() );
const QStringList groups = mComponent->groupList();
@@ -228,10 +228,9 @@
Kleo::CryptoConfigGroupGUI::CryptoConfigGroupGUI(
CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
- QGridLayout * glay, QWidget* widget, const char* name )
+ QGridLayout * glay, QWidget* widget)
: QObject( module ), mGroup( group )
{
- setObjectName( name );
const int startRow = glay->rowCount();
const QStringList entries = mGroup->entryList();
for( QStringList::const_iterator it = entries.begin(), end = entries.end() ; it != \
end; ++it ) { @@ -287,17 +286,17 @@
////
-CryptoConfigEntryGUI* Kleo::CryptoConfigEntryGUIFactory::createEntryGUI( \
CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const QString& entryName, \
QGridLayout * glay, QWidget* widget, const char* name ) +CryptoConfigEntryGUI* \
Kleo::CryptoConfigEntryGUIFactory::createEntryGUI( CryptoConfigModule* module, \
Kleo::CryptoConfigEntry* entry, const QString& entryName, QGridLayout * glay, \
QWidget* widget ) {
if ( entry->isList() ) {
switch( entry->argType() ) {
case Kleo::CryptoConfigEntry::ArgType_None:
// A list of options with no arguments (e.g. -v -v -v) is shown as a spinbox
- return new CryptoConfigEntrySpinBox( module, entry, entryName, glay, widget, \
name ); + return new CryptoConfigEntrySpinBox( module, entry, entryName, glay, \
widget ); case Kleo::CryptoConfigEntry::ArgType_Int:
case Kleo::CryptoConfigEntry::ArgType_UInt:
// Let people type list of numbers (1,2,3....). Untested.
- return new CryptoConfigEntryLineEdit( module, entry, entryName, glay, widget, \
name ); + return new CryptoConfigEntryLineEdit( module, entry, entryName, glay, \
widget ); case Kleo::CryptoConfigEntry::ArgType_URL:
case Kleo::CryptoConfigEntry::ArgType_Path:
case Kleo::CryptoConfigEntry::ArgType_DirPath:
@@ -305,7 +304,7 @@
kWarning(5150) <<"No widget implemented for list of type" << entry->argType();
return 0; // TODO when the need arises :)
case Kleo::CryptoConfigEntry::ArgType_LDAPURL:
- return new CryptoConfigEntryLDAPURL( module, entry, entryName, glay, widget, \
name ); + return new CryptoConfigEntryLDAPURL( module, entry, entryName, glay, \
widget ); }
kWarning(5150) <<"No widget implemented for list of (unknown) type" << \
entry->argType(); return 0;
@@ -313,21 +312,21 @@
switch( entry->argType() ) {
case Kleo::CryptoConfigEntry::ArgType_None:
- return new CryptoConfigEntryCheckBox( module, entry, entryName, glay, widget, \
name ); + return new CryptoConfigEntryCheckBox( module, entry, entryName, glay, \
widget ); case Kleo::CryptoConfigEntry::ArgType_Int:
case Kleo::CryptoConfigEntry::ArgType_UInt:
- return new CryptoConfigEntrySpinBox( module, entry, entryName, glay, widget, \
name ); + return new CryptoConfigEntrySpinBox( module, entry, entryName, glay, \
widget ); case Kleo::CryptoConfigEntry::ArgType_URL:
- return new CryptoConfigEntryURL( module, entry, entryName, glay, widget, name );
+ return new CryptoConfigEntryURL( module, entry, entryName, glay, widget );
case Kleo::CryptoConfigEntry::ArgType_Path:
- return new CryptoConfigEntryPath( module, entry, entryName, glay, widget, name \
); + return new CryptoConfigEntryPath( module, entry, entryName, glay, widget );
case Kleo::CryptoConfigEntry::ArgType_DirPath:
- return new CryptoConfigEntryDirPath( module, entry, entryName, glay, widget, \
name ); + return new CryptoConfigEntryDirPath( module, entry, entryName, glay, \
widget ); case Kleo::CryptoConfigEntry::ArgType_LDAPURL:
kWarning(5150) <<"No widget implemented for type" << entry->argType();
return 0; // TODO when the need arises :)
case Kleo::CryptoConfigEntry::ArgType_String:
- return new CryptoConfigEntryLineEdit( module, entry, entryName, glay, widget, \
name ); + return new CryptoConfigEntryLineEdit( module, entry, entryName, glay, \
widget ); }
kWarning(5150) <<"No widget implemented for (unknown) type" << entry->argType();
return 0;
@@ -338,11 +337,9 @@
Kleo::CryptoConfigEntryGUI::CryptoConfigEntryGUI(
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
- const QString& entryName,
- const char* name )
+ const QString& entryName )
: QObject( module ), mEntry( entry ), mName( entryName ), mChanged( false )
{
- setObjectName( name );
connect( this, SIGNAL( changed() ), module, SIGNAL( changed() ) );
}
@@ -365,8 +362,8 @@
Kleo::CryptoConfigEntryLineEdit::CryptoConfigEntryLineEdit(
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry, const QString& entryName,
- QGridLayout * glay, QWidget* widget, const char* name )
- : CryptoConfigEntryGUI( module, entry, entryName, name )
+ QGridLayout * glay, QWidget* widget )
+ : CryptoConfigEntryGUI( module, entry, entryName )
{
const int row = glay->rowCount();
mLineEdit = new KLineEdit( widget );
@@ -397,8 +394,8 @@
Kleo::CryptoConfigEntryPath::CryptoConfigEntryPath(
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry, const QString& entryName,
- QGridLayout * glay, QWidget* widget, const char* name )
- : CryptoConfigEntryGUI( module, entry, entryName, name ),
+ QGridLayout * glay, QWidget* widget )
+ : CryptoConfigEntryGUI( module, entry, entryName ),
mUrlRequester( 0 ),
mFileNameRequester( 0 )
{
@@ -459,8 +456,8 @@
Kleo::CryptoConfigEntryDirPath::CryptoConfigEntryDirPath(
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry, const QString& entryName,
- QGridLayout * glay, QWidget* widget, const char* name )
- : CryptoConfigEntryGUI( module, entry, entryName, name ),
+ QGridLayout * glay, QWidget* widget )
+ : CryptoConfigEntryGUI( module, entry, entryName ),
mUrlRequester( 0 ),
mFileNameRequester( 0 )
{
@@ -521,8 +518,8 @@
Kleo::CryptoConfigEntryURL::CryptoConfigEntryURL(
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry, const QString& entryName,
- QGridLayout * glay, QWidget* widget, const char* name )
- : CryptoConfigEntryGUI( module, entry, entryName, name ),
+ QGridLayout * glay, QWidget* widget )
+ : CryptoConfigEntryGUI( module, entry, entryName ),
#ifndef ONLY_KLEO
mUrlRequester( 0 ),
#endif
@@ -577,8 +574,8 @@
Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox(
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry, const QString& entryName,
- QGridLayout * glay, QWidget* widget, const char* name )
- : CryptoConfigEntryGUI( module, entry, entryName, name )
+ QGridLayout * glay, QWidget* widget )
+ : CryptoConfigEntryGUI( module, entry, entryName )
{
if ( entry->argType() == Kleo::CryptoConfigEntry::ArgType_None && entry->isList() \
) { @@ -645,8 +642,8 @@
Kleo::CryptoConfigEntryCheckBox::CryptoConfigEntryCheckBox(
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry, const QString& entryName,
- QGridLayout * glay, QWidget* widget, const char* name )
- : CryptoConfigEntryGUI( module, entry, entryName, name )
+ QGridLayout * glay, QWidget* widget )
+ : CryptoConfigEntryGUI( module, entry, entryName )
{
const int row = glay->rowCount();
mCheckBox = new QCheckBox( widget );
@@ -673,8 +670,8 @@
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
const QString& entryName,
- QGridLayout * glay, QWidget* widget, const char* name )
- : CryptoConfigEntryGUI( module, entry, entryName, name )
+ QGridLayout * glay, QWidget* widget )
+ : CryptoConfigEntryGUI( module, entry, entryName )
{
mLabel = new QLabel( widget );
mPushButton = new QPushButton( i18n( "Edit..." ), widget );
--- trunk/KDE/kdepim/libkleo/ui/cryptoconfigmodule_p.h #800054:800055
@@ -69,7 +69,7 @@
public:
CryptoConfigComponentGUI( CryptoConfigModule* module, \
Kleo::CryptoConfigComponent* component,
- QWidget* parent, const char* name = 0 );
+ QWidget* parent=0 );
bool save();
void load();
@@ -88,7 +88,7 @@
public:
CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* \
group,
- QGridLayout * layout, QWidget* parent, const char* name = \
0 ); + QGridLayout * layout, QWidget* parent=0 );
bool save();
void load();
@@ -108,7 +108,7 @@
static CryptoConfigEntryGUI* createEntryGUI(
CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry, const QString& entryName,
- QGridLayout * layout, QWidget* widget, const char* name = 0 );
+ QGridLayout * layout, QWidget* widget );
};
/**
@@ -119,9 +119,7 @@
public:
CryptoConfigEntryGUI( CryptoConfigModule* module,
Kleo::CryptoConfigEntry* entry,
- const QString& entryName,
- const char* name = 0 );
- virtual ~CryptoConfigEntryGUI() {}
+ const QString& entryName );
void load() { doLoad(); mChanged = false; }
void save() { Q_ASSERT( mChanged ); doSave(); mChanged = false; }
@@ -130,10 +128,10 @@
QString description() const;
bool isChanged() const { return mChanged; }
- signals:
+ Q_SIGNALS:
void changed();
- protected slots:
+ protected Q_SLOTS:
void slotChanged() {
mChanged = true;
emit changed();
@@ -159,10 +157,10 @@
Kleo::CryptoConfigEntry* entry,
const QString& entryName,
QGridLayout * layout,
- QWidget* parent, const char* name = 0 );
+ QWidget* parent=0 );
- virtual void doSave();
- virtual void doLoad();
+ /* reimp */ void doSave();
+ /* reimp */ void doLoad();
private:
KLineEdit* mLineEdit;
};
@@ -178,10 +176,10 @@
Kleo::CryptoConfigEntry* entry,
const QString& entryName,
QGridLayout * layout,
- QWidget* parent, const char* name = 0 );
+ QWidget* parent=0 );
- virtual void doSave();
- virtual void doLoad();
+ /* reimp */ void doSave();
+ /* reimp */ void doLoad();
private:
KUrlRequester* mUrlRequester;
Kleo::FileNameRequester * mFileNameRequester;
@@ -198,10 +196,10 @@
Kleo::CryptoConfigEntry* entry,
const QString& entryName,
QGridLayout * layout,
- QWidget* parent, const char* name = 0 );
+ QWidget* parent=0 );
- virtual void doSave();
- virtual void doLoad();
+ /* reimp */ void doSave();
+ /* reimp */ void doLoad();
private:
KUrlRequester* mUrlRequester;
Kleo::FileNameRequester * mFileNameRequester;
@@ -218,10 +216,10 @@
Kleo::CryptoConfigEntry* entry,
const QString& entryName,
QGridLayout * layout,
- QWidget* parent, const char* name = 0 );
+ QWidget* parent=0 );
- virtual void doSave();
- virtual void doLoad();
+ /* reimp */ void doSave();
+ /* reimp */ void doLoad();
private:
QLineEdit * mLineEdit;
@@ -239,9 +237,9 @@
Kleo::CryptoConfigEntry* entry,
const QString& entryName,
QGridLayout * layout,
- QWidget* parent, const char* name = 0 );
- virtual void doSave();
- virtual void doLoad();
+ QWidget* parent=0 );
+ /* reimp */ void doSave();
+ /* reimp */ void doLoad();
private:
enum { Int, UInt, ListOfNone } mKind;
KIntNumInput* mNumInput;
@@ -258,9 +256,9 @@
Kleo::CryptoConfigEntry* entry,
const QString& entryName,
QGridLayout * layout,
- QWidget* parent, const char* name = 0 );
- virtual void doSave();
- virtual void doLoad();
+ QWidget* parent=0 );
+ /* reimp */ void doSave();
+ /* reimp */ void doLoad();
private:
QCheckBox* mCheckBox;
};
@@ -276,10 +274,10 @@
Kleo::CryptoConfigEntry* entry,
const QString& entryName,
QGridLayout * layout,
- QWidget* parent, const char* name = 0 );
- virtual void doSave();
- virtual void doLoad();
- private slots:
+ QWidget* parent=0 );
+ /* reimp */ void doSave();
+ /* reimp */ void doLoad();
+ private Q_SLOTS:
void slotOpenDialog();
private:
void setURLList( const KUrl::List& urlList );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic