diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -194,7 +194,6 @@ kmkernel.cpp kmcommands.cpp kmreadermainwin.cpp - kmstartup.cpp kmmainwidget.cpp aboutdata.cpp mailserviceimpl.cpp diff --git a/src/kmail_part.cpp b/src/kmail_part.cpp --- a/src/kmail_part.cpp +++ b/src/kmail_part.cpp @@ -28,7 +28,6 @@ #include "kmmainwin.h" #include "kmmainwidget.h" -#include "kmstartup.h" #include "aboutdata.h" #include @@ -65,9 +64,6 @@ KMMigrateApplication migrate; migrate.migrate(); - // import i18n data and icons from libraries: - KMail::insertLibraryIcons(); - //local, do the init KMKernel *mKMailKernel = new KMKernel(); mKMailKernel->init(); diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp --- a/src/kmkernel.cpp +++ b/src/kmkernel.cpp @@ -11,7 +11,6 @@ #include #include using KPIM::BroadcastStatus; -#include "kmstartup.h" #include "kmmainwin.h" #include "editor/composer.h" #include "kmreadermainwin.h" diff --git a/src/kmstartup.h b/src/kmstartup.h deleted file mode 100644 --- a/src/kmstartup.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - This file is part of KMail, the KDE mail client. - Copyright (c) 2000 Don Sanders - - KMail is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. - - KMail is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -#ifndef KMSTARTUP -#define KMSTARTUP - -#include "kmail_export.h" - -namespace KMail { -KMAIL_EXPORT void insertLibraryIcons(); -} - -#endif diff --git a/src/kmstartup.cpp b/src/kmstartup.cpp deleted file mode 100644 --- a/src/kmstartup.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - This file is part of KMail, the KDE mail client. - Copyright (c) 2000 Don Sanders - - KMail is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. - - KMail is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "kmstartup.h" - -#include - -namespace KMail { -void insertLibraryIcons() -{ - static const char *const iconPath[] = { - "libkleopatra", - "messagelist", - "libmessageviewer", - "kmail2" - }; - - KIconLoader *il = KIconLoader::global(); - unsigned int catalogSize = (sizeof iconPath / sizeof *iconPath); - for (unsigned int i = 0; i < catalogSize; ++i) { - il->addAppDir(QLatin1String(iconPath[i])); - } -} -} diff --git a/src/main.cpp b/src/main.cpp --- a/src/main.cpp +++ b/src/main.cpp @@ -30,8 +30,6 @@ #include "aboutdata.h" -#include "kmstartup.h" - #include #include #include @@ -145,9 +143,6 @@ KMMigrateApplication migrate; migrate.migrate(); - // import i18n data and icons from libraries: - KMail::insertLibraryIcons(); - //local, do the init KMKernel kmailKernel; kmailKernel.init();