summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------cmake0
-rw-r--r--kdcop/kdcopwindow.cpp57
-rw-r--r--kdcop/kdcopwindow.h3
-rw-r--r--kdesktop/kdiconview.cc2
-rw-r--r--konqueror/keditbookmarks/actionsimpl.cpp6
-rw-r--r--konqueror/keditbookmarks/updater.cpp8
-rw-r--r--konqueror/konq_view.cc2
-rw-r--r--konsole/konsole/TECommon.h6
-rw-r--r--konsole/konsole/konsole_part.cpp89
-rw-r--r--konsole/konsole/konsole_part.h11
-rw-r--r--konsole/konsole/session.cpp1
-rw-r--r--konsole/konsole/session.h1
-rw-r--r--tdeioslave/media/mediamanager/medialist.cpp43
-rw-r--r--tdeioslave/trash/CMakeLists.txt4
-rw-r--r--tdeioslave/trash/Makefile.am6
-rw-r--r--tdeioslave/trash/kcmtrash.cpp (renamed from tdeioslave/trash/kcm_trash.cpp)10
-rw-r--r--tdeioslave/trash/kcmtrash.desktop (renamed from tdeioslave/trash/kcm_trash.desktop)2
-rw-r--r--tdeioslave/trash/kcmtrash.h (renamed from tdeioslave/trash/kcm_trash.h)0
-rw-r--r--tqt3integration/CMakeLists.txt12
-rw-r--r--tqt3integration/ConfigureChecks.cmake20
-rw-r--r--tqt3integration/Makefile.am2
-rw-r--r--tqt3integration/README4
-rw-r--r--tqt3integration/configure.in.in10
-rw-r--r--tqt3integration/libtqtkde/Makefile.am15
-rw-r--r--tqt3integration/libtqttde/CMakeLists.txt (renamed from tqt3integration/libtqtkde/CMakeLists.txt)8
-rw-r--r--tqt3integration/libtqttde/Makefile.am15
-rw-r--r--tqt3integration/libtqttde/tqttde.cpp (renamed from tqt3integration/libtqtkde/tqtkde.cpp)10
-rw-r--r--tqt3integration/libtqttde/tqttde.h (renamed from tqt3integration/libtqtkde/tqtkde.h)6
-rw-r--r--tqt3integration/module/CMakeLists.txt6
-rw-r--r--tqt3integration/module/Makefile.am12
-rw-r--r--tqt3integration/module/module.cpp8
-rw-r--r--tqt3integration/module/module.h2
-rw-r--r--tqt3integration/module/tdeintegration.desktop (renamed from tqt3integration/module/kdeintegration.desktop)4
-rw-r--r--tqt3integration/utils/CMakeLists.txt10
-rw-r--r--tqt3integration/utils/Makefile.am10
-rw-r--r--tqt3integration/utils/gen.cpp60
-rw-r--r--tqt3integration/utils/tqt/Makefile.am2
-rw-r--r--tqt3integration/utils/tqt/in/CMakeLists.txt2
-rw-r--r--tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake1
-rw-r--r--tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake1
-rw-r--r--tqt3integration/utils/tqt/in/tqttdeintegration_x11_1.cpp (renamed from tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp)14
-rw-r--r--tqt3integration/utils/tqt/in/tqttdeintegration_x11_2.cpp (renamed from tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp)32
-rw-r--r--tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_1.h (renamed from tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h)6
-rw-r--r--tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_2.h (renamed from tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h)0
44 files changed, 312 insertions, 211 deletions
diff --git a/cmake b/cmake
-Subproject 74654feb3bd49ba97c57e83ba2dd23c7c3d83c0
+Subproject 5121b9a41d671dbaf7350c349d246793d8d8a4e
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index 9d776980..3821390c 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -46,6 +46,7 @@
#include <tqvbox.h>
#include <tqimage.h>
#include <tqheader.h>
+#include <tqpopupmenu.h>
#include <kdebug.h>
#include <kkeydialog.h>
@@ -296,20 +297,10 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
// mainView->lv->addColumn(i18n("Function"));
mainView->lv->setDragAutoScroll( FALSE );
mainView->lv->setRootIsDecorated( TRUE );
- connect
- (
- mainView->lv,
- TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- TQT_SLOT(slotCallFunction(TQListViewItem *))
- );
-
- connect
- (
- mainView->lv,
- TQT_SIGNAL(currentChanged(TQListViewItem *)),
- TQT_SLOT(slotCurrentChanged(TQListViewItem *))
- );
-
+ connect(mainView->lv, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotCallFunction(TQListViewItem *)));
+ connect(mainView->lv, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(slotCurrentChanged(TQListViewItem *)));
+ connect(mainView->lb_replyData, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
+ TQT_SLOT(slotResultListContextMenu(TQListBoxItem*, const TQPoint&)));
// set up the actions
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
@@ -881,11 +872,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
TQDataStream reply(replyData, IO_ReadOnly);
if (demarshal(replyType, reply, mainView->lb_replyData))
{
- mainView->l_replyType->setText
- (
- i18n("<strong>%1</strong>")
- .arg(TQString::fromUtf8(replyType))
- );
+ mainView->l_replyType->setText(i18n("<strong>%1</strong>").arg(TQString::fromUtf8(replyType)));
mainView->lb_replyData->show();
}
else
@@ -923,12 +910,7 @@ void KDCOPWindow::slotFillApplications()
TDEApplication::restoreOverrideCursor();
}
-bool KDCOPWindow::demarshal
-(
- TQCString & replyType,
- TQDataStream & reply,
- TQListBox *theList
-)
+bool KDCOPWindow::demarshal(TQCString &replyType, TQDataStream &reply, TQListBox *theList)
{
TQStringList ret;
TQPixmap pret;
@@ -1091,6 +1073,15 @@ bool KDCOPWindow::demarshal
reply >> r;
ret << r.toString();
}
+ else if (replyType == "TQStringVariantMap")
+ {
+ TQStringVariantMap r;
+ reply >> r;
+ for (TQStringVariantMap::ConstIterator it(r.begin()); it != r.end(); ++it)
+ {
+ ret << it.key() + " : " + it.data().toString();
+ }
+ }
else if (replyType == "DCOPRef")
{
DCOPRef r;
@@ -1100,13 +1091,14 @@ bool KDCOPWindow::demarshal
}
else
{
- ret <<
- i18n("Do not know how to demarshal %1").arg(TQString::fromUtf8(replyType));
+ ret << i18n("Do not know how to demarshal %1").arg(TQString::fromUtf8(replyType));
isValid = false;
}
- if (!ret.isEmpty())
- theList->insertStringList(ret);
+ if (!ret.isEmpty())
+ {
+ theList->insertStringList(ret);
+ }
return isValid;
}
@@ -1238,4 +1230,11 @@ void KDCOPWindow::slotMode()
mainView->lv->setMode(langmode->currentText());
}
+void KDCOPWindow::slotResultListContextMenu(TQListBoxItem *item, const TQPoint &point)
+{
+ TQPopupMenu* contextMenu = new TQPopupMenu(this);
+ contextMenu->insertItem(i18n("&Copy"), this, TQT_SLOT(slotCopy()));
+ contextMenu->exec(point);
+}
+
#include "kdcopwindow.moc"
diff --git a/kdcop/kdcopwindow.h b/kdcop/kdcopwindow.h
index ed5988ba..ddc5c2bb 100644
--- a/kdcop/kdcopwindow.h
+++ b/kdcop/kdcopwindow.h
@@ -8,6 +8,7 @@
#define __KDCOPWINDOW_H__
class DCOPClient;
+class TQListBoxItem;
class TQListViewItem;
class TDEAction;
class TDESelectAction;
@@ -38,6 +39,8 @@ class KDCOPWindow : public TDEMainWindow
void slotCopy();
void slotMode();
void slotReload();
+ void slotResultListContextMenu(TQListBoxItem *item, const TQPoint &point);
+
private:
void fillObjects( DCOPBrowserItem*, const char* app );
void fillFunctions( DCOPBrowserItem*, const char* app, const char* obj );
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 39dcc4c2..d5b7ebbb 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -1797,7 +1797,7 @@ void KDIconView::updateWorkArea( const TQRect &wr )
void KDIconView::setupSortKeys()
{
// can't use sorting in KFileIVI::setKey()
- setProperty("sortDirectoriesFirst", TQVariant(false, 0));
+ setProperty("sortDirectoriesFirst", TQVariant(false));
for (TQIconViewItem *it = firstItem(); it; it = it->nextItem())
{
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index b1b7c8c8..595e9102 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -429,9 +429,9 @@ void ActionsImpl::slotPrint() {
s_part = KParts::ComponentFactory
::createPartInstanceFromQuery<KParts::ReadOnlyPart>(
"text/html", TQString::null);
- s_part->setProperty("pluginsEnabled", TQVariant(false, 1));
- s_part->setProperty("javaScriptEnabled", TQVariant(false, 1));
- s_part->setProperty("javaEnabled", TQVariant(false, 1));
+ s_part->setProperty("pluginsEnabled", TQVariant(false));
+ s_part->setProperty("javaScriptEnabled", TQVariant(false));
+ s_part->setProperty("javaEnabled", TQVariant(false));
// doc->openStream( "text/html", KURL() );
// doc->writeStream( TQCString( "<HTML><BODY>FOO</BODY></HTML>" ) );
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index b3b0e2ef..ad55793e 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -92,10 +92,10 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
= KParts::ComponentFactory
::createPartInstanceFromQuery<KParts::ReadOnlyPart>("text/html", TQString::null);
- part->setProperty("pluginsEnabled", TQVariant(false, 1));
- part->setProperty("javaScriptEnabled", TQVariant(false, 1));
- part->setProperty("javaEnabled", TQVariant(false, 1));
- part->setProperty("autoloadImages", TQVariant(false, 1));
+ part->setProperty("pluginsEnabled", TQVariant(false));
+ part->setProperty("javaScriptEnabled", TQVariant(false));
+ part->setProperty("javaEnabled", TQVariant(false));
+ part->setProperty("autoloadImages", TQVariant(false));
connect(part, TQT_SIGNAL( canceled(const TQString &) ),
this, TQT_SLOT( slotCompleted() ));
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index fff2d04b..ecbac60c 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -461,7 +461,7 @@ void KonqView::connectPart( )
if ( ext )
urlDropHandling = ext->property( "urlDropHandling" );
else
- urlDropHandling = TQVariant( true, 0 );
+ urlDropHandling = TQVariant( true );
// Handle url drops if
// a) either the property says "ok"
diff --git a/konsole/konsole/TECommon.h b/konsole/konsole/TECommon.h
index 6b3c6621..a48e82c6 100644
--- a/konsole/konsole/TECommon.h
+++ b/konsole/konsole/TECommon.h
@@ -149,8 +149,10 @@ inline bool operator != (cacol a, cacol b)
inline const TQColor color256(UINT8 u, const ColorEntry* base)
{
// 0.. 16: system colors
- if (u < 8) return base[u+2 ].color; u -= 8;
- if (u < 8) return base[u+2+BASE_COLORS].color; u -= 8;
+ if (u < 8) return base[u+2 ].color;
+ u -= 8;
+ if (u < 8) return base[u+2+BASE_COLORS].color;
+ u -= 8;
// 16..231: 6x6x6 rgb color cube
if (u < 216) return TQColor(255*((u/36)%6)/5,
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 1c0067bb..64fdfb70 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -78,10 +78,18 @@ konsoleFactory::~konsoleFactory()
KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, const char *classname,
- const TQStringList&)
+ const TQStringList &args)
{
// kdDebug(1211) << "konsoleFactory::createPart parentWidget=" << parentWidget << " parent=" << parent << endl;
- KParts::Part *obj = new konsolePart(parentWidget, widgetName, parent, name, classname);
+ KParts::Part *obj;
+ if (args.count() > 0)
+ {
+ obj = new konsolePart(parentWidget, widgetName, parent, name, classname, args[0]);
+ }
+ else
+ {
+ obj = new konsolePart(parentWidget, widgetName, parent, name, classname);
+ }
return obj;
}
@@ -97,7 +105,8 @@ TDEInstance *konsoleFactory::instance()
#define DEFAULT_HISTORY_SIZE 1000
-konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname)
+konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObject *parent, const char *name,
+ const char *classname, const TQString &title)
: KParts::ReadOnlyPart(parent, name)
,te(0)
,se(0)
@@ -115,6 +124,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje
,m_signals(0)
,m_options(0)
,m_popupMenu(0)
+,s_title(title)
,b_useKonsoleSettings(false)
,b_autoDestroy(true)
,b_autoStartShell(true)
@@ -899,19 +909,24 @@ void konsolePart::slotSelectBell() {
void konsolePart::slotSetEncoding()
{
+ setEncoding(selectSetEncoding->currentText());
+ n_encoding = selectSetEncoding->currentItem();
+ se->setEncodingNo(selectSetEncoding->currentItem());
+}
+
+void konsolePart::setEncoding(const TQString &encoding)
+{
if (!se) return;
bool found;
- TQString enc = TDEGlobal::charsets()->encodingForName(selectSetEncoding->currentText());
+ TQString enc = TDEGlobal::charsets()->encodingForName(encoding);
TQTextCodec * qtc = TDEGlobal::charsets()->codecForName(enc, found);
if(!found)
{
- kdDebug() << "Codec " << selectSetEncoding->currentText() << " not found!" << endl;
+ kdDebug() << "Codec " << encoding << " not found!" << endl;
qtc = TQTextCodec::codecForLocale();
}
- n_encoding = selectSetEncoding->currentItem();
- se->setEncodingNo(selectSetEncoding->currentItem());
se->getEmulation()->setCodec(qtc);
}
@@ -1105,7 +1120,14 @@ bool konsolePart::setPtyFd( int master_pty )
void konsolePart::newSession()
{
if ( se ) delete se;
- se = new TESession(te, "xterm", parentWidget->winId());
+ if (!s_title.isEmpty())
+ {
+ se = new TESession(te, "xterm", parentWidget->winId(), s_title);
+ }
+ else
+ {
+ se = new TESession(te, "xterm", parentWidget->winId());
+ }
connect( se,TQT_SIGNAL(done(TESession*)),
this,TQT_SLOT(doneSession(TESession*)) );
connect( se,TQT_SIGNAL(openURLRequest(const TQString &)),
@@ -1120,6 +1142,14 @@ void konsolePart::newSession()
this, TQT_SIGNAL( receivedData( const TQString& ) ) );
connect( se, TQT_SIGNAL( forkedChild() ),
this, TQT_SIGNAL( forkedChild() ));
+ connect( se, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)),
+ this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &)));
+ connect( se, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)),
+ this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &)));
+ connect( se, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)),
+ this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &)));
+ connect( se, TQT_SIGNAL(updateSessionKeytab(TESession *, const TQString &)),
+ this, TQT_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &)));
// We ignore the following signals
//connect( se, TQT_SIGNAL(renameSession(TESession*,const TQString&)),
@@ -1168,4 +1198,47 @@ void konsolePart::sendInput( const TQString& text )
te->emitText( text );
}
+void konsolePart::slotGetSessionSchema(TESession *session, TQString &schema)
+{
+ int no = session->schemaNo();
+ ColorSchema* s = colors->find( no );
+ schema = s->relPath();
+}
+
+void konsolePart::slotSetSessionSchema(TESession *session, const TQString &schema)
+{
+ ColorSchema* s = colors->find( schema );
+ setSchema(s);
+}
+
+void konsolePart::slotSetSessionEncoding(TESession *session, const TQString &encoding)
+{
+ setEncoding(encoding);
+ const TQStringList &items = selectSetEncoding->items();
+ int index = items.findIndex(encoding);
+ if (index < 0)
+ {
+ TQString descriptiveEncoding = TDEGlobal::charsets()->descriptiveNameForEncoding(encoding.lower());
+ if (!descriptiveEncoding.isEmpty())
+ {
+ index = items.findIndex(descriptiveEncoding);
+ }
+ if (index < 0)
+ {
+ if (encoding == TQTextCodec::codecForLocale()->name())
+ {
+ index = 0;
+ }
+ }
+ }
+ selectSetEncoding->setCurrentItem(index);
+ n_encoding = index;
+ se->setEncodingNo(index);
+}
+
+void konsolePart::slotUpdateSessionKeytab(TESession *, const TQString &)
+{
+ updateKeytabMenu();
+}
+
#include "konsole_part.moc"
diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h
index 766e4e5d..39b037b6 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -70,7 +70,8 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public
{
Q_OBJECT
public:
- konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0);
+ konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name,
+ const char *classname = 0, const TQString &title = TQString::null);
virtual ~konsolePart();
signals:
@@ -122,6 +123,10 @@ signals:
void slotUseKonsoleSettings();
void slotWordSeps();
void slotSetEncoding();
+ void slotGetSessionSchema(TESession *session, TQString &schema);
+ void slotSetSessionSchema(TESession *session, const TQString &schema);
+ void slotSetSessionEncoding(TESession *session, const TQString &encoding);
+ void slotUpdateSessionKeytab(TESession *session, const TQString &keytab);
void biggerFont();
void smallerFont();
@@ -136,6 +141,7 @@ signals:
void setSchema(ColorSchema* s);
void updateKeytabMenu();
+ void setEncoding(const TQString &encoding);
bool doOpenStream( const TQString& );
bool doWriteStream( const TQByteArray& );
@@ -170,7 +176,8 @@ signals:
TQFont defaultFont;
- TQString pmPath; // pixmap path
+ TQString pmPath; // pixmap path
+ TQString s_title; // session title
TQString s_schema;
TQString s_tdeconfigSchema;
TQString s_word_seps; // characters that are considered part of a word
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index a6103da4..dcfe9fee 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -825,6 +825,7 @@ TQString TESession::keytab()
void TESession::setKeytab(const TQString &keytab)
{
setKeymap(keytab);
+ emit updateSessionKeytab(this, keytab);
emit updateSessionConfig(this);
}
diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h
index bfcafdf4..03b5941d 100644
--- a/konsole/konsole/session.h
+++ b/konsole/konsole/session.h
@@ -166,6 +166,7 @@ signals:
void setSessionEncoding(TESession *session, const TQString &encoding);
void getSessionSchema(TESession *session, TQString &schema);
void setSessionSchema(TESession *session, const TQString &schema);
+ void updateSessionKeytab(TESession *session, const TQString &keytab);
private slots:
void onRcvBlock( const char* buf, int len );
diff --git a/tdeioslave/media/mediamanager/medialist.cpp b/tdeioslave/media/mediamanager/medialist.cpp
index 09ff198d..d9c4f0eb 100644
--- a/tdeioslave/media/mediamanager/medialist.cpp
+++ b/tdeioslave/media/mediamanager/medialist.cpp
@@ -69,38 +69,22 @@ TQString MediaList::addMedium(Medium *medium, bool allowNotification)
{
kdDebug(1219) << "MediaList::addMedium(@" << medium->id() << ")" << endl;
- TQString id = medium->id();
- if ( m_idMap.contains(id) ) return TQString::null;
-
- m_media.append( medium );
- m_idMap[id] = medium;
-
TQString name = medium->name();
- if ( !m_nameMap.contains(name) )
+ if (!m_nameMap.contains(name))
{
m_nameMap[name] = medium;
-
- kdDebug(1219) << "MediaList emits mediumAdded(" << id << ", "
- << name << ")" << endl;
- emit mediumAdded(id, name, allowNotification);
-
- return name;
}
- TQString base_name = name+"_";
- int i = 1;
-
- while ( m_nameMap.contains(base_name+TQString::number(i)) )
+ TQString id = medium->id();
+ if (m_idMap.contains(id))
{
- i++;
+ return TQString::null;
}
- name = base_name+TQString::number(i);
- medium->setName(name);
- m_nameMap[name] = medium;
+ m_media.append(medium);
+ m_idMap[id] = medium;
- kdDebug(1219) << "MediaList emits mediumAdded(" << id << ", "
- << name << ")" << endl;
+ kdDebug(1219) << "MediaList emits mediumAdded(" << id << ", " << name << ")" << endl;
emit mediumAdded(id, name, allowNotification);
return name;
}
@@ -109,14 +93,17 @@ bool MediaList::removeMedium(const TQString &id, bool allowNotification)
{
kdDebug(1219) << "MediaList::removeMedium(" << id << ")" << endl;
- if ( !m_idMap.contains(id) ) return false;
+ if (!m_idMap.contains(id))
+ {
+ return false;
+ }
Medium *medium = m_idMap[id];
- TQString name = medium->name();
-
m_idMap.remove(id);
- m_nameMap.remove( medium->name() );
- m_media.remove( medium );
+ m_nameMap.remove(medium->name());
+
+ TQString name = medium->name();
+ m_media.remove(medium);
emit mediumRemoved(id, name, allowNotification);
return true;
diff --git a/tdeioslave/trash/CMakeLists.txt b/tdeioslave/trash/CMakeLists.txt
index 2f1b184a..cb3c3c20 100644
--- a/tdeioslave/trash/CMakeLists.txt
+++ b/tdeioslave/trash/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
##### other data ################################
install( FILES ktrashpropsdlgplugin.desktop trash.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kcm_trash.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES kcmtrash.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
##### trashcommon (static) ######################
@@ -51,7 +51,7 @@ tde_add_kpart( ${target} AUTOMOC
set( target kcm_trash )
tde_add_kpart( ${target} AUTOMOC
- SOURCES kcm_trash.cpp
+ SOURCES kcmtrash.cpp
LINK trashcommon-static tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
index cee2825a..5d0d9b3e 100644
--- a/tdeioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -3,13 +3,13 @@ METASOURCES = AUTO
SUBDIRS = . tdefile-plugin
-kde_module_LTLIBRARIES = tdeio_trash.la kcm_trash ktrashpropsdlgplugin.la
+kde_module_LTLIBRARIES = tdeio_trash.la kcm_trash.la ktrashpropsdlgplugin.la
tdeio_trash_la_SOURCES = tdeio_trash.cpp
tdeio_trash_la_LIBADD = libtrashcommon.la $(LIB_TDEIO)
tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-kcm_trash_la_SOURCES = kcm_trash.cpp
+kcm_trash_la_SOURCES = kcmtrash.cpp
kcm_trash_la_LIBADD = libtrashcommon.la $(LIB_TDEIO)
kcm_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
@@ -43,4 +43,4 @@ ktrashpropsdlgplugin_la_LIBADD = $(LIB_TDEIO)
services_DATA = ktrashpropsdlgplugin.desktop
servicesdir = $(kde_servicesdir)
-xdg_apps_DATA = kcm_trash.desktop
+xdg_apps_DATA = kcmtrash.desktop
diff --git a/tdeioslave/trash/kcm_trash.cpp b/tdeioslave/trash/kcmtrash.cpp
index 3a915fac..4747e092 100644
--- a/tdeioslave/trash/kcm_trash.cpp
+++ b/tdeioslave/trash/kcmtrash.cpp
@@ -16,7 +16,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "kcm_trash.h"
+#include "kcmtrash.h"
#include "ktrashpropswidget.h"
#include <tqlayout.h>
@@ -31,7 +31,7 @@ extern "C"
{
KDE_EXPORT TDECModule *create_trash(TQWidget *parent, const char *)
{
- return new TrashModule(parent, "trash");
+ return new TrashModule(parent, "kcmtrash");
}
}
@@ -39,13 +39,13 @@ extern "C"
TrashModule::TrashModule(TQWidget *parent, const char *name)
: TDECModule(parent, name)
{
- TDEAboutData * about = new TDEAboutData("trash",
+ TDEAboutData * about = new TDEAboutData("kcmtrash",
I18N_NOOP("Trash"), "1",
I18N_NOOP("Trash Control Panel Module"),
TDEAboutData::License_GPL_V2,
I18N_NOOP("(c) 2019 Michele Calgaro"));
setAboutData( about );
- TDEGlobal::locale()->insertCatalogue("trash");
+ TDEGlobal::locale()->insertCatalogue("tdeio_trash");
tab = new TQTabWidget(this);
@@ -78,4 +78,4 @@ TQString TrashModule::quickHelp() const
"for your Trash Bin size and clean up policy. ");
}
-#include "kcm_trash.moc"
+#include "kcmtrash.moc"
diff --git a/tdeioslave/trash/kcm_trash.desktop b/tdeioslave/trash/kcmtrash.desktop
index 83b70c92..b9c2a6ea 100644
--- a/tdeioslave/trash/kcm_trash.desktop
+++ b/tdeioslave/trash/kcmtrash.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=tdecmshell kcm_trash
+Exec=tdecmshell kcmtrash
Icon=trashcan_empty
Type=Application
#X-DocPath=kcontrol/kcmcgi/index.html
diff --git a/tdeioslave/trash/kcm_trash.h b/tdeioslave/trash/kcmtrash.h
index 4987ccfb..4987ccfb 100644
--- a/tdeioslave/trash/kcm_trash.h
+++ b/tdeioslave/trash/kcmtrash.h
diff --git a/tqt3integration/CMakeLists.txt b/tqt3integration/CMakeLists.txt
index 07c10e17..75120af2 100644
--- a/tqt3integration/CMakeLists.txt
+++ b/tqt3integration/CMakeLists.txt
@@ -9,6 +9,14 @@
#
#################################################
-add_subdirectory( libtqtkde )
+
+##### configure checks ##########################
+
+include( ConfigureChecks.cmake )
+
+
+##### subdirectories ############################
+
+add_subdirectory( libtqttde )
add_subdirectory( module )
-add_subdirectory( utils ) \ No newline at end of file
+add_subdirectory( utils )
diff --git a/tqt3integration/ConfigureChecks.cmake b/tqt3integration/ConfigureChecks.cmake
new file mode 100644
index 00000000..9347391d
--- /dev/null
+++ b/tqt3integration/ConfigureChecks.cmake
@@ -0,0 +1,20 @@
+#################################################
+#
+# (C) 2019 Slávek Banko
+# slavek (DOT) banko (AT) axis.cz
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+
+##### check for tqt plugins dir #################
+
+execute_process(
+ COMMAND ${PKG_CONFIG_EXECUTABLE}
+ tqt-mt --variable=pluginsdir
+ OUTPUT_VARIABLE TQT_PLUGINS_DIR
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+)
diff --git a/tqt3integration/Makefile.am b/tqt3integration/Makefile.am
index 6d657bd4..fe6a0e79 100644
--- a/tqt3integration/Makefile.am
+++ b/tqt3integration/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libtqtkde module utils
+SUBDIRS = libtqttde module utils
diff --git a/tqt3integration/README b/tqt3integration/README
index 47edd144..1af1034a 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.
diff --git a/tqt3integration/configure.in.in b/tqt3integration/configure.in.in
index b2c264de..46ca8fb4 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)
diff --git a/tqt3integration/libtqtkde/Makefile.am b/tqt3integration/libtqtkde/Makefile.am
deleted file mode 100644
index 8f239fe8..00000000
--- 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
diff --git a/tqt3integration/libtqtkde/CMakeLists.txt b/tqt3integration/libtqttde/CMakeLists.txt
index 9c4c5318..fc1e54e8 100644
--- a/tqt3integration/libtqtkde/CMakeLists.txt
+++ b/tqt3integration/libtqttde/CMakeLists.txt
@@ -23,12 +23,12 @@ link_directories(
)
-##### libtqtkde (shared) ####################
+##### libtqttde (shared) ####################
-tde_add_library( tqtkde SHARED AUTOMOC
- SOURCES tqtkde.cpp
+tde_add_library( tqttde SHARED AUTOMOC
+ SOURCES tqttde.cpp
VERSION 0.0.0
LINK tdeui-shared
DEPENDENCIES generate_tqt3_bindings
- DESTINATION "${PLUGIN_INSTALL_DIR}/plugins/integration/"
+ DESTINATION "${TQT_PLUGINS_DIR}/integration/"
)
diff --git a/tqt3integration/libtqttde/Makefile.am b/tqt3integration/libtqttde/Makefile.am
new file mode 100644
index 00000000..aa143fec
--- /dev/null
+++ b/tqt3integration/libtqttde/Makefile.am
@@ -0,0 +1,15 @@
+tqttdelib_LTLIBRARIES = libtqttde.la
+
+libtqttde_la_SOURCES = tqttde.cpp
+libtqttde_la_LIBADD = -lDCOP
+libtqttde_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version
+
+CLEANFILES = tqttde_functions.cpp
+
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+tqttde.lo : tqttde_functions.cpp
+
+tqttde_functions.cpp : ../utils/tqttde_functions.cpp
+ cp -f ../utils/tqttde_functions.cpp . || exit 1
diff --git a/tqt3integration/libtqtkde/tqtkde.cpp b/tqt3integration/libtqttde/tqttde.cpp
index ced1c338..3647db8a 100644
--- a/tqt3integration/libtqtkde/tqtkde.cpp
+++ b/tqt3integration/libtqttde/tqttde.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "tqtkde.h"
+#include "tqttde.h"
#include <assert.h>
#include <dcopclient.h>
@@ -89,7 +89,7 @@ static DCOPClient* dcopClient()
dcop->bindToApp();
if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking
{
- static tqtkde_EventLoop* loop = new tqtkde_EventLoop;
+ static tqttde_EventLoop* loop = new tqttde_EventLoop;
TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool )));
}
}
@@ -122,7 +122,7 @@ static int input_filter( XEvent* e )
return false;
}
-void tqtkde_EventLoop::block( bool b )
+void tqttde_EventLoop::block( bool b )
{
if( b )
old_filter = tqt_set_x11_event_filter( input_filter );
@@ -142,6 +142,6 @@ static TQString getHostname()
return "";
}
-#include "tqtkde_functions.cpp"
+#include "tqttde_functions.cpp"
-#include "tqtkde.moc"
+#include "tqttde.moc"
diff --git a/tqt3integration/libtqtkde/tqtkde.h b/tqt3integration/libtqttde/tqttde.h
index 426221eb..2d634df0 100644
--- a/tqt3integration/libtqtkde/tqtkde.h
+++ b/tqt3integration/libtqttde/tqttde.h
@@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef _TQTKDE_H
-#define _TQTKDE_H
+#ifndef _TQTTDE_H
+#define _TQTTDE_H
#include <tqobject.h>
-class tqtkde_EventLoop
+class tqttde_EventLoop
: public TQObject
{
Q_OBJECT
diff --git a/tqt3integration/module/CMakeLists.txt b/tqt3integration/module/CMakeLists.txt
index 93c05940..1457020a 100644
--- a/tqt3integration/module/CMakeLists.txt
+++ b/tqt3integration/module/CMakeLists.txt
@@ -25,12 +25,12 @@ link_directories(
##### service desktop file(s) ##########################
-install( FILES kdeintegration.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+install( FILES tdeintegration.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
-##### kded_kdeintegration (module) #####################
+##### kded_tdeintegration (module) #####################
-set( target kded_kdeintegration )
+set( target kded_tdeintegration )
set( ${target}_SRCS
module.cpp
diff --git a/tqt3integration/module/Makefile.am b/tqt3integration/module/Makefile.am
index 1012d5e7..99f3a3b2 100644
--- a/tqt3integration/module/Makefile.am
+++ b/tqt3integration/module/Makefile.am
@@ -1,16 +1,16 @@
INCLUDES= $(all_includes)
-kde_module_LTLIBRARIES = kded_kdeintegration.la
+kde_module_LTLIBRARIES = kded_tdeintegration.la
-kded_kdeintegration_la_SOURCES = module.cpp
-kded_kdeintegration_la_METASOURCES = AUTO
-kded_kdeintegration_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kdeintegration_la_LIBADD = $(LIB_TDEIO)
+kded_tdeintegration_la_SOURCES = module.cpp
+kded_tdeintegration_la_METASOURCES = AUTO
+kded_tdeintegration_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kded_tdeintegration_la_LIBADD = $(LIB_TDEIO)
CLEANFILES = module_functions.cpp module_functions.h
servicesdir = $(kde_servicesdir)/kded
-services_DATA = kdeintegration.desktop
+services_DATA = tdeintegration.desktop
module.lo : module_functions.cpp module_functions.h
diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp
index a0be507b..e397105b 100644
--- a/tqt3integration/module/module.cpp
+++ b/tqt3integration/module/module.cpp
@@ -38,13 +38,13 @@
extern "C"
{
- KDE_EXPORT KDEDModule *create_kdeintegration( const TQCString& obj )
+ KDE_EXPORT KDEDModule *create_tdeintegration( const TQCString& obj )
{
- return new KDEIntegration::Module( obj );
+ return new TDEIntegration::Module( obj );
}
};
-namespace KDEIntegration
+namespace TDEIntegration
{
static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1, const TQCString& wmclass2 )
@@ -61,7 +61,7 @@ static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1,
info.geometry().y() + ( info.geometry().height()- w->height())/2 );
}
-// duped in tqtkde
+// duped in tqttde
static TQString getHostname()
{
char hostname[ 256 ];
diff --git a/tqt3integration/module/module.h b/tqt3integration/module/module.h
index 1d805bcc..cf136aa8 100644
--- a/tqt3integration/module/module.h
+++ b/tqt3integration/module/module.h
@@ -30,7 +30,7 @@
class DCOPClientTransaction;
-namespace KDEIntegration
+namespace TDEIntegration
{
class Module
diff --git a/tqt3integration/module/kdeintegration.desktop b/tqt3integration/module/tdeintegration.desktop
index 406c1fd3..9a9b940d 100644
--- a/tqt3integration/module/kdeintegration.desktop
+++ b/tqt3integration/module/tdeintegration.desktop
@@ -4,8 +4,8 @@ Type=Service
X-TDE-ServiceTypes=KDEDModule
X-TDE-ModuleType=Library
-X-TDE-Library=kdeintegration
-X-TDE-Factory=kdeintegration
+X-TDE-Library=tdeintegration
+X-TDE-Factory=tdeintegration
X-TDE-Kded-autoload=false
X-TDE-Kded-load-on-demand=true
diff --git a/tqt3integration/utils/CMakeLists.txt b/tqt3integration/utils/CMakeLists.txt
index ffdd7273..c75567af 100644
--- a/tqt3integration/utils/CMakeLists.txt
+++ b/tqt3integration/utils/CMakeLists.txt
@@ -33,17 +33,17 @@ tde_add_executable( gen AUTOMOC
ADD_CUSTOM_COMMAND(
OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/tqtkde_functions.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/tqttde_functions.cpp
${CMAKE_CURRENT_BINARY_DIR}/module_functions.cpp
${CMAKE_CURRENT_BINARY_DIR}/module_functions.h
COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/tqt
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen ${CMAKE_CURRENT_SOURCE_DIR}/gen.txt
- COMMAND cat ${CMAKE_CURRENT_BINARY_DIR}/tqt/in/tqtkdeintegration_x11_0.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqtkdeintegration_x11_1.cpp ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11.cpp.gen ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqtkdeintegration_x11_2.cpp > ${CMAKE_CURRENT_BINARY_DIR}/tqt/tqtkdeintegration_x11.cpp
- COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqtkdeintegration_x11_p_1.h ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11_p.h.gen ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqtkdeintegration_x11_p_2.h > ${CMAKE_CURRENT_BINARY_DIR}/tqt/tqtkdeintegration_x11_p.h
- COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11.cpp.gen ${CMAKE_CURRENT_BINARY_DIR}/tqtkdeintegration_x11_p.h.gen
+ COMMAND cat ${CMAKE_CURRENT_BINARY_DIR}/tqt/in/tqttdeintegration_x11_0.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqttdeintegration_x11_1.cpp ${CMAKE_CURRENT_BINARY_DIR}/tqttdeintegration_x11.cpp.gen ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqttdeintegration_x11_2.cpp > ${CMAKE_CURRENT_BINARY_DIR}/tqt/tqttdeintegration_x11.cpp
+ COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqttdeintegration_x11_p_1.h ${CMAKE_CURRENT_BINARY_DIR}/tqttdeintegration_x11_p.h.gen ${CMAKE_CURRENT_SOURCE_DIR}/tqt/in/tqttdeintegration_x11_p_2.h > ${CMAKE_CURRENT_BINARY_DIR}/tqt/tqttdeintegration_x11_p.h
+ COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/tqttdeintegration_x11.cpp.gen ${CMAKE_CURRENT_BINARY_DIR}/tqttdeintegration_x11_p.h.gen
DEPENDS gen
)
ADD_CUSTOM_TARGET( generate_tqt3_bindings
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqtkde_functions.cpp
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqttde_functions.cpp
)
diff --git a/tqt3integration/utils/Makefile.am b/tqt3integration/utils/Makefile.am
index 88f92b52..033e78b4 100644
--- a/tqt3integration/utils/Makefile.am
+++ b/tqt3integration/utils/Makefile.am
@@ -3,16 +3,16 @@ gen_SOURCES = gen.cpp
gen_LDADD = $(LIB_TDECORE)
gen_LDFLAGS = $(all_libraries)
INCLUDES = $(all_includes)
-CLEANFILES = tqtkde_functions.cpp module_functions.cpp module_functions.h generated
+CLEANFILES = tqttde_functions.cpp module_functions.cpp module_functions.h generated
SUBDIRS = tqt
generate: generated
generated: gen gen.txt
./gen || exit 1
- cat tqt/in/tqtkdeintegration_x11_0.cpp tqt/in/tqtkdeintegration_x11_1.cpp tqtkdeintegration_x11.cpp.gen tqt/in/tqtkdeintegration_x11_2.cpp >tqt/tqtkdeintegration_x11.cpp
- cat tqt/in/tqtkdeintegration_x11_p_1.h tqtkdeintegration_x11_p.h.gen tqt/in/tqtkdeintegration_x11_p_2.h >tqt/tqtkdeintegration_x11_p.h
- rm -f tqtkdeintegration_x11.cpp.gen tqtkdeintegration_x11_p.h.gen
+ cat tqt/in/tqttdeintegration_x11_0.cpp tqt/in/tqttdeintegration_x11_1.cpp tqttdeintegration_x11.cpp.gen tqt/in/tqttdeintegration_x11_2.cpp >tqt/tqttdeintegration_x11.cpp
+ cat tqt/in/tqttdeintegration_x11_p_1.h tqttdeintegration_x11_p.h.gen tqt/in/tqttdeintegration_x11_p_2.h >tqt/tqttdeintegration_x11_p.h
+ rm -f tqttdeintegration_x11.cpp.gen tqttdeintegration_x11_p.h.gen
touch generated
-tqtkde_functions.cpp module_functions.cpp module_functions.h : generated
+tqttde_functions.cpp module_functions.cpp module_functions.h : generated
diff --git a/tqt3integration/utils/gen.cpp b/tqt3integration/utils/gen.cpp
index 754aa930..03a2bf42 100644
--- a/tqt3integration/utils/gen.cpp
+++ b/tqt3integration/utils/gen.cpp
@@ -44,7 +44,7 @@ FUNCTION <name>
OUT_ARGUMENT
CONVERSION <function>
BACK_CONVERSION <function> - for out arguments
- CREATE <function> - doesn't exist in TQt, create in tqtkde using function
+ CREATE <function> - doesn't exist in TQt, create in tqttde using function
PARENT - the argument is a parent window to be used for windows
ENDARG
ENDFUNCTION
@@ -366,7 +366,7 @@ void generateFunction( TQTextStream& stream, const Function& function, const TQS
void generateTQtH()
{
- TQFile file( "tqtkdeintegration_x11_p.h.gen" );
+ TQFile file( "tqttdeintegration_x11_p.h.gen" );
if( !file.open( IO_WriteOnly ))
error();
TQTextStream stream( &file );
@@ -386,7 +386,7 @@ void generateTQtH()
void generateTQtCpp()
{
- TQFile file( "tqtkdeintegration_x11.cpp.gen" );
+ TQFile file( "tqttdeintegration_x11.cpp.gen" );
if( !file.open( IO_WriteOnly ))
error();
TQTextStream stream( &file );
@@ -398,13 +398,13 @@ void generateTQtCpp()
if( f.only_tqt )
continue;
f.stripCreatedArguments();
- generateFunction( stream, f, "(*tqtkde_" + f.name + ")", 0,
+ generateFunction( stream, f, "(*tqttde_" + f.name + ")", 0,
true /*static*/, false /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ );
stream << ";\n";
}
stream <<
"\n"
-"void TQKDEIntegration::initLibrary()\n"
+"void TQTDEIntegration::initLibrary()\n"
" {\n"
" if( !inited )\n"
" {\n"
@@ -424,17 +424,17 @@ void generateTQtCpp()
Function function = *it;
if( function.only_tqt )
continue;
- stream << makeIndent( 8 ) + "tqtkde_" + function.name + " = (\n";
+ stream << makeIndent( 8 ) + "tqttde_" + function.name + " = (\n";
function.stripCreatedArguments();
generateFunction( stream, function, "(*)", 12,
false /*static*/, false /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ );
stream << "\n" + makeIndent( 12 ) + ")\n";
stream << makeIndent( 12 ) + "lib.resolve(\"" + (*it).name + "\");\n";
- stream << makeIndent( 8 ) + "if( tqtkde_" + (*it).name + " == NULL )\n";
+ stream << makeIndent( 8 ) + "if( tqttde_" + (*it).name + " == NULL )\n";
stream << makeIndent( 12 ) + "return;\n";
}
stream <<
-" enable = tqtkde_initializeIntegration();\n"
+" enable = tqttde_initializeIntegration();\n"
" }\n"
" }\n"
"\n";
@@ -446,11 +446,11 @@ void generateTQtCpp()
if( function.skip_tqt || function.only_tqt )
continue;
function.stripCreatedArguments();
- generateFunction( stream, function, "QKDEIntegration::" + function.name, 0,
+ generateFunction( stream, function, "TQTDEIntegration::" + function.name, 0,
false /*static*/, true /*orig type*/, false /*ignore deref*/, 0 /*ignore level*/ );
stream << "\n";
stream << makeIndent( 4 ) + "{\n";
- stream << makeIndent( 4 ) + "return tqtkde_" + function.name + "(\n";
+ stream << makeIndent( 4 ) + "return tqttde_" + function.name + "(\n";
stream << makeIndent( 8 );
bool need_comma = false;
for( TQValueList< Arg >::ConstIterator it2 = function.args.begin();
@@ -479,9 +479,9 @@ void generateTQt()
generateTQtCpp();
}
-void generateTQtKde()
+void generateTQtTDE()
{
- TQFile file( "tqtkde_functions.cpp" );
+ TQFile file( "tqttde_functions.cpp" );
if( !file.open( IO_WriteOnly ))
error();
TQTextStream stream( &file );
@@ -552,7 +552,7 @@ void generateTQtKde()
}
stream << ";\n";
}
- stream << " if( !dcopClient()->call( \"kded\", \"kdeintegration\",\"" + function.name + "(";
+ stream << " if( !dcopClient()->call( \"kded\", \"tdeintegration\",\"" + function.name + "(";
bool need_comma = false;
for( TQValueList< Arg >::ConstIterator it2 = function.args.begin();
it2 != function.args.end();
@@ -640,7 +640,7 @@ void generateTQtKde()
}
}
-void generateKdeDcop( TQTextStream& stream )
+void genarateTDEDcop( TQTextStream& stream )
{
stream <<
"bool Module::process(const TQCString &fun, const TQByteArray &data,\n"
@@ -717,13 +717,13 @@ void generateKdeDcop( TQTextStream& stream )
"QCStringList Module::interfaces()\n"
" {\n"
" QCStringList ifaces = KDEDModule::interfaces();\n"
-" ifaces << \"KDEIntegration\";\n"
+" ifaces << \"TDEIntegration\";\n"
" return ifaces;\n"
" }\n"
"\n";
}
-void generateKdePreStub( TQTextStream& stream )
+void genarateTDEPreStub( TQTextStream& stream )
{
for( TQValueList< Function >::ConstIterator it1 = functions.begin();
it1 != functions.end();
@@ -796,7 +796,7 @@ void generateKdePreStub( TQTextStream& stream )
}
}
-void generateKdePostStub( TQTextStream& stream )
+void genarateTDEPostStub( TQTextStream& stream )
{
for( TQValueList< Function >::ConstIterator it1 = functions.begin();
it1 != functions.end();
@@ -842,7 +842,7 @@ void generateKdePostStub( TQTextStream& stream )
stream << " JobData job = jobs[ handle ];\n";
stream << " jobs.remove( handle );\n";
stream << " TQByteArray replyData;\n";
- stream << " TQCString replyType = \"tqtkde\";\n";
+ stream << " TQCString replyType = \"tqttde\";\n";
}
bool return_data = false;
for( TQValueList< Arg >::ConstIterator it2 = function.args.begin();
@@ -876,24 +876,24 @@ void generateKdePostStub( TQTextStream& stream )
}
}
-void generateKdeStubs( TQTextStream& stream )
+void genarateTDEStubs( TQTextStream& stream )
{
- generateKdePreStub( stream );
- generateKdePostStub( stream );
+ genarateTDEPreStub( stream );
+ genarateTDEPostStub( stream );
// TODO udelat i predbezne deklarace pro skutecne funkce?
}
-void generateKdeCpp()
+void genarateTDECpp()
{
TQFile file( "module_functions.cpp" );
if( !file.open( IO_WriteOnly ))
error();
TQTextStream stream( &file );
- generateKdeDcop( stream );
- generateKdeStubs( stream );
+ genarateTDEDcop( stream );
+ genarateTDEStubs( stream );
}
-void generateKdeH()
+void genarateTDEH()
{
TQFile file( "module_functions.h" );
if( !file.open( IO_WriteOnly ))
@@ -944,17 +944,17 @@ void generateKdeH()
}
}
-void generateKde()
+void genarateTDE()
{
- generateKdeCpp();
- generateKdeH();
+ genarateTDECpp();
+ genarateTDEH();
}
void generate()
{
generateTQt();
- generateTQtKde();
- generateKde();
+ generateTQtTDE();
+ genarateTDE();
}
int main (int argc, char *argv[])
diff --git a/tqt3integration/utils/tqt/Makefile.am b/tqt3integration/utils/tqt/Makefile.am
index 5d77e5d2..f247852b 100644
--- a/tqt3integration/utils/tqt/Makefile.am
+++ b/tqt3integration/utils/tqt/Makefile.am
@@ -1 +1 @@
-CLEANFILES = tqtkdeintegration_x11.cpp tqtkdeintegration_x11_p.h
+CLEANFILES = tqttdeintegration_x11.cpp tqttdeintegration_x11_p.h
diff --git a/tqt3integration/utils/tqt/in/CMakeLists.txt b/tqt3integration/utils/tqt/in/CMakeLists.txt
index c9bc36f9..000fde3b 100644
--- a/tqt3integration/utils/tqt/in/CMakeLists.txt
+++ b/tqt3integration/utils/tqt/in/CMakeLists.txt
@@ -9,4 +9,4 @@
#
#################################################
-configure_file( tqtkdeintegration_x11_0.cpp.cmake tqtkdeintegration_x11_0.cpp @ONLY )
+configure_file( tqttdeintegration_x11_0.cpp.cmake tqttdeintegration_x11_0.cpp @ONLY )
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake
deleted file mode 100644
index b0d5fd51..00000000
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_0.cpp.cmake
+++ /dev/null
@@ -1 +0,0 @@
-#define TQTKDELIBDIR @PLUGIN_INSTALL_DIR@/plugins/integration
diff --git a/tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake
new file mode 100644
index 00000000..00b0dc3d
--- /dev/null
+++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_0.cpp.cmake
@@ -0,0 +1 @@
+#define TQTTDELIBDIR @TQT_PLUGINS_DIR@/integration
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_1.cpp
index 36d4e075..fc849142 100644
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_1.cpp
+++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_1.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "tqtkdeintegration_x11_p.h"
+#include "tqttdeintegration_x11_p.h"
#include <tqcolordialog.h>
#include <tqfiledialog.h>
@@ -29,10 +29,10 @@
#include <tqapplication.h>
#include <stdlib.h>
-bool TQKDEIntegration::inited = false;
-bool TQKDEIntegration::enable = false;
+bool TQTDEIntegration::inited = false;
+bool TQTDEIntegration::enable = false;
-bool TQKDEIntegration::enabled()
+bool TQTDEIntegration::enabled()
{
if( !inited )
initLibrary();
@@ -45,10 +45,10 @@ static TQCString findLibrary()
return "";
if( getenv( "TDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "TDE_FULL_SESSION" )[ 0 ] != '1' )
return "";
- if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL
- || getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' )
+ if( getenv( "TQT_NO_TDE_INTEGRATION" ) == NULL
+ || getenv( "TQT_NO_TDE_INTEGRATION" )[ 0 ] == '0' )
{
- return TQCString( TQTKDELIBDIR ) + "/libtqtkde";
+ return TQCString( TQTTDELIBDIR ) + "/libtqttde";
}
return "";
}
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_2.cpp
index f9ab72d7..ba365f7d 100644
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_2.cpp
+++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_2.cpp
@@ -20,62 +20,62 @@
// ---
-int TQKDEIntegration::information( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::information( TQWidget* parent, const TQString& caption,
const TQString& text, int button0, int button1, int button2 )
{
- return tqtkde_messageBox1(
+ return tqttde_messageBox1(
TQMessageBox::Information, parentToWinId( parent ), caption, text, button0, button1, button2 );
}
-int TQKDEIntegration::question( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::question( TQWidget* parent, const TQString& caption,
const TQString& text, int button0, int button1, int button2 )
{
- return tqtkde_messageBox1(
+ return tqttde_messageBox1(
TQMessageBox::Question, parentToWinId( parent ), caption, text, button0, button1, button2 );
}
-int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::warning( TQWidget* parent, const TQString& caption,
const TQString& text, int button0, int button1, int button2 )
{
- return tqtkde_messageBox1(
+ return tqttde_messageBox1(
TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0, button1, button2 );
}
-int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::critical( TQWidget* parent, const TQString& caption,
const TQString& text, int button0, int button1, int button2 )
{
- return tqtkde_messageBox1(
+ return tqttde_messageBox1(
TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0, button1, button2 );
}
-int TQKDEIntegration::information( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::information( TQWidget* parent, const TQString& caption,
const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton )
{
- return tqtkde_messageBox2(
+ return tqttde_messageBox2(
TQMessageBox::Information, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
-int TQKDEIntegration::question( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::question( TQWidget* parent, const TQString& caption,
const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton )
{
- return tqtkde_messageBox2(
+ return tqttde_messageBox2(
TQMessageBox::Question, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
-int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::warning( TQWidget* parent, const TQString& caption,
const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton )
{
- return tqtkde_messageBox2(
+ return tqttde_messageBox2(
TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
-int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption,
+int TQTDEIntegration::critical( TQWidget* parent, const TQString& caption,
const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text,
int defaultButton, int escapeButton )
{
- return tqtkde_messageBox2(
+ return tqttde_messageBox2(
TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton );
}
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_1.h
index 59a0127b..53990697 100644
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_1.h
+++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_1.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef TQKDEINTEGRATION_H
-#define TQKDEINTEGRATION_H
+#ifndef TQTDEINTEGRATION_H
+#define TQTDEINTEGRATION_H
#include <tqstringlist.h>
@@ -28,7 +28,7 @@ class TQWidget;
class TQColor;
class TQFont;
-class TQKDEIntegration
+class TQTDEIntegration
{
public:
static bool enabled();
diff --git a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_2.h
index 63d569fc..63d569fc 100644
--- a/tqt3integration/utils/tqt/in/tqtkdeintegration_x11_p_2.h
+++ b/tqt3integration/utils/tqt/in/tqttdeintegration_x11_p_2.h