tqt3integration/CMakeLists.txt

diff --git a/tqt3integration/CMakeLists.txt b/tqt3integration/CMakeLists.txt

index 4ecacf1..75120af 100644

--- a/tqt3integration/CMakeLists.txt

+++ b/tqt3integration/CMakeLists.txt

@@ -17,6 +17,6 @@

 ##### subdirectories ############################

-add_subdirectory( libtqtkde )

+add_subdirectory( libtqttde )

 add_subdirectory( module )

 add_subdirectory( utils )

tqt3integration/Makefile.am

diff --git a/tqt3integration/Makefile.am b/tqt3integration/Makefile.am

index 6d657bd..fe6a0e7 100644

--- a/tqt3integration/Makefile.am

+++ b/tqt3integration/Makefile.am

@@ -1 +1 @@

-SUBDIRS = libtqtkde module utils

+SUBDIRS = libtqttde module utils

tqt3integration/README

diff --git a/tqt3integration/README b/tqt3integration/README

index 47edd14..1af1034 100644

--- a/tqt3integration/README

+++ b/tqt3integration/README

@@ -1,5 +1,5 @@

-TQt/KDE UI integration. Makes TQt-only apps use several KDE dialogs without any modifications

-to these applications. Can be turned off by setting $TQT_NO_KDE_INTEGRATION.

+TQt/TDE UI integration. Makes TQt-only apps use several TDE dialogs without any modifications

+to these applications. Can be turned off by setting $TQT_NO_TDE_INTEGRATION.

 Installation:

 Just plain make && make install.

tqt3integration/configure.in.in

diff --git a/tqt3integration/configure.in.in b/tqt3integration/configure.in.in

index b2c264d..46ca8fb 100644

--- a/tqt3integration/configure.in.in

+++ b/tqt3integration/configure.in.in

@@ -1,5 +1,5 @@

-tqtkdelibdir="\${kde_moduledir}/plugins/integration"

-KDE_EXPAND_MAKEVAR(ac_tqtkdelibdir,tqtkdelibdir)

-AC_SUBST(tqtkdelibdir)

-AC_SUBST(ac_tqtkdelibdir)

-dnl AC_OUTPUT(tqtkdeintegration/utils/tqt/in/tqtkdeintegration_x11_0.cpp)

+tqttdelibdir="\${kde_moduledir}/plugins/integration"

+KDE_EXPAND_MAKEVAR(ac_tqttdelibdir,tqttdelibdir)

+AC_SUBST(tqttdelibdir)

+AC_SUBST(ac_tqttdelibdir)

+dnl AC_OUTPUT(tqttdeintegration/utils/tqt/in/tqttdeintegration_x11_0.cpp)

tqt3integration/libtqtkde/CMakeLists.txt

diff --git a/tqt3integration/libtqtkde/CMakeLists.txt b/tqt3integration/libtqtkde/CMakeLists.txt

deleted file mode 100644

index dbfb65e..0000000

--- a/tqt3integration/libtqtkde/CMakeLists.txt

+++ /dev/null

@@ -1,34 +0,0 @@

-#################################################

-#

-#  (C) 2011 Timothy Pearson

-#  kb9vqf (AT) pearsoncomputing.net

-#

-#  Improvements and feedback are welcome

-#

-#  This file is released under GPL >= 2

-#

-#################################################

-

-include_directories(

-  ${CMAKE_CURRENT_BINARY_DIR}

-  ${CMAKE_CURRENT_SOURCE_DIR}

-  ${CMAKE_BINARY_DIR}

-  ${CMAKE_BINARY_DIR}/tqt3integration/utils/

-  ${TDE_INCLUDE_DIR}

-  ${TQT_INCLUDE_DIRS}

-)

-

-link_directories(

-  ${TQT_LIBRARY_DIRS}

-)

-

-

-##### libtqtkde (shared) ####################

-

-tde_add_library( tqtkde SHARED AUTOMOC

-  SOURCES tqtkde.cpp

-  VERSION 0.0.0

-  LINK tdeui-shared

-  DEPENDENCIES generate_tqt3_bindings

-  DESTINATION "${TQT_PLUGINS_DIR}/integration/"

-)

tqt3integration/libtqtkde/Makefile.am

diff --git a/tqt3integration/libtqtkde/Makefile.am b/tqt3integration/libtqtkde/Makefile.am

deleted file mode 100644

index 8f239fe..0000000

--- a/tqt3integration/libtqtkde/Makefile.am

+++ /dev/null

@@ -1,15 +0,0 @@

-tqtkdelib_LTLIBRARIES = libtqtkde.la

-

-libtqtkde_la_SOURCES = tqtkde.cpp

-libtqtkde_la_LIBADD = -lDCOP

-libtqtkde_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version

-

-CLEANFILES = tqtkde_functions.cpp

-

-INCLUDES = $(all_includes)

-METASOURCES = AUTO

-

-tqtkde.lo : tqtkde_functions.cpp

-

-tqtkde_functions.cpp : ../utils/tqtkde_functions.cpp

-	cp -f ../utils/tqtkde_functions.cpp . || exit 1

tqt3integration/libtqtkde/tqtkde.cpp

diff --git a/tqt3integration/libtqtkde/tqtkde.cpp b/tqt3integration/libtqtkde/tqtkde.cpp

deleted file mode 100644

index ced1c33..0000000

--- a/tqt3integration/libtqtkde/tqtkde.cpp

+++ /dev/null

@@ -1,147 +0,0 @@

- /*

- *  This file is part of the Trinity Desktop Environment

- *

- *  Original file taken from the OpenSUSE tdebase builds

- *

- *  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.

- */

-

-#include "tqtkde.h"

-

-#include <assert.h>

-#include <dcopclient.h>

-#include <dcoptypes.h>

-#include <tqapplication.h>

-#include <tqregexp.h>

-#include <tqstringlist.h>

-#include <tqwidget.h>

-#include <unistd.h>

-

-#include <X11/Xlib.h>

-

-extern Time tqt_x_time;

-

-static TQString convertFileFilter( const TQString& filter )

-    {

-    if( filter.isEmpty())

-        return filter;

-    TQString f2 = filter;

-    f2.replace( '\n', ";;" ); // TQt says separator is ";;", but it also silently accepts newline

-    f2.replace( '/', "\\/" ); // escape /'s for KFileDialog

-    TQStringList items = TQStringList::split( ";;", f2 );

-    TQRegExp reg( "\\((.*)\\)" );

-    for( TQStringList::Iterator it = items.begin();

-         it != items.end();

-         ++it )

-        {

-        if( reg.search( *it ))

-            *it = reg.cap( 1 ) + '|' + *it;

-        }

-    return items.join( "\n" );

-    }

-

-static TQString convertBackFileFilter( const TQString& filter )

-    {

-    if( filter.isEmpty())

-        return filter;

-    TQStringList items = TQStringList::split( "\n", filter );

-    for( TQStringList::Iterator it = items.begin();

-         it != items.end();

-         ++it )

-        {

-        int pos = (*it).find( '|' );

-        if( pos >= 0 )

-            (*it) = (*it).mid( pos + 1 );

-        }

-    return items.join( ";;" );

-    }

-

-static DCOPClient* dcopClient()

-    {

-    DCOPClient* dcop = DCOPClient::mainClient();

-    if( dcop == NULL )

-        {

-        static DCOPClient* dcop_private;

-        if( dcop_private == NULL )

-            {

-            dcop_private = new DCOPClient;

-            dcop_private->attach();

-            }

-        dcop = dcop_private;

-        }

-    static bool prepared = false;

-    if( !prepared )

-        {

-        assert( tqApp != NULL ); // TODO

-        prepared = true;

-        dcop->bindToApp();

-        if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking

-            {

-            static tqtkde_EventLoop* loop = new tqtkde_EventLoop;

-            TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool )));

-            }

-        }

-    return dcop;

-    }

-

-// defined in qapplication_x11.cpp

-typedef int (*QX11EventFilter) (XEvent*);

-extern QX11EventFilter tqt_set_x11_event_filter (QX11EventFilter filter);

-

-static QX11EventFilter old_filter;

-

-static int input_filter( XEvent* e )

-    {

-    switch( e->type )

-        {

-        case ButtonPress:

-        case ButtonRelease:

-        case KeyPress:

-        case KeyRelease:

-        case MotionNotify:

-        case EnterNotify:

-        case LeaveNotify:

-            return true;

-        default:

-            break;

-        }

-    if( old_filter != NULL )

-        return old_filter( e );

-    return false;

-    }

-

-void tqtkde_EventLoop::block( bool b )

-    {

-    if( b )

-        old_filter = tqt_set_x11_event_filter( input_filter );

-    else

-        tqt_set_x11_event_filter( old_filter );

-    }

-

-// duped in kded module

-static TQString getHostname()

-    {

-    char hostname[ 256 ];

-    if( gethostname( hostname, 255 ) == 0 )

** Diff limit reached (max: 250 lines) **