diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:06 -0600 |
| commit | 79fd2b2bbd9f842ce3c84c67e3314033a9cceea4 (patch) | |
| tree | d6d2174614dc2384de6f77a930aaf3d06b276fae /kdelirc | |
| parent | c3e3301aba81e1c1771fa309941888a8b0fb59bc (diff) | |
| download | tdeutils-79fd2b2bbd9f842ce3c84c67e3314033a9cceea4.tar.gz tdeutils-79fd2b2bbd9f842ce3c84c67e3314033a9cceea4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kdelirc')
| -rw-r--r-- | kdelirc/kcmlirc/addaction.cpp | 2 | ||||
| -rw-r--r-- | kdelirc/kcmlirc/editaction.cpp | 2 | ||||
| -rw-r--r-- | kdelirc/kdelirc/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp index d5df7ec..7281251 100644 --- a/kdelirc/kcmlirc/addaction.cpp +++ b/kdelirc/kcmlirc/addaction.cpp @@ -352,7 +352,7 @@ void AddAction::updateObjects() QCStringList theObjects = theClient->remoteObjects(*i); for(QCStringList::iterator j = theObjects.begin(); j != theObjects.end(); ++j) - if(*j != "ksycoca" && *j != "qt")// && getFunctions(*i, *j).count()) + if(*j != "tdesycoca" && *j != "qt")// && getFunctions(*i, *j).count()) new KListViewItem(a, *j); } updateFunctions(); diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp index be113e6..3b38b0c 100644 --- a/kdelirc/kcmlirc/editaction.cpp +++ b/kdelirc/kcmlirc/editaction.cpp @@ -342,7 +342,7 @@ void EditAction::updateDCOPObjects() QCStringList theObjects = theClient->remoteObjects(nameProgramMap[theDCOPApplications->currentText()].utf8()); if(!theObjects.size() && theDCOPApplications->currentText() == (*theAction).program()) theDCOPObjects->insertItem((*theAction).object()); for(QCStringList::iterator j = theObjects.begin(); j != theObjects.end(); ++j) - if(*j != "ksycoca" && *j != "qt" && AddAction::getFunctions(nameProgramMap[theDCOPApplications->currentText()], *j).count()) + if(*j != "tdesycoca" && *j != "qt" && AddAction::getFunctions(nameProgramMap[theDCOPApplications->currentText()], *j).count()) theDCOPObjects->insertItem(TQString::fromUtf8(*j)); updateDCOPFunctions(); } diff --git a/kdelirc/kdelirc/Makefile.am b/kdelirc/kdelirc/Makefile.am index a9796a6..764a620 100644 --- a/kdelirc/kdelirc/Makefile.am +++ b/kdelirc/kdelirc/Makefile.am @@ -34,7 +34,7 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # the library search path. -libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE´s XML GUI builing |