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

Remove use of k_funcinfo

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=702583
This commit is contained in:
Thiago Macieira 2007-08-20 21:33:48 +00:00
parent 1819a26980
commit d2aee14a35
12 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
effects.cpp
View file

@ -607,7 +607,7 @@ KLibrary* EffectsHandlerImpl::findEffectLibrary( KService* service )
KLibrary* library = KLibLoader::self()->library(libname);
if( !library )
{
kError( 1212 ) << k_funcinfo << "couldn't open library for effect '" <<
kError( 1212 ) << "couldn't open library for effect '" <<
service->name() << "'" << endl;
return 0;
}
@ -632,7 +632,7 @@ bool EffectsHandlerImpl::loadEffect( const QString& name )
assert( current_transform == 0 );
if( !name.startsWith("kwin4_effect_") )
kWarning( 1212 ) << k_funcinfo << "Effect names usually have kwin4_effect_ prefix" ;
kWarning( 1212 ) << "Effect names usually have kwin4_effect_ prefix" ;
// Make sure a single effect won't be loaded multiple times
for(QVector< EffectPair >::const_iterator it = loaded_effects.constBegin(); it != loaded_effects.constEnd(); ++it)
@ -645,14 +645,14 @@ bool EffectsHandlerImpl::loadEffect( const QString& name )
}
kDebug( 1212 ) << k_funcinfo << "Trying to load " << name;
kDebug( 1212 ) << "Trying to load " << name;
QString internalname = name.toLower();
QString constraint = QString("[X-KDE-PluginInfo-Name] == '%1'").arg(internalname);
KService::List offers = KServiceTypeTrader::self()->query("KWin/Effect", constraint);
if(offers.isEmpty())
{
kError( 1212 ) << k_funcinfo << "Couldn't find effect " << name << endl;
kError( 1212 ) << "Couldn't find effect " << name << endl;
return false;
}
KService::Ptr service = offers.first();
@ -755,10 +755,10 @@ bool EffectsHandlerImpl::isEffectLoaded( const QString& name )
void EffectsHandlerImpl::effectsChanged()
{
loaded_effects.clear();
kDebug() << k_funcinfo << "Recreating effects' list:";
kDebug() << "Recreating effects' list:";
foreach( EffectPair effect, effect_order )
{
kDebug() << k_funcinfo << effect.first;
kDebug() << effect.first;
loaded_effects.append( effect );
}
}

6
effects/blur.cpp
View file

@ -62,7 +62,7 @@ bool BlurEffect::loadData()
int texh = displayHeight();
if( !GLTexture::NPOTTextureSupported() )
{
kWarning( 1212 ) << k_funcinfo << "NPOT textures not supported, wasting some memory" ;
kWarning( 1212 ) << "NPOT textures not supported, wasting some memory" ;
texw = nearestPowerOfTwo(texw);
texh = nearestPowerOfTwo(texh);
}
@ -111,13 +111,13 @@ GLShader* BlurEffect::loadShader(const QString& name)
QString vertexshader = KGlobal::dirs()->findResource("data", "kwin/" + name + ".vert");
if(fragmentshader.isEmpty() || vertexshader.isEmpty())
{
kError() << k_funcinfo << "Couldn't locate shader files for '" << name << "'" << endl;
kError() << "Couldn't locate shader files for '" << name << "'" << endl;
return false;
}
GLShader* shader = new GLShader(vertexshader, fragmentshader);
if(!shader->isValid())
{
kError() << k_funcinfo << "Shader '" << name << "' failed to load!" << endl;
kError() << "Shader '" << name << "' failed to load!" << endl;
delete shader;
return 0;
}

6
effects/demo_liquid.cpp
View file

@ -52,7 +52,7 @@ bool LiquidEffect::loadData()
int texh = displayHeight();
if( !GLTexture::NPOTTextureSupported() )
{
kWarning( 1212 ) << k_funcinfo << "NPOT textures not supported, wasting some memory" ;
kWarning( 1212 ) << "NPOT textures not supported, wasting some memory" ;
texw = nearestPowerOfTwo(texw);
texh = nearestPowerOfTwo(texh);
}
@ -69,13 +69,13 @@ bool LiquidEffect::loadData()
QString vertexshader = KGlobal::dirs()->findResource("data", "kwin/liquid.vert");
if(fragmentshader.isEmpty() || vertexshader.isEmpty())
{
kError() << k_funcinfo << "Couldn't locate shader files" << endl;
kError() << "Couldn't locate shader files" << endl;
return false;
}
mShader = new GLShader(vertexshader, fragmentshader);
if(!mShader->isValid())
{
kError() << k_funcinfo << "The shader failed to load!" << endl;
kError() << "The shader failed to load!" << endl;
return false;
}
mShader->bind();

8
effects/explosioneffect.cpp
View file

@ -60,19 +60,19 @@ bool ExplosionEffect::loadData()
QString endtexture = KGlobal::dirs()->findResource("data", "kwin/explosion-end.png");
if(fragmentshader.isEmpty() || vertexshader.isEmpty())
{
kError() << k_funcinfo << "Couldn't locate shader files" << endl;
kError() << "Couldn't locate shader files" << endl;
return false;
}
if(starttexture.isEmpty() || endtexture.isEmpty())
{
kError() << k_funcinfo << "Couldn't locate texture files" << endl;
kError() << "Couldn't locate texture files" << endl;
return false;
}
mShader = new GLShader(vertexshader, fragmentshader);
if(!mShader->isValid())
{
kError() << k_funcinfo << "The shader failed to load!" << endl;
kError() << "The shader failed to load!" << endl;
return false;
}
else
@ -88,7 +88,7 @@ bool ExplosionEffect::loadData()
mEndOffsetTex = new GLTexture(endtexture);
if(mStartOffsetTex->isNull() || mEndOffsetTex->isNull())
{
kError() << k_funcinfo << "The textures failed to load!" << endl;
kError() << "The textures failed to load!" << endl;
return false;
}
else

2
effects/lookingglass.cpp
View file

@ -78,7 +78,7 @@ void LookingGlassEffect::prePaintScreen( ScreenPrePaintData& data, int time )
zoom = qMin( zoom * qMax( 1.0f + diff, 1.2f ), target_zoom );
else
zoom = qMax( zoom * qMin( 1.0f - diff, 0.8f ), target_zoom );
kDebug() << k_funcinfo << "zoom is now " << zoom;
kDebug() << "zoom is now " << zoom;
radius = qBound(200.0f, 200.0f * zoom, 500.0f);
if( zoom > 1.0f )

8
effects/presentwindows.cpp
View file

@ -390,7 +390,7 @@ void PresentWindowsEffect::calculateWindowTransformationsDumb(EffectWindowList w
// Size of one cell
int cellwidth = placementRect.width() / cols;
int cellheight = placementRect.height() / rows;
kDebug() << k_funcinfo << "Got " << windowlist.count() << " clients, using " << rows << "x" << cols << " grid";
kDebug() << "Got " << windowlist.count() << " clients, using " << rows << "x" << cols << " grid";
// Calculate position and scale factor for each window
int i = 0;
@ -407,7 +407,7 @@ void PresentWindowsEffect::calculateWindowTransformationsDumb(EffectWindowList w
mWindowData[window].area.setWidth((int)(window->width() * mWindowData[window].scale));
mWindowData[window].area.setHeight((int)(window->height() * mWindowData[window].scale));
kDebug() << k_funcinfo << "Window '" << window->caption() << "' gets moved to (" <<
kDebug() << "Window '" << window->caption() << "' gets moved to (" <<
mWindowData[window].area.left() << "; " << mWindowData[window].area.right() <<
"), scale: " << mWindowData[window].scale << endl;
i++;
@ -450,7 +450,7 @@ void PresentWindowsEffect::calculateWindowTransformationsKompose(EffectWindowLis
rows = (int)ceil( sqrt(windowlist.count()) );
columns = (int)ceil( (float)windowlist.count() / (float)rows );
}
kDebug() << k_funcinfo << "Using " << rows << " rows & " << columns << " columns for " << windowlist.count() << " clients";
kDebug() << "Using " << rows << " rows & " << columns << " columns for " << windowlist.count() << " clients";
// Calculate width & height
int w = (availRect.width() - (columns+1) * spacing ) / columns;
@ -559,7 +559,7 @@ void PresentWindowsEffect::calculateWindowTransformationsKompose(EffectWindowLis
mWindowData[window].scale = geom.width() / (float)window->width();
mWindowData[window].hover = 0.0f;
kDebug() << k_funcinfo << "Window '" << window->caption() << "' gets moved to (" <<
kDebug() << "Window '" << window->caption() << "' gets moved to (" <<
mWindowData[window].area.left() << "; " << mWindowData[window].area.right() <<
"), scale: " << mWindowData[window].scale << endl;
}

10
effects/presentwindows_config.cpp
View file

@ -29,7 +29,7 @@ namespace KWin
PresentWindowsEffectConfig::PresentWindowsEffectConfig(QWidget* parent, const QStringList& args) :
KCModule(KGenericFactory<PresentWindowsEffectConfig>::componentData(), parent, args)
{
kDebug() << k_funcinfo;
kDebug() ;
QGridLayout* layout = new QGridLayout(this);
@ -56,7 +56,7 @@ PresentWindowsEffectConfig::PresentWindowsEffectConfig(QWidget* parent, const QS
PresentWindowsEffectConfig::~PresentWindowsEffectConfig()
{
kDebug() << k_funcinfo;
kDebug() ;
}
void PresentWindowsEffectConfig::addItems(QComboBox* combo)
@ -74,7 +74,7 @@ void PresentWindowsEffectConfig::addItems(QComboBox* combo)
void PresentWindowsEffectConfig::load()
{
kDebug() << k_funcinfo;
kDebug() ;
KCModule::load();
KConfigGroup conf = EffectsHandler::effectConfig("PresentWindows");
@ -92,7 +92,7 @@ void PresentWindowsEffectConfig::load()
void PresentWindowsEffectConfig::save()
{
kDebug() << k_funcinfo;
kDebug() ;
KCModule::save();
KConfigGroup conf = EffectsHandler::effectConfig("PresentWindows");
@ -114,7 +114,7 @@ void PresentWindowsEffectConfig::save()
void PresentWindowsEffectConfig::defaults()
{
kDebug() << k_funcinfo;
kDebug() ;
mActivateCombo->setCurrentIndex( (int)ElectricTopRight );
mActivateAllCombo->setCurrentIndex( (int)ElectricNone - 1 );
emit changed(true);

10
effects/shadow_config.cpp
View file

@ -29,7 +29,7 @@ namespace KWin
ShadowEffectConfig::ShadowEffectConfig(QWidget* parent, const QStringList& args) :
KCModule(KGenericFactory<ShadowEffectConfig>::componentData(), parent, args)
{
kDebug() << k_funcinfo;
kDebug() ;
QGridLayout* layout = new QGridLayout(this);
@ -65,12 +65,12 @@ ShadowEffectConfig::ShadowEffectConfig(QWidget* parent, const QStringList& args)
ShadowEffectConfig::~ShadowEffectConfig()
{
kDebug() << k_funcinfo;
kDebug() ;
}
void ShadowEffectConfig::load()
{
kDebug() << k_funcinfo;
kDebug() ;
KCModule::load();
KConfigGroup conf = EffectsHandler::effectConfig("Shadow");
@ -84,7 +84,7 @@ void ShadowEffectConfig::load()
void ShadowEffectConfig::save()
{
kDebug() << k_funcinfo;
kDebug() ;
KCModule::save();
KConfigGroup conf = EffectsHandler::effectConfig("Shadow");
@ -100,7 +100,7 @@ void ShadowEffectConfig::save()
void ShadowEffectConfig::defaults()
{
kDebug() << k_funcinfo;
kDebug() ;
mShadowXOffset->setValue( 10 );
mShadowYOffset->setValue( 10 );
mShadowOpacity->setValue( 20 );

8
kcmkwin/kwincompositing/main.cpp
View file

@ -75,7 +75,7 @@ void KWinCompositingConfig::showAdvancedOptions()
void KWinCompositingConfig::load()
{
kDebug() << k_funcinfo;
kDebug() ;
mKWinConfig->reparseConfiguration();
KConfigGroup config(mKWinConfig, "Compositing");
@ -98,7 +98,7 @@ void KWinCompositingConfig::load()
void KWinCompositingConfig::save()
{
kDebug() << k_funcinfo;
kDebug() ;
KConfigGroup config(mKWinConfig, "Compositing");
config.writeEntry("Enabled", ui.useCompositing->isChecked());
@ -133,7 +133,7 @@ void KWinCompositingConfig::configChanged()
void KWinCompositingConfig::defaults()
{
kDebug() << k_funcinfo;
kDebug() ;
ui.useCompositing->setChecked(false);
ui.effectWinManagement->setChecked(true);
ui.effectShadows->setChecked(true);
@ -142,7 +142,7 @@ void KWinCompositingConfig::defaults()
QString KWinCompositingConfig::quickHelp() const
{
kDebug() << k_funcinfo;
kDebug() ;
return i18n("<h1>Desktop Effects</h1>");
}

8
kcmkwin/kwineffects/main.cpp
View file

@ -81,7 +81,7 @@ void KWinEffectsConfig::reparseConfiguration(const QByteArray&conf)
void KWinEffectsConfig::load()
{
kDebug() << k_funcinfo;
kDebug() ;
mKWinConfig->reparseConfiguration();
mPluginSelector->load();
@ -92,7 +92,7 @@ void KWinEffectsConfig::load()
void KWinEffectsConfig::save()
{
kDebug() << k_funcinfo;
kDebug() ;
mPluginSelector->save();
@ -108,13 +108,13 @@ void KWinEffectsConfig::save()
void KWinEffectsConfig::defaults()
{
kDebug() << k_funcinfo;
kDebug() ;
mPluginSelector->defaults();
}
QString KWinEffectsConfig::quickHelp() const
{
kDebug() << k_funcinfo;
kDebug() ;
return i18n("<h1>Window Effects</h1> Here you can configure which effects will be used.");
}

20
lib/kwinglutils.cpp
View file

@ -677,7 +677,7 @@ bool GLShader::loadFromFiles(const QString& vertexfile, const QString& fragmentf
QFile vf(vertexfile);
if(!vf.open(QIODevice::ReadOnly))
{
kError(1212) << k_funcinfo << "Couldn't open '" << vertexfile << "' for reading!" << endl;
kError(1212) << "Couldn't open '" << vertexfile << "' for reading!" << endl;
return false;
}
QString vertexsource(vf.readAll());
@ -685,7 +685,7 @@ bool GLShader::loadFromFiles(const QString& vertexfile, const QString& fragmentf
QFile ff(fragmentfile);
if(!ff.open(QIODevice::ReadOnly))
{
kError(1212) << k_funcinfo << "Couldn't open '" << fragmentfile << "' for reading!" << endl;
kError(1212) << "Couldn't open '" << fragmentfile << "' for reading!" << endl;
return false;
}
QString fragsource(ff.readAll());
@ -699,7 +699,7 @@ bool GLShader::load(const QString& vertexsource, const QString& fragmentsource)
if(( !vertexsource.isEmpty() && !vertexShaderSupported() ) ||
( !fragmentsource.isEmpty() && !fragmentShaderSupported() ))
{
kDebug(1212) << k_funcinfo << "Shaders not supported";
kDebug(1212) << "Shaders not supported";
return false;
}
@ -730,7 +730,7 @@ bool GLShader::load(const QString& vertexsource, const QString& fragmentsource)
glGetShaderInfoLog(vertexshader, logarraysize, &logsize, log);
if(!compiled)
{
kError(1212) << k_funcinfo << "Couldn't compile vertex shader! Log:" << endl << log << endl;
kError(1212) << "Couldn't compile vertex shader! Log:" << endl << log << endl;
delete[] log;
return false;
}
@ -763,7 +763,7 @@ bool GLShader::load(const QString& vertexsource, const QString& fragmentsource)
glGetShaderInfoLog(fragmentshader, logarraysize, &logsize, log);
if(!compiled)
{
kError(1212) << k_funcinfo << "Couldn't compile fragment shader! Log:" << endl << log << endl;
kError(1212) << "Couldn't compile fragment shader! Log:" << endl << log << endl;
delete[] log;
return false;
}
@ -788,7 +788,7 @@ bool GLShader::load(const QString& vertexsource, const QString& fragmentsource)
glGetProgramInfoLog(mProgram, logarraysize, &logsize, log);
if(!linked)
{
kError(1212) << k_funcinfo << "Couldn't link the program! Log" << endl << log << endl;
kError(1212) << "Couldn't link the program! Log" << endl << log << endl;
delete[] log;
return false;
}
@ -893,7 +893,7 @@ GLRenderTarget::GLRenderTarget(GLTexture* color)
initFBO();
}
else
kError(1212) << k_funcinfo << "Render targets aren't supported!" << endl;
kError(1212) << "Render targets aren't supported!" << endl;
}
GLRenderTarget::~GLRenderTarget()
@ -908,7 +908,7 @@ bool GLRenderTarget::enable()
{
if(!valid())
{
kError(1212) << k_funcinfo << "Can't enable invalid render target!" << endl;
kError(1212) << "Can't enable invalid render target!" << endl;
return false;
}
@ -922,7 +922,7 @@ bool GLRenderTarget::disable()
{
if(!valid())
{
kError(1212) << k_funcinfo << "Can't disable invalid render target!" << endl;
kError(1212) << "Can't disable invalid render target!" << endl;
return false;
}
@ -943,7 +943,7 @@ void GLRenderTarget::initFBO()
GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
if(status != GL_FRAMEBUFFER_COMPLETE_EXT)
{
kError(1212) << k_funcinfo << "Invalid fb status: " << status << endl;
kError(1212) << "Invalid fb status: " << status << endl;
}
glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);

6
lib/kwinshadereffect.cpp
View file

@ -52,7 +52,7 @@ bool ShaderEffect::loadData(const QString& shadername)
int texh = displayHeight();
if( !GLTexture::NPOTTextureSupported() )
{
kWarning( 1212 ) << k_funcinfo << "NPOT textures not supported, wasting some memory" ;
kWarning( 1212 ) << "NPOT textures not supported, wasting some memory" ;
texw = nearestPowerOfTwo(texw);
texh = nearestPowerOfTwo(texh);
}
@ -69,13 +69,13 @@ bool ShaderEffect::loadData(const QString& shadername)
QString vertexshader = KGlobal::dirs()->findResource("data", "kwin/" + shadername + ".vert");
if(fragmentshader.isEmpty() || vertexshader.isEmpty())
{
kError() << k_funcinfo << "Couldn't locate shader files" << endl;
kError() << "Couldn't locate shader files" << endl;
return false;
}
mShader = new GLShader(vertexshader, fragmentshader);
if(!mShader->isValid())
{
kError() << k_funcinfo << "The shader failed to load!" << endl;
kError() << "The shader failed to load!" << endl;
return false;
}
mShader->bind();