CVS commit by mlaurent: Remove klanguagebutton M +1 -1 Makefile.am 1.58 M +3 -3 kdm-appear.cpp 1.86 R klanguagebutton.cpp 1.10 R klanguagebutton.h 1.2 --- kdebase/kcontrol/kdm/Makefile.am #1.57:1.58 @@ -2,5 +2,5 @@ kcm_kdm_la_SOURCES = background.cpp kdm-appear.cpp kdm-font.cpp kdm-sess.cpp \ - kdm-users.cpp kdm-conv.cpp klanguagebutton.cpp main.cpp + kdm-users.cpp kdm-conv.cpp main.cpp kcm_kdm_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined --- kdebase/kcontrol/kdm/kdm-appear.cpp #1.85:1.86 @@ -279,5 +279,5 @@ KDMAppearanceWidget::KDMAppearanceWidget langcombo = new KLanguageButton(group); loadLanguageList(langcombo); - connect(langcombo, SIGNAL(activated(int)), SLOT(changed())); + connect(langcombo, SIGNAL(activated(const QString &)), SLOT(changed())); label = new QLabel(langcombo, i18n("Languag&e:"), group); QGridLayout *hbox = new QGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); @@ -509,5 +509,5 @@ void KDMAppearanceWidget::save() config->writeEntry("GreeterPosY", yLineEdit->text()); - config->writeEntry("Language", langcombo->currentTag()); + config->writeEntry("Language", langcombo->current()); }