summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-25 15:32:14 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-07-05 20:03:24 +0200
commitd1e7b687e1f9f11173ad92317819fb38ba2ad145 (patch)
treec472e4daced3180260d451247027454c57459b32 /src
parent7b8c23b93037d8f5a91658d7a0a3947f33c8cac5 (diff)
downloadkbfx-d1e7b687e1f9f11173ad92317819fb38ba2ad145.tar.gz
kbfx-d1e7b687e1f9f11173ad92317819fb38ba2ad145.zip
Fix FBTFS
(cherry picked from commit 9b60260916ad138fc84c49429630c589f09aec22)
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/kbfxplasmacanvasitem.cpp2
-rw-r--r--src/kbfxplasmacanvasview.cpp4
-rw-r--r--src/kbfxplasmaindexview.cpp2
4 files changed, 9 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b06566..622fcaa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,8 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
+ ${CMAKE_BINARY_DIR}/kbfxlib/common
+ ${CMAKE_BINARY_DIR}/kbfxlib/data
)
@@ -34,12 +36,12 @@ set( ${target}_SRCS
kbfxplasmacanvasitemwrapper.cpp kbfxplasmacanvasstack.cpp kbfxplasmacanvasview.cpp
kbfxplasmaindexitem.cpp kbfxplasmaindexview.cpp kbfxspinx.cpp kbfxspinxmenu.cpp
kbfxspinxpopup.cpp kbfxspinxscrollbar.cpp kbfxspinxtoolbar.cpp kbfxspinxtoolbutton.cpp
- kbfxspinxtop.cpp kbfxspinxview.cpp kbfxtooltip.cpp
+ kbfxspinxtop.cpp kbfxspinxview.cpp kbfxtooltip.cpp kbfxspinx.skel
)
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdecore-shared kdeui-shared kbfxspinx kbfxdata kbfxcommon
+ LINK kdecore-shared kdeui-shared kio-shared kbfxcommon kbfxdata
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/src/kbfxplasmacanvasitem.cpp b/src/kbfxplasmacanvasitem.cpp
index 819222a..62b75c6 100644
--- a/src/kbfxplasmacanvasitem.cpp
+++ b/src/kbfxplasmacanvasitem.cpp
@@ -169,7 +169,7 @@ KbfxPlasmaCanvasItem::setSource ( KbfxDataSource src )
else
{
setLabelText ( src.name() );
- setName ( src.name() );
+ setName ( src.name().ascii() );
setComment ( src.comment() );
setIconPath ( src.icon() );
diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp
index d50e33b..57b3106 100644
--- a/src/kbfxplasmacanvasview.cpp
+++ b/src/kbfxplasmacanvasview.cpp
@@ -245,8 +245,10 @@ KbfxPlasmaCanvasView::startDrag ()
qDebug ( "null source" );
return;
}
+ TQStrList uriList;
+ uriList.append(src->contentPath().ascii());
TQUriDrag *drag =
- new TQUriDrag ( TQStrList ( src->contentPath () ), this,
+ new TQUriDrag ( uriList, this,
src->name ().ascii () );
drag->setFileNames ( TQStringList ( src->contentPath () ) );
drag->setPixmap ( m_currentItem->dragPixmap () );
diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp
index c0a0216..d7f8d12 100644
--- a/src/kbfxplasmaindexview.cpp
+++ b/src/kbfxplasmaindexview.cpp
@@ -228,7 +228,7 @@ KbfxPlasmaIndexView::loadList ( KbfxDataStack * stkPtr )
item->setType ( KbfxPlasmaCanvasItem::INDEX );
item->setText ( it.data ().name );
- item->setName ( it.data ().name );
+ item->setName ( it.data ().name.ascii() );
item->setLabelText ( it.data ().name );
item->setIcon ( it.data ().icon );
item->setId ( it.key () );