diff options
45 files changed, 152 insertions, 36 deletions
diff --git a/src/aboutdata.cpp b/src/aboutdata.cpp index b5e8cfd..1ae0e98 100644 --- a/src/aboutdata.cpp +++ b/src/aboutdata.cpp @@ -18,11 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "aboutdata.h" #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif +#include "aboutdata.h" + static const char description[] = I18N_NOOP( "<p><b>Taking care of your ideas.</b></p>" "<p>A note-taking application that makes it easy to record ideas as you think, and quickly find them later. " diff --git a/src/aboutdata.h b/src/aboutdata.h index 7d8740e..4b1102c 100644 --- a/src/aboutdata.h +++ b/src/aboutdata.h @@ -26,7 +26,7 @@ @author Sébastien Laoût <slaout@linux62.org> */ -class AboutData : public TDEAboutData +class KDE_EXPORT AboutData : public TDEAboutData { public: AboutData(); diff --git a/src/application.cpp b/src/application.cpp index 6e87bbd..fb361cd 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tdecmdlineargs.h> #include <tqstring.h> #include <tqfile.h> diff --git a/src/archive.cpp b/src/archive.cpp index 1849810..702dde9 100644 --- a/src/archive.cpp +++ b/src/archive.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqstring.h> #include <tqstringlist.h> #include <tqvaluelist.h> diff --git a/src/backup.cpp b/src/backup.cpp index 12fe895..bdc52ea 100644 --- a/src/backup.cpp +++ b/src/backup.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "backup.h" #include "global.h" diff --git a/src/backup.h b/src/backup.h index 2fe4b56..e3086f6 100644 --- a/src/backup.h +++ b/src/backup.h @@ -48,7 +48,7 @@ class BackupDialog : public KDialogBase /** * @author Sébastien Laoût <slaout@linux62.org> */ -class Backup +class KDE_EXPORT Backup { public: static void figureOutBinaryPath(const char *argv0, TQApplication &app); diff --git a/src/basket.cpp b/src/basket.cpp index bc8494d..aa51f8c 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqdragobject.h> #include <tqdom.h> #include <tqpainter.h> @@ -77,7 +81,6 @@ #include "tools.h" #include "debugwindow.h" #include "exporterdialog.h" -#include "config.h" #include "popupmenu.h" #ifdef HAVE_LIBGPGME #include "kgpgme.h" @@ -5520,7 +5523,6 @@ void Basket::lock() #include <tqstringlist.h> #include <klineedit.h> -#include <config.h> #include <tqtextcodec.h> #include "basket.h" diff --git a/src/basket.h b/src/basket.h index 2396ada..b27d26c 100644 --- a/src/basket.h +++ b/src/basket.h @@ -36,7 +36,6 @@ #include "filter.h" #include "note.h" // For Note::Zone -#include "config.h" #define BASKET_USE_DRKONQI diff --git a/src/basket_part.cpp b/src/basket_part.cpp index 2b454c8..df5541c 100644 --- a/src/basket_part.cpp +++ b/src/basket_part.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "basket_part.h" #include <kinstance.h> diff --git a/src/basketfactory.cpp b/src/basketfactory.cpp index ca072d1..e45aa36 100644 --- a/src/basketfactory.cpp +++ b/src/basketfactory.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqdir.h> #include <tdelocale.h> #include <tdemessagebox.h> diff --git a/src/basketlistview.cpp b/src/basketlistview.cpp index 37554eb..380b361 100644 --- a/src/basketlistview.cpp +++ b/src/basketlistview.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "basketlistview.h" #include <tqregexp.h> #include <tdeglobalsettings.h> diff --git a/src/basketproperties.cpp b/src/basketproperties.cpp index 88d94a8..b2f4dc5 100644 --- a/src/basketproperties.cpp +++ b/src/basketproperties.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <kicondialog.h> #include <tqlineedit.h> #include <tqcombobox.h> diff --git a/src/basketstatusbar.cpp b/src/basketstatusbar.cpp index 477652a..e2d7880 100644 --- a/src/basketstatusbar.cpp +++ b/src/basketstatusbar.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tdeparts/statusbarextension.h> #include <kstatusbar.h> #include <tdelocale.h> diff --git a/src/basketstatusbar.h b/src/basketstatusbar.h index 48f58b4..bb8a56a 100644 --- a/src/basketstatusbar.h +++ b/src/basketstatusbar.h @@ -32,7 +32,7 @@ class ClickableLabel; /** @author Sébastien Laoût <slaout@linux62.org> */ -class BasketStatusBar : public TQObject +class KDE_EXPORT BasketStatusBar : public TQObject { Q_OBJECT diff --git a/src/bnpview.cpp b/src/bnpview.cpp index 34a714c..15b8388 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -18,7 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ - /// NEW: +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <tqwidgetstack.h> #include <tqregexp.h> diff --git a/src/bnpview.h b/src/bnpview.h index 780f44d..bbbcb7f 100644 --- a/src/bnpview.h +++ b/src/bnpview.h @@ -54,7 +54,7 @@ class Tag; class State; class Note; -class BNPView : public TQSplitter, virtual public BasketDcopInterface +class KDE_EXPORT BNPView : public TQSplitter, virtual public BasketDcopInterface { Q_OBJECT diff --git a/src/debugwindow.cpp b/src/debugwindow.cpp index 8e8f188..9a2afb6 100644 --- a/src/debugwindow.cpp +++ b/src/debugwindow.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqlayout.h> #include <tqtextbrowser.h> #include <tqstring.h> diff --git a/src/exporterdialog.cpp b/src/exporterdialog.cpp index 97ff0e4..f911627 100644 --- a/src/exporterdialog.cpp +++ b/src/exporterdialog.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <kurlrequester.h> #include <klineedit.h> #include <tdefiledialog.h> diff --git a/src/filter.cpp b/src/filter.cpp index 9701e4e..c79e67d 100644 --- a/src/filter.cpp +++ b/src/filter.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqlayout.h> //#include <tdetoolbarbutton.h> #include <tqtoolbutton.h> diff --git a/src/focusedwidgets.cpp b/src/focusedwidgets.cpp index ec8f84e..9020f69 100644 --- a/src/focusedwidgets.cpp +++ b/src/focusedwidgets.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqpopupmenu.h> #include <tdelocale.h> diff --git a/src/formatimporter.cpp b/src/formatimporter.cpp index ea26091..2a4c1c2 100644 --- a/src/formatimporter.cpp +++ b/src/formatimporter.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqstring.h> #include <tqstringlist.h> #include <tqdir.h> diff --git a/src/global.cpp b/src/global.cpp index 5c75bfb..3ef0bf9 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tdeglobal.h> #include <kstandarddirs.h> #include <tqstring.h> diff --git a/src/global.h b/src/global.h index e987e4a..729bc22 100644 --- a/src/global.h +++ b/src/global.h @@ -38,7 +38,7 @@ class TDEAboutData; * the .h files of variables he use. * @author S�astien Laot */ -class Global +class KDE_EXPORT Global { private: static TQString s_customSavesFolder; diff --git a/src/htmlexporter.cpp b/src/htmlexporter.cpp index 162f352..ad9a555 100644 --- a/src/htmlexporter.cpp +++ b/src/htmlexporter.cpp @@ -18,13 +18,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "htmlexporter.h" #include "bnpview.h" #include "basketlistview.h" #include "basket.h" #include "note.h" #include "tools.h" -#include "config.h" #include "tag.h" #include <tdeapplication.h> diff --git a/src/kgpgme.cpp b/src/kgpgme.cpp index 18a5e01..ee4372c 100644 --- a/src/kgpgme.cpp +++ b/src/kgpgme.cpp @@ -18,7 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kgpgme.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #ifdef HAVE_LIBGPGME @@ -37,6 +39,8 @@ #include <stdlib.h> #include <unistd.h> +#include "kgpgme.h" + // KGpgSelKey class based on class in KGpg with the same name class KGpgSelKey : public KDialogBase diff --git a/src/kgpgme.h b/src/kgpgme.h index e514500..7148bab 100644 --- a/src/kgpgme.h +++ b/src/kgpgme.h @@ -20,10 +20,6 @@ #ifndef KGPGME_H #define KGPGME_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef HAVE_LIBGPGME #include <gpgme.h> diff --git a/src/kiconcanvas.cpp b/src/kiconcanvas.cpp index 444144d..fffc3b9 100644 --- a/src/kiconcanvas.cpp +++ b/src/kiconcanvas.cpp @@ -13,11 +13,13 @@ * exact licensing terms. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "kiconcanvas.h" #include "kicondialog.h" -#include <config.h> - #include <kiconviewsearchline.h> #include <tdeapplication.h> diff --git a/src/linklabel.cpp b/src/linklabel.cpp index 2dca82f..96c78e5 100644 --- a/src/linklabel.cpp +++ b/src/linklabel.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqlabel.h> #include <kurl.h> #include <tqlayout.h> diff --git a/src/main.cpp b/src/main.cpp index f5f8441..336eb53 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <tdecmdlineargs.h> @@ -46,10 +50,6 @@ #include "basket_options.h" #include "backup.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /* Thanks to JuK for this Application class */ /*#if KDE_IS_VERSION( 3, 1, 90 ) typedef KUniqueApplication Application; // KDE 3.2 and later already re-show the main window diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 09a3e5d..78b3c7d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqtabwidget.h> #include <tqlayout.h> #include <tqtooltip.h> diff --git a/src/newbasketdialog.cpp b/src/newbasketdialog.cpp index 96a277d..18f1eb0 100644 --- a/src/newbasketdialog.cpp +++ b/src/newbasketdialog.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <kicondialog.h> #include <tqlineedit.h> #include <kiconview.h> diff --git a/src/note.cpp b/src/note.cpp index 227df8a..6486de3 100644 --- a/src/note.cpp +++ b/src/note.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqpainter.h> #include <tdeglobalsettings.h> #include <tqstyle.h> diff --git a/src/notecontent.cpp b/src/notecontent.cpp index d7da39d..3574d7c 100644 --- a/src/notecontent.cpp +++ b/src/notecontent.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqfile.h> #include <tqdir.h> #include <tqdom.h> diff --git a/src/notedrag.cpp b/src/notedrag.cpp index f139652..c4275d0 100644 --- a/src/notedrag.cpp +++ b/src/notedrag.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqdragobject.h> #include <tqdir.h> #include <tqpainter.h> diff --git a/src/noteedit.cpp b/src/noteedit.cpp index b6f3190..6261c6c 100644 --- a/src/noteedit.cpp +++ b/src/noteedit.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqlabel.h> #include <tqlayout.h> #include <tqlineedit.h> diff --git a/src/notefactory.cpp b/src/notefactory.cpp index 6074964..2b87549 100644 --- a/src/notefactory.cpp +++ b/src/notefactory.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqstring.h> #include <kurl.h> #include <tqpixmap.h> diff --git a/src/password.cpp b/src/password.cpp index 55e5c21..b13fc0d 100644 --- a/src/password.cpp +++ b/src/password.cpp @@ -18,7 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "password.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #ifdef HAVE_LIBGPGME @@ -32,6 +34,8 @@ #include <kgpgme.h> #include <basket.h> +#include "password.h" + PasswordDlg::PasswordDlg(TQWidget *parent, const char *name) :KDialogBase(Plain, i18n("Password Protection"), Ok|Cancel, Ok, parent, name, /*modal=*/true, /*separator=*/true), w(0) diff --git a/src/password.h b/src/password.h index 726048a..0c1273c 100644 --- a/src/password.h +++ b/src/password.h @@ -20,10 +20,6 @@ #ifndef PASSWORD_H #define PASSWORD_H -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef Q_MOC_RUN #define HAVE_LIBGPGME #endif diff --git a/src/settings.cpp b/src/settings.cpp index 8dba4f1..eada64f 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -18,7 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <config.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqlayout.h> #include <tqlineedit.h> #include <tqhbox.h> diff --git a/src/settings.h b/src/settings.h index b9575f1..93603da 100644 --- a/src/settings.h +++ b/src/settings.h @@ -53,7 +53,7 @@ class LinkLookEditWidget; class RunCommandRequester; class IconSizeCombo; -class GeneralPage : public TDECModule +class KDE_EXPORT GeneralPage : public TDECModule { Q_OBJECT @@ -82,7 +82,7 @@ class GeneralPage : public TDECModule KIntNumInput *m_timeToShowOnMouseIn; }; -class BasketsPage : public TDECModule +class KDE_EXPORT BasketsPage : public TDECModule { Q_OBJECT @@ -114,7 +114,7 @@ class BasketsPage : public TDECModule KIntNumInput *m_reLockTimeoutMinutes; }; -class NewNotesPage : public TDECModule +class KDE_EXPORT NewNotesPage : public TDECModule { Q_OBJECT @@ -143,7 +143,7 @@ class NewNotesPage : public TDECModule TQCheckBox *m_viewSoundFileContent; }; -class NotesAppearancePage : public TDECModule +class KDE_EXPORT NotesAppearancePage : public TDECModule { Q_OBJECT @@ -164,7 +164,7 @@ class NotesAppearancePage : public TDECModule LinkLookEditWidget *m_launcherLook; }; -class ApplicationsPage : public TDECModule +class KDE_EXPORT ApplicationsPage : public TDECModule { Q_OBJECT @@ -191,7 +191,7 @@ class ApplicationsPage : public TDECModule /** Handle all global variables (to avoid lot of extern declarations) * @author S�astien Laot */ -class Settings // FIXME: Distaptch new config events ? +class KDE_EXPORT Settings // FIXME: Distaptch new config events ? { protected: /** Main window */ diff --git a/src/softwareimporters.cpp b/src/softwareimporters.cpp index ac8c043..1b37d2c 100644 --- a/src/softwareimporters.cpp +++ b/src/softwareimporters.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqstring.h> #include <tqdir.h> #include <kstandarddirs.h> diff --git a/src/systemtray.cpp b/src/systemtray.cpp index b8a3280..a101e66 100644 --- a/src/systemtray.cpp +++ b/src/systemtray.cpp @@ -20,6 +20,10 @@ /** KSystemTray2 */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + // To draw the systray screenshot image: #include <tqdockwindow.h> #include <tqmovie.h> diff --git a/src/systemtray.h b/src/systemtray.h index ef341db..0a582ef 100644 --- a/src/systemtray.h +++ b/src/systemtray.h @@ -29,7 +29,7 @@ class MainWindow; * hopefuly integrated in KDE 3.4 * @author S�astien Laot */ -class KSystemTray2 : public KSystemTray +class KDE_EXPORT KSystemTray2 : public KSystemTray { Q_OBJECT diff --git a/src/tag.cpp b/src/tag.cpp index 213e44d..429b5fa 100644 --- a/src/tag.cpp +++ b/src/tag.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tdeapplication.h> #include <tdestyle.h> #include <kiconloader.h> diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp index f20aeb3..8c43b5e 100644 --- a/src/tagsedit.cpp +++ b/src/tagsedit.cpp @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tqtooltip.h> #include <tqlabel.h> #include <tqlineedit.h> |