summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/launcher/.cvsignore2
-rw-r--r--core/settings/launcher/taskbarsettings.cpp23
-rw-r--r--noncore/settings/sshkeys/.cvsignore4
3 files changed, 18 insertions, 11 deletions
diff --git a/core/settings/launcher/.cvsignore b/core/settings/launcher/.cvsignore
new file mode 100644
index 0000000..034a627
--- a/dev/null
+++ b/core/settings/launcher/.cvsignore
@@ -0,0 +1,2 @@
+Makefile*
+moc_* \ No newline at end of file
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index 8f16951..7df9a68 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -83,35 +83,36 @@ void TaskbarSettings::init ( )
for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
QString name;
QPixmap icon;
TaskbarNamedAppletInterface *iface = 0;
QLibrary *lib = new QLibrary ( path + "/" + *it );
lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
- if ( iface ) {
- QString lang = getenv( "LANG" );
- QTranslator *trans = new QTranslator ( qApp );
- QString type = (*it). left ((*it). find ("."));
- QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm";
- if ( trans-> load ( tfn ))
- qApp-> installTranslator ( trans );
+ if ( iface ) {
+
+ QString lang = getenv( "LANG" );
+ QTranslator *trans = new QTranslator ( qApp );
+ QString type = (*it). left ((*it). find ("."));
+ QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm";
+ if ( trans-> load ( tfn ))
+ qApp-> installTranslator ( trans );
else
- delete trans;
- name = iface-> name ( );
- icon = iface-> icon ( );
+ delete trans;
+ name = iface-> name ( );
+ icon = iface-> icon ( );
iface-> release ( );
lib-> unload ( );
} else {
delete lib;
name = (*it). mid ( 3 );
int sep = name. find( ".so" );
if ( sep > 0 )
- name. truncate ( sep );
+ name. truncate ( sep );
sep = name. find ( "applet" );
if ( sep == (int) name.length ( ) - 6 )
name. truncate ( sep );
name[0] = name[0]. upper ( );
}
QCheckListItem *item;
item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
if ( !icon. isNull ( ))
diff --git a/noncore/settings/sshkeys/.cvsignore b/noncore/settings/sshkeys/.cvsignore
new file mode 100644
index 0000000..19bace6
--- a/dev/null
+++ b/noncore/settings/sshkeys/.cvsignore
@@ -0,0 +1,4 @@
+Makefile*
+moc_*
+sshkeysbase.cpp
+sshkeysbase.h \ No newline at end of file