diff --git a/clients/b2/config/config.cpp b/clients/b2/config/config.cpp index a847871056..a9f343d8e1 100644 --- a/clients/b2/config/config.cpp +++ b/clients/b2/config/config.cpp @@ -36,7 +36,7 @@ extern "C" B2Config::B2Config( KConfig* conf, QWidget* parent ) : QObject( parent ) { - KGlobal::locale()->insertCatalogue("kwin_b2_config"); + KGlobal::locale()->insertCatalog("kwin_b2_config"); b2Config = new KConfig("kwinb2rc"); gb = new KVBox(parent); diff --git a/clients/default/config/config.cpp b/clients/default/config/config.cpp index e58468da8a..659eedb003 100644 --- a/clients/default/config/config.cpp +++ b/clients/default/config/config.cpp @@ -32,7 +32,7 @@ extern "C" KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, QWidget* parent ) : QObject( parent ) { - KGlobal::locale()->insertCatalogue("kwin_clients"); + KGlobal::locale()->insertCatalog("kwin_clients"); highcolor = QPixmap::defaultDepth() > 8; gb = new KVBox( parent ); gb->setSpacing( KDialog::spacingHint() ); diff --git a/clients/keramik/config/config.cpp b/clients/keramik/config/config.cpp index c1ecd14217..260ca2b0f8 100644 --- a/clients/keramik/config/config.cpp +++ b/clients/keramik/config/config.cpp @@ -51,7 +51,7 @@ extern "C" KeramikConfig::KeramikConfig( KConfig* conf, QWidget* parent ) : QObject( parent ) { - KGlobal::locale()->insertCatalogue("kwin_clients"); + KGlobal::locale()->insertCatalog("kwin_clients"); c = new KConfig( "kwinkeramikrc" ); ui = new KeramikConfigUI( parent ); diff --git a/clients/modernsystem/config/config.cpp b/clients/modernsystem/config/config.cpp index 71c0ba1897..217ab1401f 100644 --- a/clients/modernsystem/config/config.cpp +++ b/clients/modernsystem/config/config.cpp @@ -33,7 +33,7 @@ extern "C" ModernSysConfig::ModernSysConfig(KConfig* conf, QWidget* parent) : QObject(parent) { clientrc = new KConfig("kwinmodernsysrc"); - KGlobal::locale()->insertCatalogue("kwin_clients"); + KGlobal::locale()->insertCatalog("kwin_clients"); mainw = new QWidget(parent); vbox = new QVBoxLayout(mainw); vbox->setSpacing(6); diff --git a/clients/plastik/config/config.cpp b/clients/plastik/config/config.cpp index 895fb0dd9e..9784c16e39 100644 --- a/clients/plastik/config/config.cpp +++ b/clients/plastik/config/config.cpp @@ -39,7 +39,7 @@ PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent) { // create the configuration object m_config = new KConfig("kwinplastikrc"); - KGlobal::locale()->insertCatalogue("kwin_clients"); + KGlobal::locale()->insertCatalog("kwin_clients"); // create and show the configuration dialog m_dialog = new ConfigDialog(parent); diff --git a/clients/quartz/config/config.cpp b/clients/quartz/config/config.cpp index 784653d7e8..8afcf04b3e 100644 --- a/clients/quartz/config/config.cpp +++ b/clients/quartz/config/config.cpp @@ -35,7 +35,7 @@ QuartzConfig::QuartzConfig( KConfig* conf, QWidget* parent ) : QObject( parent ) { quartzConfig = new KConfig("kwinquartzrc"); - KGlobal::locale()->insertCatalogue("kwin_clients"); + KGlobal::locale()->insertCatalog("kwin_clients"); gb = new KVBox( parent ); cbColorBorder = new QCheckBox( i18n("Draw window frames using &titlebar colors"), gb ); diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp index c6aa4475bf..2f2669d52d 100644 --- a/kcmkwin/kwinoptions/main.cpp +++ b/kcmkwin/kwinoptions/main.cpp @@ -41,7 +41,7 @@ extern "C" KDE_EXPORT KCModule *create_kwinfocus(QWidget *parent, const char *name) { //CT there's need for decision: kwm or kwin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + KGlobal::locale()->insertCatalog("kcmkwm"); KConfig *c = new KConfig("kwinrc", false, true); return new KFocusConfig(true, c, parent, name); } @@ -49,14 +49,14 @@ extern "C" KDE_EXPORT KCModule *create_kwinactions(QWidget *parent, const char *name) { //CT there's need for decision: kwm or kwin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + KGlobal::locale()->insertCatalog("kcmkwm"); return new KActionsOptions( parent, name); } KDE_EXPORT KCModule *create_kwinmoving(QWidget *parent, const char *name) { //CT there's need for decision: kwm or kwin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + KGlobal::locale()->insertCatalog("kcmkwm"); KConfig *c = new KConfig("kwinrc", false, true); return new KMovingConfig(true, c, parent, name); } @@ -64,7 +64,7 @@ extern "C" KDE_EXPORT KCModule *create_kwinadvanced(QWidget *parent, const char *name) { //CT there's need for decision: kwm or kwin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + KGlobal::locale()->insertCatalog("kcmkwm"); KConfig *c = new KConfig("kwinrc", false, true); return new KAdvancedConfig(true, c, parent, name); } @@ -72,7 +72,7 @@ extern "C" KDE_EXPORT KCModule *create_kwintranslucency(QWidget *parent, const char *name) { //CT there's need for decision: kwm or kwin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + KGlobal::locale()->insertCatalog("kcmkwm"); KConfig *c = new KConfig("kwinrc", false, true); return new KTranslucencyConfig(true, c, parent, name); } @@ -80,7 +80,7 @@ extern "C" KDE_EXPORT KCModule *create_kwinoptions ( QWidget *parent, const char* name) { //CT there's need for decision: kwm or kwin? - KGlobal::locale()->insertCatalogue("kcmkwm"); + KGlobal::locale()->insertCatalog("kcmkwm"); return new KWinOptions( parent, name); } } diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp index 67783548d8..43b38b69fa 100644 --- a/kcmkwin/kwinrules/kcm.cpp +++ b/kcmkwin/kwinrules/kcm.cpp @@ -33,7 +33,7 @@ extern "C" KDE_EXPORT KCModule *create_kwinrules( QWidget *parent, const char *name ) { //CT there's need for decision: kwm or kwin? - KGlobal::locale()->insertCatalogue( "kcmkwinrules" ); + KGlobal::locale()->insertCatalog( "kcmkwinrules" ); return new KWinInternal::KCMRules( parent, name ); } diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp index 44a18c9d39..6a3f8f5cc9 100644 --- a/kcmkwin/kwinrules/main.cpp +++ b/kcmkwin/kwinrules/main.cpp @@ -271,7 +271,7 @@ static const KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) { - KLocale::setMainCatalogue( "kcmkwinrules" ); + KLocale::setMainCatalog( "kcmkwinrules" ); KCmdLineArgs::init( argc, argv, "kwin_rules_dialog", I18N_NOOP( "KWin" ), I18N_NOOP( "KWin helper utility" ), "1.0" ); KCmdLineArgs::addCmdLineOptions( options ); diff --git a/killer/killer.cpp b/killer/killer.cpp index f39c4355db..b464eeafaa 100644 --- a/killer/killer.cpp +++ b/killer/killer.cpp @@ -46,7 +46,7 @@ static const KCmdLineOptions options[] = int main( int argc, char* argv[] ) { - KLocale::setMainCatalogue( "kwin" ); // the messages are in kwin's .po file + KLocale::setMainCatalog( "kwin" ); // the messages are in kwin's .po file KCmdLineArgs::init( argc, argv, "kwin_killer_helper", I18N_NOOP( "KWin" ), I18N_NOOP( "KWin helper utility" ), "1.0" ); KCmdLineArgs::addCmdLineOptions( options ); diff --git a/lib/kdecoration_plugins_p.cpp b/lib/kdecoration_plugins_p.cpp index 07fde37eba..8ef43e0944 100644 --- a/lib/kdecoration_plugins_p.cpp +++ b/lib/kdecoration_plugins_p.cpp @@ -169,13 +169,13 @@ bool KDecorationPlugins::loadPlugin( QString nameStr ) // For clients in kdeartwork QString catalogue = nameStr; catalogue.replace( "kwin3_", "kwin_" ); - KGlobal::locale()->insertCatalogue( catalogue ); + KGlobal::locale()->insertCatalog( catalogue ); // For KCommonDecoration based clients - KGlobal::locale()->insertCatalogue( "kwin_lib" ); + KGlobal::locale()->insertCatalog( "kwin_lib" ); // For clients in kdebase - KGlobal::locale()->insertCatalogue( "kwin_clients" ); + KGlobal::locale()->insertCatalog( "kwin_clients" ); // For clients in kdeartwork - KGlobal::locale()->insertCatalogue( "kwin_art_clients" ); + KGlobal::locale()->insertCatalog( "kwin_art_clients" ); old_library = oldLibrary; // save for delayed destroying old_fact = oldFactory; diff --git a/useractions.cpp b/useractions.cpp index a0499db1fd..f1921122e4 100644 --- a/useractions.cpp +++ b/useractions.cpp @@ -33,6 +33,7 @@ License. See the file "COPYING" for the exact licensing terms. #include #include #include +#include #include "killwindow.h" #include "tabbox.h" @@ -98,7 +99,7 @@ Q3PopupMenu* Workspace::clientPopup() popup->insertSeparator(); if (!KGlobal::config()->isImmutable() && - !kapp->authorizeControlModules(Workspace::configModules(true)).isEmpty()) + !KAuthorized::authorizeKActionControlModules(Workspace::configModules(true)).isEmpty()) { popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior..."), this, SLOT( configureWM() )); popup->insertSeparator(); @@ -974,7 +975,7 @@ void Workspace::slotWindowOperations() void Workspace::showWindowMenu( const QRect &pos, Client* cl ) { - if (!kapp->authorizeKAction("kwin_rmb")) + if (!KAuthorized::authorizeKAction("kwin_rmb")) return; if( !cl ) return; diff --git a/workspace.cpp b/workspace.cpp index 76445b6e35..6771c36994 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -47,6 +47,7 @@ License. See the file "COPYING" for the exact licensing terms. #include #include #include +#include namespace KWinInternal { @@ -964,7 +965,7 @@ QStringList Workspace::configModules(bool controlCenter) args << "kde-kwindecoration.desktop"; if (controlCenter) args << "kde-kwinoptions.desktop"; - else if (kapp->authorizeControlModule("kde-kwinoptions.desktop")) + else if (KAuthorized::authorizeKActionControlModule("kde-kwinoptions.desktop")) args << "kwinactions" << "kwinfocus" << "kwinmoving" << "kwinadvanced" << "kwinrules" << "kwintranslucency"; return args; }