summaryrefslogtreecommitdiffstats
path: root/parts
diff options
context:
space:
mode:
authorsamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-23 20:11:33 +0000
committersamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-23 20:11:33 +0000
commitf9c30e41d26594598abaa8315c4488b6c5ff38ea (patch)
tree0f3a5190aef92c865cb3f6a2304c093b949bc1b6 /parts
parent5e2135048c5de59f5351380653961b9a1e260d84 (diff)
downloadtdevelop-f9c30e41d26594598abaa8315c4488b6c5ff38ea.tar.gz
tdevelop-f9c30e41d26594598abaa8315c4488b6c5ff38ea.zip
[kdevelop] compatibility with QT_NO_ASCII_CAST and automoc
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1216512 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'parts')
-rw-r--r--parts/ctags2/ctags2_createtagfile.cpp2
-rw-r--r--parts/ctags2/ctags2_selecttagfile.cpp1
-rw-r--r--parts/filecreate/filecreate_listitem.cpp2
-rw-r--r--parts/fileview/filegroupswidget.cpp3
-rw-r--r--parts/fileview/filetreewidget.cpp3
5 files changed, 8 insertions, 3 deletions
diff --git a/parts/ctags2/ctags2_createtagfile.cpp b/parts/ctags2/ctags2_createtagfile.cpp
index 5193d8cd..e066a136 100644
--- a/parts/ctags2/ctags2_createtagfile.cpp
+++ b/parts/ctags2/ctags2_createtagfile.cpp
@@ -50,4 +50,6 @@ TQString CreateTagFile::directory( )
return dirToTag->url();
}
+#include "ctags2_createtagfile.moc"
+
// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/parts/ctags2/ctags2_selecttagfile.cpp b/parts/ctags2/ctags2_selecttagfile.cpp
index adb3ee78..c1a8d617 100644
--- a/parts/ctags2/ctags2_selecttagfile.cpp
+++ b/parts/ctags2/ctags2_selecttagfile.cpp
@@ -43,5 +43,6 @@ TQString SelectTagFile::tagsfilePath( )
return tagFile->url();
}
+#include "ctags2_selecttagfile.moc"
// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off;
diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp
index b6467505..86075af8 100644
--- a/parts/filecreate/filecreate_listitem.cpp
+++ b/parts/filecreate/filecreate_listitem.cpp
@@ -64,7 +64,7 @@ namespace FileCreate {
void ListItem::paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align )
{
- TQBrush brush( isSelected() ? cg.highlight() : backgroundColor() );
+ TQBrush brush( isSelected() ? cg.highlight() : backgroundColor(column) );
if( column == 1 ){
// m_filetypeRenderer->setWidth(width);
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index a31cb963..14f1d50c 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -224,7 +224,8 @@ void FileGroupsWidget::slotItemExecuted(TQListViewItem *item)
void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p)
{
- KPopupMenu popup(i18n("File Groups"), this);
+ KPopupMenu popup(this);
+ popup.insertTitle(i18n("File Groups"));
/// @todo Add, remove groups
int customizeId = popup.insertItem(i18n("Customize..."));
popup.setWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."));
diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp
index 6f049370..f5aa0ff4 100644
--- a/parts/fileview/filetreewidget.cpp
+++ b/parts/fileview/filetreewidget.cpp
@@ -203,7 +203,8 @@ void FileTreeWidget::slotContextMenu( KListView *, TQListViewItem* item, const T
{
kdDebug(9017) << "FileTreeWidget::slotContextMenu(...)" << endl;
- KPopupMenu popup( i18n("File Tree"), this );
+ KPopupMenu popup( this );
+ popup.insertTitle( i18n("File Tree") );
// If an item is selected, fill the file context with selected files' list
if (item)