Commit 69f41a6a authored by Clarence Dang's avatar Clarence Dang
Browse files

Merge /branches/work/~dang/kdegraphics/kolourpaint/ -r651231(branch...

Merge /branches/work/~dang/kdegraphics/kolourpaint/ -r651231(branch base):651305 to be up-to-date.  The changes were massive but non-functional:

* Change to CamelCase filenames

* A small amount of renaming of methods and filenames

* Split kpcolortoolbar.{h,cpp}

* Copyright 2007

This removes the lazy <kpdocumentsaveoptions.h> and <kpdocument.h>
forwarding headers that created trouble on case-insensitive file systems
(MacOS X).

CCMAIL: Benjamin Reed <rangerrick@befunk.com>

"svn merge" seems very slow - I'm glad nobody committed in the meantime!


svn path=/trunk/KDE/kdegraphics/kolourpaint/; revision=651306
parent e18250eb
This diff is collapsed.
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......
......@@ -2,7 +2,7 @@
KolourPaint Version 4.0.0pre (KDE 4.0.0 Release Frozen ???)
http://www.kolourpaint.org/
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
For licensing and warranty information, read COPYING.
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -48,7 +48,7 @@
#include <knuminput.h>
#include <kpEffectBalance.h>
#include <kppixmapfx.h>
#include <kpPixmapFX.h>
#if DEBUG_KP_EFFECT_BALANCE
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -31,7 +31,7 @@
#include <kpEffectCommandBase.h>
#include <kpimage.h>
#include <kpImage.h>
class QLabel;
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -44,8 +44,8 @@
#include <klocale.h>
#include <knuminput.h>
#include <kpmainwindow.h>
#include <kppixmapfx.h>
#include <kpMainWindow.h>
#include <kpPixmapFX.h>
kpEffectBlurSharpenCommand::kpEffectBlurSharpenCommand (kpEffectBlurSharpen::Type type,
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -30,10 +30,10 @@
#define kpEffectBlurSharpenCommand_H
#include <kpcolor.h>
#include <kpColor.h>
#include <kpEffectBlurSharpen.h>
#include <kpEffectCommandBase.h>
#include <kpimage.h>
#include <kpImage.h>
class QLabel;
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -33,11 +33,11 @@
#include <kdebug.h>
#include <klocale.h>
#include <kpdefs.h>
#include <kpdocument.h>
#include <kpmainwindow.h>
#include <kppixmapfx.h>
#include <kpselection.h>
#include <kpDefs.h>
#include <kpDocument.h>
#include <kpMainWindow.h>
#include <kpPixmapFX.h>
#include <kpSelection.h>
kpEffectClearCommand::kpEffectClearCommand (bool actOnSelection,
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -30,9 +30,9 @@
#define kpEffectClearCommand_H
#include <kpcommandhistory.h>
#include <kpCommandHistory.h>
#include <kpcolor.h>
#include <kpColor.h>
class QPixmap;
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -31,10 +31,10 @@
#include <kdialog.h>
#include <klocale.h>
#include <kpdefs.h>
#include <kpdocument.h>
#include <kpmainwindow.h>
#include <kpselection.h>
#include <kpDefs.h>
#include <kpDocument.h>
#include <kpMainWindow.h>
#include <kpSelection.h>
#include <kpSetOverrideCursorSaver.h>
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -32,8 +32,8 @@
#include <qwidget.h>
#include <kpcommandhistory.h>
#include <kpimage.h>
#include <kpCommandHistory.h>
#include <kpImage.h>
class kpDocument;
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -46,8 +46,8 @@
#include <knuminput.h>
#include <kpEffectEmboss.h>
#include <kpmainwindow.h>
#include <kppixmapfx.h>
#include <kpMainWindow.h>
#include <kpPixmapFX.h>
kpEffectEmbossCommand::kpEffectEmbossCommand (double radius, double sigma,
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -31,7 +31,7 @@
#include <kpEffectCommandBase.h>
#include <kpimage.h>
#include <kpImage.h>
class kpMainWindow;
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -46,8 +46,8 @@
#include <kvbox.h>
#include <kpEffectFlatten.h>
#include <kpdefs.h>
#include <kppixmapfx.h>
#include <kpDefs.h>
#include <kpPixmapFX.h>
kpEffectFlattenCommand::kpEffectFlattenCommand (const QColor &color1,
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -33,7 +33,7 @@
#include <qcolor.h>
#include <kpEffectCommandBase.h>
#include <kpimage.h>
#include <kpImage.h>
class QCheckBox;
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -31,7 +31,7 @@
#include <kpEffectCommandBase.h>
#include <kpimage.h>
#include <kpImage.h>
class kpMainWindow;
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -40,7 +40,7 @@
#include <klocale.h>
#include <kpEffectInvert.h>
#include <kppixmapfx.h>
#include <kpPixmapFX.h>
kpEffectInvertCommand::kpEffectInvertCommand (int channels,
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -31,7 +31,7 @@
#include <kpEffectCommandBase.h>
#include <kpimage.h>
#include <kpImage.h>
class QCheckBox;
......
/*
Copyright (c) 2003-2006 Clarence Dang <dang@kde.org>
Copyright (c) 2003-2007 Clarence Dang <dang@kde.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
......@@ -43,7 +43,7 @@
#include <klocale.h>
#include <kpEffectReduceColors.h>
#include <kppixmapfx.h>
#include <kpPixmapFX.h>
kpEffectReduceColorsCommand::kpEffectReduceColorsCommand (int depth, bool dither,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment