summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kdm/backend/consolekit.c36
-rw-r--r--kdm/backend/consolekit.h36
-rw-r--r--khotkeys/arts/soundrecorder_arts.cpp40
-rw-r--r--khotkeys/arts/soundrecorder_arts.h39
-rw-r--r--kioslave/media/propsdlgplugin/propertiespage.cpp80
-rw-r--r--kioslave/media/propsdlgplugin/propertiespage.h36
-rw-r--r--kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp53
-rw-r--r--kioslave/media/propsdlgplugin/propsdlgshareplugin.h34
8 files changed, 178 insertions, 176 deletions
diff --git a/kdm/backend/consolekit.c b/kdm/backend/consolekit.c
index cb59b7369..61d0b165e 100644
--- a/kdm/backend/consolekit.c
+++ b/kdm/backend/consolekit.c
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2006-2007 William Jon McCann <mccann@jhu.edu>
- * Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+
+ Copyright (C) 2006-2007 William Jon McCann <mccann@jhu.edu>
+ Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
+
+ 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 Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
#include "dm.h"
diff --git a/kdm/backend/consolekit.h b/kdm/backend/consolekit.h
index f1cbddb54..e385e3f91 100644
--- a/kdm/backend/consolekit.h
+++ b/kdm/backend/consolekit.h
@@ -1,22 +1,22 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2006 William Jon McCann <mccann@jhu.edu>
- * Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+
+ Copyright (C) 2006 William Jon McCann <mccann@jhu.edu>
+ Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
+
+ 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 Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp
index db3ea77d8..2b1563787 100644
--- a/khotkeys/arts/soundrecorder_arts.cpp
+++ b/khotkeys/arts/soundrecorder_arts.cpp
@@ -1,22 +1,22 @@
-/***************************************************************************
- * Copyright (C) 2005 by Olivier Goffart *
- * ogoffart@kde.org *
- * *
- * 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., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
+/*
+ Copyright (C) 2005 by Olivier Goffart
+ ogoffart@kde.org
+
+ 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 Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -104,7 +104,7 @@ Sound SoundRecorderArts::sound()
int nb=(unsigned char)(m_data[f]) -128;
#elif BITS==16
int nb=(m_data[2*f] &0x000000FF ) | ( (m_data[2*f+1] &0x000000FF ) << 8 ) ;
- if(nb & (1<< 15))
+ if(nb & (1<< 15))
nb = nb-(1<<16);
#else
#error BITS is not 16 or 8
diff --git a/khotkeys/arts/soundrecorder_arts.h b/khotkeys/arts/soundrecorder_arts.h
index 33422aff7..da11ce04b 100644
--- a/khotkeys/arts/soundrecorder_arts.h
+++ b/khotkeys/arts/soundrecorder_arts.h
@@ -1,22 +1,23 @@
-/***************************************************************************
- * Copyright (C) 2005 by Olivier Goffart *
- * ogoffart@kde.org *
- * *
- * 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., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
+/*
+ Copyright (C) 2005 by Olivier Goffart
+ ogoffart@kde.org
+
+ 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 Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
#ifndef RECORDER_ARTS_H
#define RECORDER_ARTS_H
diff --git a/kioslave/media/propsdlgplugin/propertiespage.cpp b/kioslave/media/propsdlgplugin/propertiespage.cpp
index fd1c098e0..455d1e2e3 100644
--- a/kioslave/media/propsdlgplugin/propertiespage.cpp
+++ b/kioslave/media/propsdlgplugin/propertiespage.cpp
@@ -1,20 +1,20 @@
/*
- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de>
-
- 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
+ Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de>
+
+ 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 Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
#include <qcheckbox.h>
@@ -51,7 +51,7 @@ PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id)
if (list.size()) {
kdDebug() << "list " << list << endl;
-
+
for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
{
QString key = (*it).left((*it).find('='));
@@ -60,57 +60,57 @@ PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id)
options[key] = value;
}
- if (!options.contains("ro"))
+ if (!options.contains("ro"))
option_ro->hide();
else
option_ro->setChecked(options["ro"] == "true");
connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
- if (!options.contains("quiet"))
+ if (!options.contains("quiet"))
option_quiet->hide();
else
option_quiet->setChecked(options["quiet"] == "true");
connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
- if (!options.contains("sync"))
+ if (!options.contains("sync"))
option_sync->hide();
else
option_sync->setChecked(options["sync"] == "true");
connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
- if (!options.contains("atime"))
+ if (!options.contains("atime"))
option_atime->hide();
else
option_atime->setChecked(options["atime"] == "true");
connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
- if (!options.contains("flush"))
+ if (!options.contains("flush"))
option_flush->hide();
else
option_flush->setChecked(options["flush"] == "true");
connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
- if (!options.contains("utf8"))
+ if (!options.contains("utf8"))
option_utf8->hide();
else
option_utf8->setChecked(options["utf8"] == "true");
connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
- if (!options.contains("uid"))
+ if (!options.contains("uid"))
option_uid->hide();
else
option_uid->setChecked(options["uid"] == "true");
connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) );
- if (!options.contains("shortname"))
+ if (!options.contains("shortname"))
{
option_shortname->hide();
text_shortname->hide();
}
- else
+ else
{
for (int index = 0; short_names[index]; ++index)
- if (options["shortname"] == short_names[index])
+ if (options["shortname"] == short_names[index])
{
option_shortname->setCurrentItem(index);
break;
@@ -118,15 +118,15 @@ PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id)
connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) );
}
- if (!options.contains("journaling"))
+ if (!options.contains("journaling"))
{
text_journaling->hide();
option_journaling->hide();
- }
+ }
else
{
for (int index = 0; journales[index]; ++index)
- if (options["journaling"] == journales[index])
+ if (options["journaling"] == journales[index])
{
option_journaling->setCurrentItem(index);
break;
@@ -148,25 +148,25 @@ PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id)
groupbox_specific->hide();
} else {
-
+
groupbox_generic->setEnabled(false);
groupbox_specific->setEnabled(false);
label_filesystem->hide();
}
}
-PropertiesPage::~PropertiesPage()
+PropertiesPage::~PropertiesPage()
{
}
-bool PropertiesPage::save()
+bool PropertiesPage::save()
{
QStringList result;
- if (options.contains("ro"))
+ if (options.contains("ro"))
result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false");
- if (options.contains("quiet"))
+ if (options.contains("quiet"))
result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false");
if (options.contains("sync"))
@@ -184,10 +184,10 @@ bool PropertiesPage::save()
if (options.contains("uid"))
result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false");
- if (options.contains("shortname"))
+ if (options.contains("shortname"))
result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]);
- if (options.contains("journaling"))
+ if (options.contains("journaling"))
result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]);
QString mp = option_mountpoint->text();
@@ -203,15 +203,15 @@ bool PropertiesPage::save()
DCOPRef mediamanager("kded", "mediamanager");
DCOPReply reply = mediamanager.call( "setMountoptions", id, result);
-
+
if (reply.isValid())
return (bool)reply;
else {
KMessageBox::sorry(this,
i18n("Saving the changes failed"));
-
+
return false;
}
-}
+}
#include "propertiespage.moc"
diff --git a/kioslave/media/propsdlgplugin/propertiespage.h b/kioslave/media/propsdlgplugin/propertiespage.h
index 7bc47599e..fa23c7873 100644
--- a/kioslave/media/propsdlgplugin/propertiespage.h
+++ b/kioslave/media/propsdlgplugin/propertiespage.h
@@ -1,20 +1,20 @@
/*
- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de>
-
- 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
+ Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de>
+
+ 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 Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
#ifndef PROPERTIESPAGE_H
@@ -33,11 +33,11 @@ class PropertiesPage : public PropertiesPageGUI
public:
PropertiesPage(QWidget* parent, const QString &_id);
virtual ~PropertiesPage();
-
+
bool save();
protected:
-
+
QMap<QString,QString> options;
QString id;
diff --git a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
index ebfd2c3de..dbaf6e898 100644
--- a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
@@ -1,21 +1,22 @@
/*
- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de>
-
- 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
+ Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de>
+
+ 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 Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
+
#include <qstring.h>
#include <qvbox.h>
#include <qlayout.h>
@@ -42,12 +43,12 @@ typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePlu
K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin,
PropsDlgSharePluginFactory("media_propsdlgplugin") )
-class PropsDlgSharePlugin::Private
+class PropsDlgSharePlugin::Private
{
public:
- PropertiesPage* page;
+ PropertiesPage* page;
};
-
+
PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
const char *, const QStringList & )
: KPropsDlgPlugin(dlg), d(0)
@@ -60,21 +61,21 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
DCOPRef mediamanager("kded", "mediamanager");
kdDebug() << "properties " << item->url() << endl;
DCOPReply reply = mediamanager.call( "properties", item->url().url() );
-
+
if ( !reply.isValid() )
return;
-
+
QVBox* vbox = properties->addVBoxPage(i18n("&Mounting"));
-
+
d = new Private();
-
+
d->page = new PropertiesPage(vbox, Medium::create(reply).id());
connect(d->page, SIGNAL(changed()),
SLOT(slotChanged()));
// QTimer::singleShot(100, this, SLOT(slotChanged()));
-
-}
+
+}
void PropsDlgSharePlugin::slotChanged()
{
@@ -87,7 +88,7 @@ PropsDlgSharePlugin::~PropsDlgSharePlugin()
delete d;
}
-void PropsDlgSharePlugin::applyChanges()
+void PropsDlgSharePlugin::applyChanges()
{
kdDebug() << "applychanges\n";
if (!d->page->save()) {
diff --git a/kioslave/media/propsdlgplugin/propsdlgshareplugin.h b/kioslave/media/propsdlgplugin/propsdlgshareplugin.h
index 10ec47454..cb9fdfaab 100644
--- a/kioslave/media/propsdlgplugin/propsdlgshareplugin.h
+++ b/kioslave/media/propsdlgplugin/propsdlgshareplugin.h
@@ -1,20 +1,20 @@
/*
- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de>
-
- 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
+ Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de>
+
+ 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 Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
#ifndef KONQFILESHAREPLUGIN_H
@@ -36,7 +36,7 @@ public slots:
private:
class Private;
Private *d;
-
+
};
#endif