yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port KWin/Effects from KDebug to QDebug

Browse source 
Still using KDE4Support as it's used in other areas.
This commit is contained in:
Martin Gräßlin 2013-09-02 11:03:29 +02:00
parent 99bcac1cc7
commit 987fd41d24
30 changed files with 77 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
effects/blur/blurshader.cpp
View file

@ -26,7 +26,7 @@
#include <QMatrix4x4>
#include <QTextStream>
#include <QVector2D>
#include <KDebug>
#include <QDebug>
#include <cmath>
@ -495,7 +495,7 @@ void ARBBlurShader::init()
if (glGetError()) {
const char *error = (const char*)glGetString(GL_PROGRAM_ERROR_STRING_ARB);
kError() << "Failed to compile fragment program:" << error;
qCritical() << "Failed to compile fragment program:" << error;
setIsValid(false);
} else
setIsValid(true);

2
effects/coverswitch/coverswitch.cpp
View file

@ -36,7 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <math.h>
#include <kdebug.h>
#include <QDebug>
namespace KWin
{

31
effects/cube/cube.cpp
View file

@ -28,11 +28,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString>
#include <kwinconfig.h>
#include <kdebug.h>
#include <KDE/KGlobal>
#include <QApplication>
#include <QColor>
#include <QDebug>
#include <QElapsedTimer>
#include <QRect>
#include <QEvent>
#include <QFutureWatcher>
@ -298,13 +299,13 @@ bool CubeEffect::loadShader()
QString cylinderVertexshader = QStandardPaths::locate(QStandardPaths::GenericDataLocation, m_shadersDir + QStringLiteral("cylinder.vert"));
QString sphereVertexshader = QStandardPaths::locate(QStandardPaths::GenericDataLocation, m_shadersDir + QStringLiteral("sphere.vert"));
if (cylinderVertexshader.isEmpty() || sphereVertexshader.isEmpty()) {
kError(1212) << "Couldn't locate shader files" << endl;
qCritical() << "Couldn't locate shader files" << endl;
return false;
}
cylinderShader = ShaderManager::instance()->loadVertexShader(ShaderManager::GenericShader, cylinderVertexshader);
if (!cylinderShader->isValid()) {
kError(1212) << "The cylinder shader failed to load!" << endl;
qCritical() << "The cylinder shader failed to load!" << endl;
return false;
} else {
ShaderBinder binder(cylinderShader);
@ -333,7 +334,7 @@ bool CubeEffect::loadShader()
}
sphereShader = ShaderManager::instance()->loadVertexShader(ShaderManager::GenericShader, sphereVertexshader);
if (!sphereShader->isValid()) {
kError(1212) << "The sphere shader failed to load!" << endl;
qCritical() << "The sphere shader failed to load!" << endl;
return false;
} else {
ShaderBinder binder(sphereShader);
@ -1315,7 +1316,7 @@ void CubeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa
QMatrix4x4 origMatrix;
if (activated && cube_painting) {
shader = shaderManager->pushShader(ShaderManager::GenericShader);
//kDebug(1212) << w->caption();
//qDebug() << w->caption();
float opacity = cubeOpacity;
if (start) {
opacity = 1.0 - (1.0 - opacity) * timeLine.currentValue();
@ -1612,30 +1613,30 @@ bool CubeEffect::borderActivated(ElectricBorder border)
void CubeEffect::toggleCube()
{
kDebug(1212) << "toggle cube";
qDebug() << "toggle cube";
toggle(Cube);
}
void CubeEffect::toggleCylinder()
{
kDebug(1212) << "toggle cylinder";
qDebug() << "toggle cylinder";
if (!useShaders)
useShaders = loadShader();
if (useShaders)
toggle(Cylinder);
else
kError(1212) << "Sorry shaders are not available - cannot activate Cylinder";
qCritical() << "Sorry shaders are not available - cannot activate Cylinder";
}
void CubeEffect::toggleSphere()
{
kDebug(1212) << "toggle sphere";
qDebug() << "toggle sphere";
if (!useShaders)
useShaders = loadShader();
if (useShaders)
toggle(Sphere);
else
kError(1212) << "Sorry shaders are not available - cannot activate Sphere";
qCritical() << "Sorry shaders are not available - cannot activate Sphere";
}
void CubeEffect::toggle(CubeMode newMode)
@ -1691,7 +1692,7 @@ void CubeEffect::grabbedKeyboardEvent(QKeyEvent* e)
// wrap only on autorepeat
case Qt::Key_Left:
// rotate to previous desktop
kDebug(1212) << "left";
qDebug() << "left";
if (!rotating && !start) {
rotating = true;
if (invertKeys)
@ -1709,7 +1710,7 @@ void CubeEffect::grabbedKeyboardEvent(QKeyEvent* e)
break;
case Qt::Key_Right:
// rotate to next desktop
kDebug(1212) << "right";
qDebug() << "right";
if (!rotating && !start) {
rotating = true;
if (invertKeys)
@ -1726,7 +1727,7 @@ void CubeEffect::grabbedKeyboardEvent(QKeyEvent* e)
}
break;
case Qt::Key_Up:
kDebug(1212) << "up";
qDebug() << "up";
if (invertKeys) {
if (verticalPosition != Down) {
if (!verticalRotating) {
@ -1768,7 +1769,7 @@ void CubeEffect::grabbedKeyboardEvent(QKeyEvent* e)
}
break;
case Qt::Key_Down:
kDebug(1212) << "down";
qDebug() << "down";
if (invertKeys) {
if (verticalPosition != Up) {
if (!verticalRotating) {
@ -1907,7 +1908,7 @@ void CubeEffect::setActive(bool active)
zOrderingFactor = zPosition / (effects->stackingOrder().count() - 1);
start = true;
effects->setActiveFullScreenEffect(this);
kDebug(1212) << "Cube is activated";
qDebug() << "Cube is activated";
verticalPosition = Normal;
verticalRotating = false;
manualAngle = 0.0;

2
effects/desktopgrid/desktopgrid.cpp
View file

@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QAction>
#include <kactioncollection.h>
#include <kdebug.h>
#include <QDebug>
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString>
#include <netwm_def.h>

1
effects/diminactive/diminactive_config.cpp
View file

@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwineffects.h>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <kconfiggroup.h>
#include <KDE/KAboutData>

20
effects/fallapart/fallapart.cpp
View file

@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "fallapart.h"
#include <kdebug.h>
#include <QDebug>
#include <assert.h>
#include <math.h>
#include <KDE/KConfigGroup>
@ -135,15 +135,15 @@ bool FallApartEffect::isRealWindow(EffectWindow* w)
{
// TODO: isSpecialWindow is rather generic, maybe tell windowtypes separately?
/*
kDebug(1212) << "--" << w->caption() << "--------------------------------";
kDebug(1212) << "Tooltip:" << w->isTooltip();
kDebug(1212) << "Toolbar:" << w->isToolbar();
kDebug(1212) << "Desktop:" << w->isDesktop();
kDebug(1212) << "Special:" << w->isSpecialWindow();
kDebug(1212) << "TopMenu:" << w->isTopMenu();
kDebug(1212) << "Notific:" << w->isNotification();
kDebug(1212) << "Splash:" << w->isSplash();
kDebug(1212) << "Normal:" << w->isNormalWindow();
qDebug() << "--" << w->caption() << "--------------------------------";
qDebug() << "Tooltip:" << w->isTooltip();
qDebug() << "Toolbar:" << w->isToolbar();
qDebug() << "Desktop:" << w->isDesktop();
qDebug() << "Special:" << w->isSpecialWindow();
qDebug() << "TopMenu:" << w->isTopMenu();
qDebug() << "Notific:" << w->isNotification();
qDebug() << "Splash:" << w->isSplash();
qDebug() << "Normal:" << w->isNormalWindow();
*/
if (!w->isNormalWindow())
return false;

2
effects/flipswitch/flipswitch.cpp
View file

@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QKeyEvent>
#include <QMatrix4x4>
#include <kdebug.h>
#include <QDebug>
#include <QAction>
#include <KActionCollection>
#include <KDE/KGlobalAccel>

4
effects/highlightwindow/highlightwindow.cpp
View file

@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "highlightwindow.h"
#include <kdebug.h>
#include <QDebug>
namespace KWin
{
@ -157,7 +157,7 @@ void HighlightWindowEffect::slotPropertyNotify(EffectWindow* w, long a)
for (int i = 0; i < length; i++) {
EffectWindow* foundWin = effects->findWindow(data[i]);
if (!foundWin) {
kDebug(1212) << "Invalid window targetted for highlight. Requested:" << data[i];
qDebug() << "Invalid window targetted for highlight. Requested:" << data[i];
continue;
}
m_highlightedWindows.append(foundWin);

4
effects/invert/invert.cpp
View file

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KGlobal>
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <QDebug>
#include <QStandardPaths>
#include <QMatrix4x4>
@ -88,7 +88,7 @@ bool InvertEffect::loadData()
m_shader = ShaderManager::instance()->loadFragmentShader(ShaderManager::GenericShader, fragmentshader);
if (!m_shader->isValid()) {
kError(1212) << "The shader failed to load!" << endl;
qCritical() << "The shader failed to load!" << endl;
return false;
}

1
effects/invert/invert_config.cpp
View file

@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <KActionCollection>
#include <KShortcutsEditor>
#include <KDE/KAboutData>

2
effects/kscreen/kscreen.cpp
View file

@ -165,7 +165,7 @@ void KscreenEffect::propertyNotify(EffectWindow *window, long int atom)
effects->addRepaintFull();
return;
}
kDebug(1212) << "Incorrect Property state, immediate stop: " << data[0];
qDebug() << "Incorrect Property state, immediate stop: " << data[0];
m_state = StateNormal;
effects->addRepaintFull();
}

6
effects/logout/logout.cpp
View file

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "kwinglplatform.h"
#include <math.h>
#include <kdebug.h>
#include <QDebug>
#include <KDE/KGlobal>
#include <KDE/KStandardDirs>
@ -309,7 +309,7 @@ void LogoutEffect::renderVignetting()
QStandardPaths::locate(QStandardPaths::GenericDataLocation,
m_shadersDir + QStringLiteral("vignetting.frag")));
if (!m_vignettingShader->isValid()) {
kDebug(1212) << "Vignetting Shader failed to load";
qDebug() << "Vignetting Shader failed to load";
return;
}
} else if (!m_vignettingShader->isValid()) {
@ -390,7 +390,7 @@ void LogoutEffect::renderBlurTexture()
QStandardPaths::locate(QStandardPaths::GenericDataLocation,
m_shadersDir + QStringLiteral("logout-blur.frag")));
if (!m_blurShader->isValid()) {
kDebug(1212) << "Logout blur shader failed to load";
qDebug() << "Logout blur shader failed to load";
}
} else if (!m_blurShader->isValid()) {
// shader is broken - no need to continue here

10
effects/lookingglass/lookingglass.cpp
View file

@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kactioncollection.h>
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <QDebug>
#include <KDE/KGlobal>
#include <QVector2D>
@ -95,7 +95,7 @@ void LookingGlassEffect::reconfigure(ReconfigureFlags)
LookingGlassConfig::self()->readConfig();
initialradius = LookingGlassConfig::radius();
radius = initialradius;
kDebug(1212) << QStringLiteral("Radius from config: %1").arg(radius) << endl;
qDebug() << QStringLiteral("Radius from config: %1").arg(radius) << endl;
actionCollection->readSettings();
m_valid = loadData();
}
@ -108,7 +108,7 @@ bool LookingGlassEffect::loadData()
int texw = displayWidth();
int texh = displayHeight();
if (!GLTexture::NPOTTextureSupported()) {
kWarning(1212) << "NPOT textures not supported, wasting some memory" ;
qWarning() << "NPOT textures not supported, wasting some memory" ;
texw = nearestPowerOfTwo(texw);
texh = nearestPowerOfTwo(texh);
}
@ -136,7 +136,7 @@ bool LookingGlassEffect::loadData()
ShaderBinder binder(m_shader);
m_shader->setUniform("u_textureSize", QVector2D(displayWidth(), displayHeight()));
} else {
kError(1212) << "The shader failed to load!" << endl;
qCritical() << "The shader failed to load!" << endl;
return false;
}
@ -216,7 +216,7 @@ void LookingGlassEffect::prePaintScreen(ScreenPrePaintData& data, int time)
zoom = qMin(zoom * qMax(1.0 + diff, 1.2), target_zoom);
else
zoom = qMax(zoom * qMin(1.0 - diff, 0.8), target_zoom);
kDebug(1212) << "zoom is now " << zoom;
qDebug() << "zoom is now " << zoom;
radius = qBound((double)initialradius, initialradius * zoom, 3.5 * initialradius);
if (zoom <= 1.0f) {

4
effects/lookingglass/lookingglass_config.cpp
View file

@ -28,11 +28,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <kconfiggroup.h>
#include <KActionCollection>
#include <KDE/KAboutData>
#include <QDebug>
#include <QWidget>
#include <QVBoxLayout>
@ -91,7 +91,7 @@ LookingGlassEffectConfig::~LookingGlassEffectConfig()
void LookingGlassEffectConfig::save()
{
kDebug(1212) << "Saving config of LookingGlass" ;
qDebug() << "Saving config of LookingGlass" ;
KCModule::save();
m_ui->editor->save(); // undo() will restore to this state from now on

4
effects/magnifier/magnifier_config.cpp
View file

@ -27,11 +27,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <kconfiggroup.h>
#include <KActionCollection>
#include <KDE/KAboutData>
#include <QDebug>
#include <QWidget>
#include <QVBoxLayout>
@ -93,7 +93,7 @@ MagnifierEffectConfig::~MagnifierEffectConfig()
void MagnifierEffectConfig::save()
{
kDebug(1212) << "Saving config of Magnifier" ;
qDebug() << "Saving config of Magnifier" ;
m_ui->editor->save(); // undo() will restore to this state from now on
KCModule::save();

2
effects/mousemark/mousemark.cpp
View file

@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <math.h>
#include <kdebug.h>
#include <QDebug>
#ifdef KWIN_HAVE_XRENDER_COMPOSITING
#include <xcb/render.h>

4
effects/mousemark/mousemark_config.cpp
View file

@ -27,11 +27,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwineffects.h>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <KActionCollection>
#include <KDE/KAboutData>
#include <KDE/KGlobalAccel>
#include <QDebug>
#include <QWidget>
namespace KWin
@ -85,7 +85,7 @@ MouseMarkEffectConfig::~MouseMarkEffectConfig()
void MouseMarkEffectConfig::save()
{
kDebug(1212) << "Saving config of MouseMark" ;
qDebug() << "Saving config of MouseMark" ;
KCModule::save();
m_actionCollection->writeSettings();

8
effects/presentwindows/presentwindows.cpp
View file

@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KIcon>
#include <KDE/KLocalizedString>
#include <KDE/KStandardDirs>
#include <kdebug.h>
#include <QDebug>
#include <kglobalsettings.h>
#include <kdeclarative/kdeclarative.h>
@ -863,7 +863,7 @@ void PresentWindowsEffect::slotPropertyNotify(EffectWindow* w, long a)
for (int i = 0; i < length; i++) {
EffectWindow* foundWin = effects->findWindow(data[i]);
if (!foundWin) {
kDebug(1212) << "Invalid window targetted for present windows. Requested:" << data[i];
qDebug() << "Invalid window targetted for present windows. Requested:" << data[i];
continue;
}
m_selectedWindows.append(foundWin);
@ -1111,7 +1111,7 @@ void PresentWindowsEffect::calculateWindowTransformationsKompose(EffectWindowLis
rows = (int)ceil(sqrt((double)windowlist.count()));
columns = (int)ceil((double)windowlist.count() / (double)rows);
}
//kDebug(1212) << "Using " << rows << " rows & " << columns << " columns for " << windowlist.count() << " clients";
//qDebug() << "Using " << rows << " rows & " << columns << " columns for " << windowlist.count() << " clients";
// Calculate width & height
int w = (availRect.width() - (columns + 1) * spacing) / columns;
@ -1214,7 +1214,7 @@ void PresentWindowsEffect::calculateWindowTransformationsKompose(EffectWindowLis
// winData->slot = pos;
motionManager.moveWindow(window, target);
//kDebug(1212) << "Window '" << window->caption() << "' gets moved to (" <<
//qDebug() << "Window '" << window->caption() << "' gets moved to (" <<
// mWindowData[window].area.left() << "; " << mWindowData[window].area.right() <<
// "), scale: " << mWindowData[window].scale << endl;
}

4
effects/screenshot/screenshot.cpp
View file

@ -274,14 +274,14 @@ QString ScreenShotEffect::blitScreenshot(const QRect &geometry)
{
#ifdef KWIN_HAVE_OPENGLES
Q_UNUSED(geometry)
kDebug(1212) << "Framebuffer Blit not supported";
qDebug() << "Framebuffer Blit not supported";
return QString();
#else
QImage img;
if (effects->isOpenGLCompositing())
{
if (!GLRenderTarget::blitSupported()) {
kDebug(1212) << "Framebuffer Blit not supported";
qDebug() << "Framebuffer Blit not supported";
return QString();
}
GLTexture tex(geometry.width(), geometry.height());

1
effects/showfps/showfps_config.cpp
View file

@ -28,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwineffects.h>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <KDE/KAboutData>
namespace KWin

2
effects/slidingpopups/slidingpopups.cpp
View file

@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "slidingpopups.h"
#include <kdebug.h>
#include <QDebug>
#include <KDE/KConfigGroup>
#include <QTimeLine>

4
effects/startupfeedback/startupfeedback.cpp
View file

@ -135,9 +135,9 @@ void StartupFeedbackEffect::reconfigure(Effect::ReconfigureFlags flags)
const QString shader = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kwin/blinking-startup-fragment.glsl"));
m_blinkingShader = ShaderManager::instance()->loadFragmentShader(ShaderManager::SimpleShader, shader);
if (m_blinkingShader->isValid()) {
kDebug(1212) << "Blinking Shader is valid";
qDebug() << "Blinking Shader is valid";
} else {
kDebug(1212) << "Blinking Shader is not valid";
qDebug() << "Blinking Shader is not valid";
}
}
} else

2
effects/taskbarthumbnail/taskbarthumbnail.cpp
View file

@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "taskbarthumbnail.h"
#include <kdebug.h>
#include <QDebug>
#include <kwinglutils.h>

1
effects/thumbnailaside/thumbnailaside_config.cpp
View file

@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwineffects.h>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <kconfiggroup.h>
#include <KActionCollection>
#include <KDE/KAboutData>

2
effects/trackmouse/trackmouse.cpp
View file

@ -40,7 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <math.h>
#include <kdebug.h>
#include <QDebug>
namespace KWin
{

1
effects/trackmouse/trackmouse_config.cpp
View file

@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwineffects.h>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <KActionCollection>
#include <KDE/KAboutData>
#include <KDE/KGlobalAccel>

28
effects/wobblywindows/wobblywindows.cpp
View file

@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include "wobblywindows.h"
#include "wobblywindowsconfig.h"
#include <kdebug.h>
#include <QDebug>
#include <math.h>
#define USE_ASSERT
@ -164,7 +164,7 @@ WobblyWindowsEffect::~WobblyWindowsEffect()
if (!windows.empty()) {
// we should be empty at this point...
// emit a warning and clean the list.
kDebug(1212) << "Windows list not empty. Left items : " << windows.count();
qDebug() << "Windows list not empty. Left items : " << windows.count();
QHash< const EffectWindow*, WindowWobblyInfos >::iterator i;
for (i = windows.begin(); i != windows.end(); ++i) {
freeWobblyInfo(i.value());
@ -180,7 +180,7 @@ void WobblyWindowsEffect::reconfigure(ReconfigureFlags)
if (settingsMode != QStringLiteral("Custom")) {
unsigned int wobblynessLevel = WobblyWindowsConfig::wobblynessLevel();
if (wobblynessLevel > 4) {
kDebug(1212) << "Wrong value for \"WobblynessLevel\" : " << wobblynessLevel;
qDebug() << "Wrong value for \"WobblynessLevel\" : " << wobblynessLevel;
wobblynessLevel = 4;
}
setParameterSet(pset[wobblynessLevel]);
@ -215,7 +215,7 @@ void WobblyWindowsEffect::reconfigure(ReconfigureFlags)
m_resizeWobble = WobblyWindowsConfig::resizeWobble();
#if defined VERBOSE_MODE
kDebug(1212) << "Parameters :\n" <<
qDebug() << "Parameters :\n" <<
"move : " << m_moveEffectEnabled << ", open : " << m_openEffectEnabled << ", close : " << m_closeEffectEnabled << "\n"
"grid(" << m_stiffness << ", " << m_drag << ", " << m_move_factor << ")\n" <<
"velocity(" << m_minVelocity << ", " << m_maxVelocity << ", " << m_stopVelocity << ")\n" <<
@ -292,7 +292,7 @@ void WobblyWindowsEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& da
while (!stop && (updateTime > maxTime)) {
#if defined VERBOSE_MODE
kDebug(1212) << "loop time " << updateTime << " / " << time;
qDebug() << "loop time " << updateTime << " / " << time;
#endif
stop = !updateWindowWobblyDatas(w, maxTime);
updateTime -= maxTime;
@ -422,14 +422,14 @@ void WobblyWindowsEffect::startMovedResized(EffectWindow* w)
int indy = (picked.y - rect.y()) / y_increment + 0.5;
int pickedPointIndex = indy * wwi.width + indx;
if (pickedPointIndex < 0) {
kDebug(1212) << "Picked index == " << pickedPointIndex << " with (" << cursorPos().x() << "," << cursorPos().y() << ")";
qDebug() << "Picked index == " << pickedPointIndex << " with (" << cursorPos().x() << "," << cursorPos().y() << ")";
pickedPointIndex = 0;
} else if (static_cast<unsigned int>(pickedPointIndex) > wwi.count - 1) {
kDebug(1212) << "Picked index == " << pickedPointIndex << " with (" << cursorPos().x() << "," << cursorPos().y() << ")";
qDebug() << "Picked index == " << pickedPointIndex << " with (" << cursorPos().x() << "," << cursorPos().y() << ")";
pickedPointIndex = wwi.count - 1;
}
#if defined VERBOSE_MODE
kDebug(1212) << "Original Picked point -- x : " << picked.x << " - y : " << picked.y;
qDebug() << "Original Picked point -- x : " << picked.x << " - y : " << picked.y;
#endif
wwi.constraint[pickedPointIndex] = true;
@ -716,8 +716,8 @@ bool WobblyWindowsEffect::updateWindowWobblyDatas(EffectWindow* w, qreal time)
qreal y_length = rect.height() / (wwi.height - 1.0);
#if defined VERBOSE_MODE
kDebug(1212) << "time " << time;
kDebug(1212) << "increment x " << x_length << " // y" << y_length;
qDebug() << "time " << time;
qDebug() << "increment x " << x_length << " // y" << y_length;
#endif
Pair origine = {rect.x(), rect.y()};
@ -1013,7 +1013,7 @@ bool WobblyWindowsEffect::updateWindowWobblyDatas(EffectWindow* w, qreal time)
#if defined VERBOSE_MODE
if (wwi.constraint[i]) {
kDebug(1212) << "Constraint point ** vel : " << vel.x << "," << vel.y << " ** move : " << vel.x*time << "," << vel.y*time;
qDebug() << "Constraint point ** vel : " << vel.x << "," << vel.y << " ** move : " << vel.x*time << "," << vel.y*time;
}
#endif
}
@ -1041,10 +1041,10 @@ bool WobblyWindowsEffect::updateWindowWobblyDatas(EffectWindow* w, qreal time)
#if defined VERBOSE_MODE
# if defined COMPUTE_STATS
kDebug(1212) << "Acceleration bounds (" << accBound.x << ", " << accBound.y << ")";
kDebug(1212) << "Velocity bounds (" << velBound.x << ", " << velBound.y << ")";
qDebug() << "Acceleration bounds (" << accBound.x << ", " << accBound.y << ")";
qDebug() << "Velocity bounds (" << velBound.x << ", " << velBound.y << ")";
# endif
kDebug(1212) << "sum_acc : " << acc_sum << " *** sum_vel :" << vel_sum;
qDebug() << "sum_acc : " << acc_sum << " *** sum_vel :" << vel_sum;
#endif
if (wwi.status != Moving && acc_sum < m_stopAcceleration && vel_sum < m_stopVelocity) {

1
effects/wobblywindows/wobblywindows_config.cpp
View file

@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwineffects.h>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <KDE/KAboutData>
#include <kconfiggroup.h>

2
effects/zoom/zoom.cpp
View file

@ -204,7 +204,7 @@ void ZoomEffect::recreateTexture()
XcursorImageDestroy(ximg);
}
else {
kDebug(1212) << "Loading cursor image (" << theme << ") FAILED -> falling back to proportional mouse tracking!";
qDebug() << "Loading cursor image (" << theme << ") FAILED -> falling back to proportional mouse tracking!";
mouseTracking = MouseTrackingProportional;
}
}

1
effects/zoom/zoom_config.cpp
View file

@ -28,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KDE/KGlobalAccel>
#include <KDE/KLocalizedString>
#include <kdebug.h>
#include <KActionCollection>
#include <KDE/KAboutData>
#include <KDE/KIcon>