mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-23 18:32:50 +00:00
generic: remove redundant QT_CLEAN_NAMESPACE definitions
Katie's namespace is always clean, if there is a namespace issue perhaps it is not cause of it Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
4a34d42786
commit
d3da8b90b8
4 changed files with 6 additions and 14 deletions
|
@ -25,9 +25,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#ifndef CLIENT_H
|
||||
#define CLIENT_H
|
||||
|
||||
// needed to avoid clash with INT8 defined in X11/Xmd.h on solaris
|
||||
#define QT_CLEAN_NAMESPACE 1
|
||||
|
||||
#include <kapplication.h>
|
||||
#include <kworkspace/kworkspace.h>
|
||||
|
||||
|
|
|
@ -25,18 +25,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#ifndef SERVER_H
|
||||
#define SERVER_H
|
||||
|
||||
// needed to avoid clash with INT8 defined in X11/Xmd.h on solaris
|
||||
#define QT_CLEAN_NAMESPACE 1
|
||||
#include <QStringList>
|
||||
#include <QObject>
|
||||
#include <QProcess>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QDBusInterface>
|
||||
#include <QMap>
|
||||
|
||||
#include <kapplication.h>
|
||||
#include <kworkspace/kworkspace.h>
|
||||
#include <kmessagebox.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/qdatetime.h>
|
||||
#include <QMap>
|
||||
|
||||
#define INT32 QINT32
|
||||
#include <X11/Xlib.h>
|
||||
|
@ -60,7 +59,6 @@ class KSMConnection;
|
|||
class KSMClient;
|
||||
|
||||
class OrgKdeKLauncherInterface;
|
||||
#include <QDBusInterface>
|
||||
|
||||
enum SMType { SM_ERROR, SM_WMCOMMAND, SM_WMSAVEYOURSELF };
|
||||
struct SMData
|
||||
|
|
|
@ -25,18 +25,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
|
||||
*/
|
||||
|
||||
//#define QT_CLEAN_NAMESPACE
|
||||
|
||||
#include "group.h"
|
||||
#include <QTextStream>
|
||||
#include "workspace.h"
|
||||
#include "client.h"
|
||||
#include "effects.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <kstartupinfo.h>
|
||||
#include <QtGui/qx11info_x11.h>
|
||||
#include <QTextStream>
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
/*
|
||||
TODO
|
||||
|
|
|
@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*********************************************************************/
|
||||
|
||||
//#define QT_CLEAN_NAMESPACE
|
||||
// own
|
||||
#include "tabbox.h"
|
||||
// tabbox
|
||||
|
|
Loading…
Add table
Reference in a new issue