diff --git a/animations/animation.h b/animations/animation.h index 00cfd1504..0a4a1279b 100644 --- a/animations/animation.h +++ b/animations/animation.h @@ -25,13 +25,14 @@ #ifndef PLASMA_ANIMATION_H #define PLASMA_ANIMATION_H -#include -#include -#include -#include +#include +#include +#include +#include +#include + #include #include -#include namespace Plasma { diff --git a/animations/fade_p.h b/animations/fade_p.h index a505cc741..a4c0633a2 100644 --- a/animations/fade_p.h +++ b/animations/fade_p.h @@ -21,8 +21,8 @@ * @file This file contains the definition for the Fade effect. */ -#ifndef PLASMA_ANIMATIONS_FADE_H -#define PLASMA_ANIMATIONS_FADE_H +#ifndef PLASMA_ANIMATIONS_FADE_P_H +#define PLASMA_ANIMATIONS_FADE_P_H #include #include @@ -104,4 +104,4 @@ private: } -#endif +#endif // PLASMA_ANIMATIONS_FADE_P_H diff --git a/animations/geometry_p.h b/animations/geometry_p.h index aad1f5029..897c27155 100644 --- a/animations/geometry_p.h +++ b/animations/geometry_p.h @@ -21,8 +21,8 @@ * @file This file contains the definition for the Geometry effect. */ -#ifndef PLASMA_ANIMATIONS_GEO_H -#define PLASMA_ANIMATIONS_GEO_H +#ifndef PLASMA_ANIMATIONS_GEOMETRY_P_H +#define PLASMA_ANIMATIONS_GEOMETRY_P_H #include #include @@ -66,7 +66,7 @@ public: void setStartGeometry(const QRectF &geometry); /** - * Acess the final geometry of animated widget. + * Access the final geometry of animated widget. * * \todo: check if it was set and case negative, handle the error. * @return Target geometry. @@ -91,6 +91,6 @@ private: QRectF m_targetGeometry; }; -} +} // PLASMA_ANIMATIONS_GEOMETRY_P_H #endif diff --git a/animations/grow_p.h b/animations/grow_p.h index 46c774940..21dd2b04b 100644 --- a/animations/grow_p.h +++ b/animations/grow_p.h @@ -21,8 +21,8 @@ * @file This file contains the definition for the Grow effect. */ -#ifndef PLASMA_ANIMATIONS_GROW_H -#define PLASMA_ANIMATIONS_GROW_H +#ifndef PLASMA_ANIMATIONS_GROW_P_H +#define PLASMA_ANIMATIONS_GROW_P_H #include #include @@ -85,4 +85,4 @@ private: } -#endif +#endif // PLASMA_ANIMATIONS_GROW_P_H diff --git a/animations/pulser_p.h b/animations/pulser_p.h index e2fd58dce..f7f163276 100644 --- a/animations/pulser_p.h +++ b/animations/pulser_p.h @@ -20,8 +20,8 @@ * @file This file contains the definition for the Pulse effect. */ -#ifndef PLASMA_ANIMATIONS_PULSE_H -#define PLASMA_ANIMATIONS_PULSE_H +#ifndef PLASMA_ANIMATIONS_PULSER_P_H +#define PLASMA_ANIMATIONS_PULSER_P_H #include #include @@ -90,7 +90,7 @@ private: } -#endif +#endif // PLASMA_ANIMATIONS_PULSER_P_H diff --git a/animations/rotation.cpp b/animations/rotation.cpp index d0dc18639..f6f8e943e 100644 --- a/animations/rotation.cpp +++ b/animations/rotation.cpp @@ -1,24 +1,21 @@ -//////////////////////////////////////////////////////////////////////// -// rotation.cpp // -// // -// Copyright(C) 2009 Igor Trindade Oliveira // -// Copyright(C) 2009 Adenilson Cavalcanti // -// // -// This library is free software; you can redistribute it and/or // -// modify it under the terms of the GNU Lesser General Public // -// License as published by the Free Software Foundation; either // -// version 2.1 of the License, or (at your option) any later version. // -// // -// This library 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 // -// Lesser General Public License for more details. // -// // -// You should have received a copy of the GNU Lesser General Public // -// License along with this library; if not, write to the Free Software // -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // -// 02110-1301 USA // -///////////////////////////////////////////////////////////////////////// +/* + Copyright (C) 2009 Igor Trindade Oliveira + Copyright (C) 2009 Adenilson Cavalcanti + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + #include "rotation_p.h" #include diff --git a/animations/rotation_p.h b/animations/rotation_p.h index 2f88be8cf..3a0b0d8df 100644 --- a/animations/rotation_p.h +++ b/animations/rotation_p.h @@ -1,24 +1,21 @@ -/***********************************************************************/ -/* rotation.h */ -/* */ -/* Copyright(C) 2009 Igor Trindade Oliveira */ -/* Copyright(C) 2009 Adenilson Cavalcanti */ -/* */ -/* This library is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU Lesser General Public */ -/* License as published by the Free Software Foundation; either */ -/* version 2.1 of the License, or (at your option) any later version. */ -/* */ -/* This library 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 */ -/* Lesser General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU Lesser General Public */ -/* License along with this library; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA */ -/* 02110-1301 USA */ -/***********************************************************************/ +/* + Copyright (C) 2009 Igor Trindade Oliveira + Copyright (C) 2009 Adenilson Cavalcanti + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + /** * @file This file contains the definition for the 2D Rotation effect. */ diff --git a/animations/rotationstacked.cpp b/animations/rotationstacked.cpp index 03873e367..67e54b95b 100644 --- a/animations/rotationstacked.cpp +++ b/animations/rotationstacked.cpp @@ -1,23 +1,19 @@ -/***********************************************************************/ -/* rotationstacked.h */ -/* */ -/* Copyright(C) 2009 Igor Trindade Oliveira */ -/* */ -/* This library is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU Lesser General Public */ -/* License as published by the Free Software Foundation; either */ -/* version 2.1 of the License, or (at your option) any later version. */ -/* */ -/* This library 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 */ -/* Lesser General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU Lesser General Public */ -/* License along with this library; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA */ -/* 02110-1301 USA */ -/***********************************************************************/ +/* + Copyright (C) 2009 Igor Trindade Oliveira + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ #include "rotationstacked_p.h" #include diff --git a/animations/rotationstacked_p.h b/animations/rotationstacked_p.h index add50f039..7f5181956 100644 --- a/animations/rotationstacked_p.h +++ b/animations/rotationstacked_p.h @@ -1,30 +1,26 @@ -///////////////////////////////////////////////////////////////////////// -// rotationstacked.h // -// // -// Copyright(C) 2009 Igor Trindade Oliveira // -// // -// This library is free software; you can redistribute it and/or // -// modify it under the terms of the GNU Lesser General Public // -// License as published by the Free Software Foundation; either // -// version 2.1 of the License, or (at your option) any later version. // -// // -// This library 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 // -// Lesser General Public License for more details. // -// // -// You should have received a copy of the GNU Lesser General Public // -// License along with this library; if not, write to the Free Software // -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // -// 02110-1301 USA // -///////////////////////////////////////////////////////////////////////// +/* + Copyright (C) 2009 Igor Trindade Oliveira + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ /** * @file This file contains the definition for the StackedRotationAnimation. */ -#ifndef PLASMA_ROTATIONSTACKED_H -#define PLASMA_ROTATIONSTACKED_H +#ifndef PLASMA_ROTATIONSTACKED_P_H +#define PLASMA_ROTATIONSTACKED_P_H #include #include @@ -129,4 +125,4 @@ private: }; } // Plasma -#endif +#endif // PLASMA_ROTATIONSTACKED_P_H diff --git a/animations/slide_p.h b/animations/slide_p.h index ebc6e77a8..d57b42952 100644 --- a/animations/slide_p.h +++ b/animations/slide_p.h @@ -21,8 +21,8 @@ * @file This file contains the definition for the Slide effect. */ -#ifndef PLASMA_ANIMATIONS_SLIDE_H -#define PLASMA_ANIMATIONS_SLIDE_H +#ifndef PLASMA_ANIMATIONS_SLIDE_P_H +#define PLASMA_ANIMATIONS_SLIDE_P_H #include "plasma/animations/animation.h" #include "plasma/plasma_export.h" @@ -93,4 +93,4 @@ private: } -#endif +#endif // PLASMA_ANIMATIONS_SLIDE_P_H diff --git a/animations/stackedlayout.cpp b/animations/stackedlayout.cpp index cf6979c4a..2f3a0bd0c 100644 --- a/animations/stackedlayout.cpp +++ b/animations/stackedlayout.cpp @@ -1,23 +1,19 @@ -/***********************************************************************/ -/* stackedlayout.c */ -/* */ -/* Copyright(C) 2009 Igor Trindade Oliveira */ -/* */ -/* This library is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU Lesser General Public */ -/* License as published by the Free Software Foundation; either */ -/* version 2.1 of the License, or (at your option) any later version. */ -/* */ -/* This library 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 */ -/* Lesser General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU Lesser General Public */ -/* License along with this library; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA */ -/* 02110-1301 USA */ -/***********************************************************************/ +/* + Copyright (C) 2009 Igor Trindade Oliveira + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ #include "stackedlayout.h" diff --git a/animations/stackedlayout.h b/animations/stackedlayout.h index 4e58b08dc..274ac3023 100644 --- a/animations/stackedlayout.h +++ b/animations/stackedlayout.h @@ -1,23 +1,19 @@ -//////////////////////////////////////////////////////////////////////// -// stackedlayout.h // -// // -// Copyright(C) 2009 Igor Trindade Oliveira // -// // -// This library is free software; you can redistribute it and/or // -// modify it under the terms of the GNU Lesser General Public // -// License as published by the Free Software Foundation; either // -// version 2.1 of the License, or (at your option) any later version. // -// // -// This library 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 // -// Lesser General Public License for more details. // -// // -// You should have received a copy of the GNU Lesser General Public // -// License along with this library; if not, write to the Free Software // -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // -// 02110-1301 USA // -///////////////////////////////////////////////////////////////////////// +/* + Copyright (C) 2009 Igor Trindade Oliveira + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ #ifndef STACKEDLAYOUT_H #define STACKEDLAYOUT_H diff --git a/animations/zoom_p.h b/animations/zoom_p.h index cd481e2dd..ae91760af 100644 --- a/animations/zoom_p.h +++ b/animations/zoom_p.h @@ -21,8 +21,8 @@ * @file This file contains the definition for the Zoom animation. */ -#ifndef PLASMA_ANIMATIONS_ZOOM_H -#define PLASMA_ANIMATIONS_ZOOM_H +#ifndef PLASMA_ANIMATIONS_ZOOM_P_H +#define PLASMA_ANIMATIONS_ZOOM_P_H #include #include @@ -57,4 +57,4 @@ private: } -#endif +#endif // PLASMA_ANIMATIONS_ZOOM_P_H diff --git a/animator.cpp b/animator.cpp index 6232fd76d..f2f5ef608 100644 --- a/animator.cpp +++ b/animator.cpp @@ -1,21 +1,19 @@ /* - * Copyright(C) 2009 Adenilson Cavalcanti * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, or - * (at your option) any later version. - * - * This program 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 Library 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. - */ + Copyright (C) 2009 Adenilson Cavalcanti + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ #include "animator.h" #include "private/animator_p.h" diff --git a/containmentactions.h b/containmentactions.h index e33f4ca80..121f9b09a 100644 --- a/containmentactions.h +++ b/containmentactions.h @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PLASMA_CONTEXTACTION_H -#define PLASMA_CONTEXTACTION_H +#ifndef PLASMA_CONTAINMENTACTIONS_H +#define PLASMA_CONTAINMENTACTIONS_H #include @@ -256,4 +256,4 @@ K_PLUGIN_FACTORY(factory, registerPlugin();) \ K_EXPORT_PLUGIN(factory("plasma_containmentactions_" #libname)) \ K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) -#endif // multiple inclusion guard +#endif // PLASMA_CONTAINMENTACTIONS_H diff --git a/private/abstractanimationprivate_p.h b/private/abstractanimationprivate_p.h index 3419bbb69..97a97018c 100644 --- a/private/abstractanimationprivate_p.h +++ b/private/abstractanimationprivate_p.h @@ -1,25 +1,22 @@ -/***********************************************************************/ -/* animationprivate.h */ -/* */ -/* Copyright(C) 2009 Adenilson Cavalcanti */ -/* */ -/* This library is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU Lesser General Public */ -/* License as published by the Free Software Foundation; either */ -/* version 2.1 of the License, or (at your option) any later version. */ -/* */ -/* This library 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 */ -/* Lesser General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU Lesser General Public */ -/* License along with this library; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA */ -/* 02110-1301 USA */ -/***********************************************************************/ -#ifndef PLASMA_ANIMATIONPRIVATE_H -#define PLASMA_ANIMATIONPRIVATE_H +/* + Copyright (C) 2009 Adenilson Cavalcanti + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#ifndef PLASMA_ABSTRACTANIMATIONPRIVATE_P_H +#define PLASMA_ABSTRACTANIMATIONPRIVATE_P_H #include #include @@ -69,4 +66,4 @@ public: } -#endif +#endif // PLASMA_ABSTRACTANIMATIONPRIVATE_P_H diff --git a/private/animationprivate_p.h b/private/animationprivate_p.h index 63b148804..2702fe3cd 100644 --- a/private/animationprivate_p.h +++ b/private/animationprivate_p.h @@ -1,25 +1,22 @@ -/***********************************************************************/ -/* animationprivate.h */ -/* */ -/* Copyright(C) 2009 Adenilson Cavalcanti */ -/* */ -/* This library is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU Lesser General Public */ -/* License as published by the Free Software Foundation; either */ -/* version 2.1 of the License, or (at your option) any later version. */ -/* */ -/* This library 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 */ -/* Lesser General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU Lesser General Public */ -/* License along with this library; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA */ -/* 02110-1301 USA */ -/***********************************************************************/ -#ifndef PLASMA_ANIMATIONPRIVATE_H -#define PLASMA_ANIMATIONPRIVATE_H +/* + Copyright (C) 2009 Adenilson Cavalcanti + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#ifndef PLASMA_ANIMATIONPRIVATE_P_H +#define PLASMA_ANIMATIONPRIVATE_P_H #include #include @@ -51,4 +48,4 @@ public: } -#endif +#endif // PLASMA_ANIMATIONPRIVATE_P_H diff --git a/private/authorizationmanager_p.h b/private/authorizationmanager_p.h index d4f29ed05..9437e48e6 100644 --- a/private/authorizationmanager_p.h +++ b/private/authorizationmanager_p.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef AUTHORIZATIONMANAGER_P_H -#define AUTHORIZATIONMANAGER_P_H +#ifndef PLASMA_AUTHORIZATIONMANAGER_P_H +#define PLASMA_AUTHORIZATIONMANAGER_P_H #include "config-plasma.h" @@ -90,4 +90,4 @@ class AuthorizationManagerPrivate } -#endif +#endif // PLASMA_AUTHORIZATIONMANAGER_P_H diff --git a/private/containmentactions_p.h b/private/containmentactions_p.h index 296e0811b..3359a6ece 100644 --- a/private/containmentactions_p.h +++ b/private/containmentactions_p.h @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PLASMA_CONTEXTACTIONPRIVATE_H -#define PLASMA_CONTEXTACTIONPRIVATE_H +#ifndef PLASMA_CONTAINMENTACTIONSPRIVATE_H +#define PLASMA_CONTAINMENTACTIONSPRIVATE_H #include "plasma/private/dataengineconsumer_p.h" @@ -47,5 +47,5 @@ public: }; } // namespace Plasma -#endif +#endif //PLASMA_CONTAINMENTACTIONSPRIVATE_H diff --git a/private/dataengineconsumer.cpp b/private/dataengineconsumer.cpp index 9a3c0c521..6f593a013 100644 --- a/private/dataengineconsumer.cpp +++ b/private/dataengineconsumer.cpp @@ -49,7 +49,7 @@ void ServiceMonitor::slotJobFinished(Plasma::ServiceJob *job) QPair pair(location, engineName); kDebug() << "pair = " << pair; if (!m_consumer->m_remoteEngines.contains(pair)) { - kDebug() << "engine doesnt exist yet!"; + kDebug() << "engine does not exist yet!"; } else { KUrl engineLocation(location); engineLocation.setFileName(job->result().toString()); diff --git a/private/dataengineservice_p.h b/private/dataengineservice_p.h index 5ddad58b8..ab6a20580 100644 --- a/private/dataengineservice_p.h +++ b/private/dataengineservice_p.h @@ -16,8 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PUBLICKEYSERVICE_H -#define PUBLICKEYSERVICE_H +#ifndef PLASMA_DATAENGINESERVICE_P_H +#define PLASMA_DATAENGINESERVICE_P_H #include @@ -57,4 +57,4 @@ class DataEngineService : public Plasma::Service } -#endif +#endif // PLASMA_DATAENGINESERVICE_P_H diff --git a/private/internaltoolbox_p.h b/private/internaltoolbox_p.h index 5ed5277b7..daedbc54a 100644 --- a/private/internaltoolbox_p.h +++ b/private/internaltoolbox_p.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PLASMA_TOOLBOX_P_H -#define PLASMA_TOOLBOX_P_H +#ifndef PLASMA_INTERNALTOOLBOX_P_H +#define PLASMA_INTERNALTOOLBOX_P_H #include @@ -116,5 +116,6 @@ private: }; } // Plasma namespace -#endif // multiple inclusion guard + +#endif // PLASMA_INTERNALTOOLBOX_P_H diff --git a/private/kineticscroll.cpp b/private/kineticscroll.cpp index f840a4328..6aee0c0b8 100644 --- a/private/kineticscroll.cpp +++ b/private/kineticscroll.cpp @@ -1,24 +1,23 @@ -//////////////////////////////////////////////////////////////////////// -// kineticscroll.cpp // -// // -// Copyright(C) 2009 Igor Trindade Oliveira // -// Copyright(C) 2009 Adenilson Cavalcanti // -// // -// This library is free software; you can redistribute it and/or // -// modify it under the terms of the GNU Lesser General Public // -// License as published by the Free Software Foundation; either // -// version 2.1 of the License, or (at your option) any later version. // -// // -// This library 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 // -// Lesser General Public License for more details. // -// // -// You should have received a copy of the GNU Lesser General Public // -// License along with this library; if not, write to the Free Software // -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // -// 02110-1301 USA // -///////////////////////////////////////////////////////////////////////// +/* + Copyright (C) 2009 Igor Trindade Oliveira + Copyright (C) 2009 Adenilson Cavalcanti + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#include "kineticscroll_p.h" + #include #include #include @@ -32,8 +31,6 @@ #include -#include "kineticscroll_p.h" - /* TODO: * - clean up the code(remove duplicated code, constify) * - port to Plasma::Animator diff --git a/private/kineticscroll_p.h b/private/kineticscroll_p.h index ab57e82b2..5f2571367 100644 --- a/private/kineticscroll_p.h +++ b/private/kineticscroll_p.h @@ -1,24 +1,21 @@ -/***********************************************************************/ -/* kineticscroll.h */ -/* */ -/* Copyright(C) 2009 Igor Trindade Oliveira */ -/* Copyright(C) 2009 Adenilson Cavalcanti */ -/* */ -/* This library is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU Lesser General Public */ -/* License as published by the Free Software Foundation; either */ -/* version 2.1 of the License, or (at your option) any later version. */ -/* */ -/* This library 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 */ -/* Lesser General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU Lesser General Public */ -/* License along with this library; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA */ -/* 02110-1301 USA */ -/***********************************************************************/ +/* + Copyright (C) 2009 Igor Trindade Oliveira + Copyright (C) 2009 Adenilson Cavalcanti + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + #ifndef PLASMA_KINETICSCROLLING_H #define PLASMA_KINETICSCROLLING_H diff --git a/private/pinpairingauthorization_p.h b/private/pinpairingauthorization_p.h index cd4b96aca..a3847de0d 100644 --- a/private/pinpairingauthorization_p.h +++ b/private/pinpairingauthorization_p.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef PLASMA_PINPAIRINGAUTHORIZATION_H -#define PLASMA_PINPAIRINGAUTHORIZATION_H +#ifndef PLASMA_PINPAIRINGAUTHORIZATION_P_H +#define PLASMA_PINPAIRINGAUTHORIZATION_P_H #include @@ -47,5 +47,5 @@ class PLASMA_EXPORT PinPairingAuthorization : public AuthorizationInterface }; } // Plasma namespace -#endif +#endif // PLASMA_PINPAIRINGAUTHORIZATION_P_H diff --git a/private/plasmoidservice.cpp b/private/plasmoidservice.cpp index 044a2987b..2f1417f66 100644 --- a/private/plasmoidservice.cpp +++ b/private/plasmoidservice.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include diff --git a/private/pulsershadow.cpp b/private/pulsershadow.cpp index bd75e3315..75e8114ae 100644 --- a/private/pulsershadow.cpp +++ b/private/pulsershadow.cpp @@ -1,22 +1,19 @@ -/*********************************************************************/ -/* */ -/* Copyright(C)2009 Adenilson Cavalcanti adenilson.silva@idnt.org.br */ -/* */ -/* This program is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU General Public License */ -/* as published by the Free Software Foundation; either version 2 */ -/* of the License, or (at your option) any later version. */ -/* */ -/* This program 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. */ -/*********************************************************************/ +/* + Copyright (C) 2009 Adenilson Cavalcanti + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ #include "pulsershadow_p.h" #include diff --git a/private/pulsershadow_p.h b/private/pulsershadow_p.h index 345bcae63..098dec444 100644 --- a/private/pulsershadow_p.h +++ b/private/pulsershadow_p.h @@ -1,25 +1,22 @@ -/*********************************************************************/ -/* */ -/* Copyright(C)2009 Adenilson Cavalcanti adenilson.silva@idnt.org.br */ -/* */ -/* This program is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU General Public License */ -/* as published by the Free Software Foundation; either version 2 */ -/* of the License, or (at your option) any later version. */ -/* */ -/* This program 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. */ -/*********************************************************************/ +/* + Copyright (C) 2009 Adenilson Cavalcanti -#ifndef PULSERSHADOW_P_H -#define PULSERSHADOW_P_H + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#ifndef PLASMA_PULSERSHADOW_P_H +#define PLASMA_PULSERSHADOW_P_H #include @@ -47,4 +44,4 @@ private: } -#endif +#endif // PLASMA_PULSERSHADOW_P_H diff --git a/private/remoteservice_p.h b/private/remoteservice_p.h index b2d49f22b..9d4161e76 100644 --- a/private/remoteservice_p.h +++ b/private/remoteservice_p.h @@ -16,8 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PLASMA_REMOTESERVICE_H -#define PLASMA_REMOTESERVICE_H +#ifndef PLASMA_REMOTESERVICE_P_H +#define PLASMA_REMOTESERVICE_P_H #include #include @@ -83,4 +83,4 @@ class RemoteService : public Plasma::Service } //namespace Plasma -#endif // REMOTESERVICE_H +#endif // PLASMA_REMOTESERVICE_P_H diff --git a/private/remoteservicejob_p.h b/private/remoteservicejob_p.h index 7baad6fcf..064d936fb 100644 --- a/private/remoteservicejob_p.h +++ b/private/remoteservicejob_p.h @@ -16,8 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PLASMA_REMOTESERVICEJOB_H -#define PLASMA_REMOTESERVICEJOB_H +#ifndef PLASMA_REMOTESERVICEJOB_P_H +#define PLASMA_REMOTESERVICEJOB_P_H #include #include @@ -67,4 +67,4 @@ class RemoteServiceJob : public Plasma::ServiceJob } // namespace Plasma -#endif //REMOTESERVICEJOB_H +#endif // PLASMA_REMOTESERVICEJOB_P_H diff --git a/private/runnerjobs.cpp b/private/runnerjobs.cpp index 296906bdb..67bb501fe 100644 --- a/private/runnerjobs.cpp +++ b/private/runnerjobs.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "runnermanager.h" +#include "runnerjobs_p.h" #include @@ -26,7 +26,7 @@ //#include #include -#include "runnerjobs_p.h" +#include "runnermanager.h" #include "plasma/querymatch.h" using ThreadWeaver::Job; diff --git a/private/runnerjobs_p.h b/private/runnerjobs_p.h index 70fa52111..19c0f1efa 100644 --- a/private/runnerjobs_p.h +++ b/private/runnerjobs_p.h @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PLASMA_RUNNERJOBS_H -#define PLASMA_RUNNERJOBS_H +#ifndef PLASMA_RUNNERJOBS_P_H +#define PLASMA_RUNNERJOBS_P_H #include #include @@ -27,6 +27,8 @@ #include #include +#include "abstractrunner.h" + using ThreadWeaver::Job; class QTimer; @@ -138,4 +140,4 @@ private: } -#endif +#endif // PLASMA_RUNNERJOBS_P_H diff --git a/private/serviceprovider_p.h b/private/serviceprovider_p.h index 4961ea4f0..3ce1ba490 100644 --- a/private/serviceprovider_p.h +++ b/private/serviceprovider_p.h @@ -16,8 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef SERVICEPROVIDER_H -#define SERVICEPROVIDER_H +#ifndef PLASMA_SERVICEPROVIDER_P_H +#define PLASMA_SERVICEPROVIDER_P_H #include @@ -59,11 +59,11 @@ class ServiceProvider : public Jolie::AbstractAdaptor void authorize(const Jolie::Message &message, const QByteArray &validToken); void authorizationSuccess(const Jolie::Message &message); void authorizationFailed(const Jolie::Message &message, const QByteArray &error); - + Service *m_service; int m_descriptor; QString m_providerName; - + QMap m_messageMap; QMap m_tokens; QMap m_descriptorMap; @@ -73,4 +73,4 @@ class ServiceProvider : public Jolie::AbstractAdaptor } //namespace Plasma -#endif //SERVICEPROVIDER_H +#endif //PLASMA_SERVICEPROVIDER_P_H diff --git a/private/wallpaperrenderthread_p.h b/private/wallpaperrenderthread_p.h index 201ae68a5..e78a2edad 100644 --- a/private/wallpaperrenderthread_p.h +++ b/private/wallpaperrenderthread_p.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PLASMA_WALLPAPERRENDERTHREAD_H -#define PLASMA_WALLPAPERRENDERTHREAD_H +#ifndef PLASMA_WALLPAPERRENDERTHREAD_P_H +#define PLASMA_WALLPAPERRENDERTHREAD_P_H #include #include @@ -70,4 +70,5 @@ private: }; } // namespace Plasma -#endif // RENDERTHREAD_H + +#endif // PLASMA_WALLPAPERRENDERTHREAD_P_H diff --git a/private/windowpreview.cpp b/private/windowpreview.cpp index 36f4ba951..2e7ddfb61 100644 --- a/private/windowpreview.cpp +++ b/private/windowpreview.cpp @@ -213,7 +213,7 @@ void WindowPreview::mouseMoveEvent(QMouseEvent *event) } int i = 0; - foreach (QRect rect, m_thumbnailRects) { + foreach (const QRect &rect, m_thumbnailRects) { if (rect.contains(event->pos())) { WindowEffects::highlightWindows(effectiveWinId(), QList()< @@ -76,5 +76,5 @@ private: } // namespace Plasma -#endif // multiple inclusion guard +#endif // PLASMA_ACCESSAPPLETJOB_H diff --git a/runnercontext.cpp b/runnercontext.cpp index 8cd96e7eb..0daad5027 100644 --- a/runnercontext.cpp +++ b/runnercontext.cpp @@ -410,7 +410,7 @@ bool RunnerContext::removeMatches(const QStringList matchIdList) QList presentMatchList; LOCK_FOR_READ(d) - foreach(QString matchId, matchIdList) { + foreach(const QString &matchId, matchIdList) { const QueryMatch* match = d->matchesById.value(matchId, 0); if (match) { presentMatchList << match; @@ -427,7 +427,7 @@ bool RunnerContext::removeMatches(const QStringList matchIdList) foreach(const QueryMatch *match, presentMatchList) { d->matches.removeAll(*match); } - foreach(QString matchId, presentMatchIdList) { + foreach(const QString &matchId, presentMatchIdList) { d->matchesById.remove(matchId); } UNLOCK(d) diff --git a/widgets/iconwidget.cpp b/widgets/iconwidget.cpp index 42ed68426..98f8aba75 100644 --- a/widgets/iconwidget.cpp +++ b/widgets/iconwidget.cpp @@ -1065,7 +1065,7 @@ void IconWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option !textBoundingRect.isEmpty()) { QRect labelRect = d->labelRectangle(option, icon, d->text).toRect(); - foreach (QRect rect, d->haloRects) { + foreach (const QRect &rect, d->haloRects) { Plasma::PaintUtils::drawHalo(painter, rect); } } diff --git a/windoweffects.cpp b/windoweffects.cpp index 29009757a..e40f6f8c0 100644 --- a/windoweffects.cpp +++ b/windoweffects.cpp @@ -207,7 +207,7 @@ void showWindowThumbnails(WId parent, const QList &windows, const QList &ids) +void presentWindows(WId controller, const QList &ids) { #ifdef Q_WS_X11 const int numWindows = ids.count(); @@ -227,20 +227,20 @@ void presentWindows(WId controler, const QList &ids) if (!data.isEmpty()) { Display *dpy = QX11Info::display(); Atom atom = XInternAtom(dpy, "_KDE_PRESENT_WINDOWS_GROUP", False); - XChangeProperty(dpy, controler, atom, atom, 32, PropModeReplace, + XChangeProperty(dpy, controller, atom, atom, 32, PropModeReplace, reinterpret_cast(data.data()), data.size()); } #endif } -void presentWindows(WId controler, int desktop) +void presentWindows(WId controller, int desktop) { #ifdef Q_WS_X11 QVarLengthArray data(1); data[0] = desktop; Display *dpy = QX11Info::display(); Atom atom = XInternAtom(dpy, "_KDE_PRESENT_WINDOWS_DESKTOP", False); - XChangeProperty(dpy, controler, atom, atom, 32, PropModeReplace, + XChangeProperty(dpy, controller, atom, atom, 32, PropModeReplace, reinterpret_cast(data.data()), data.size()); #endif }